nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-07-17 20:21:19 +02:00
commit 3a4815996f
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/conversation.rb
View file

@ -83,7 +83,7 @@ class Conversation < ActiveRecord::Base
end end
def subject def subject
self[:subject].blank? ? "no subject" : self[:subject] self[:subject].blank? ? I18n.t("conversations.new.subject_default") : self[:subject]
end end
def subscribers(user) def subscribers(user)

1
config/locales/diaspora/en.yml
View file

@ -350,6 +350,7 @@ en:
new: new:
to: "To" to: "To"
subject: "Subject" subject: "Subject"
subject_default: "No subject"
send: "Send" send: "Send"
sending: "Sending..." sending: "Sending..."
abandon_changes: "Abandon changes?" abandon_changes: "Abandon changes?"