Commit 48f5aed6 authored by Rich**'s avatar Rich** Committed by Jonne Haß
Browse files

Make default conversation subject translatable and properly capitalize it 

closes #6206, closes #6205
parent e21dad78

app/models/conversation.rb

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ class Conversation < ActiveRecord::Base 
  end



  def subject

    self[:subject].blank? ? "no subject" : self[:subject]

    self[:subject].blank? ? I18n.t("conversations.new.subject_default") : self[:subject]

  end



  def subscribers(user)

config/locales/diaspora/en.yml

+1 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ en: 
    new:

      to: "To"

      subject: "Subject"

      subject_default: "No subject"

      send: "Send"

      sending: "Sending..."

      abandon_changes: "Abandon changes?"