From 48f5aed63ef867952ee9ce4178180fa503b4fd94 Mon Sep 17 00:00:00 2001 From: Rich** Date: Fri, 17 Jul 2015 14:02:05 +0100 Subject: [PATCH] Make default conversation subject translatable and properly capitalize it closes #6206, closes #6205 --- app/models/conversation.rb | 2 +- config/locales/diaspora/en.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/conversation.rb b/app/models/conversation.rb index 5c0778df5..45777b82a 100644 --- a/app/models/conversation.rb +++ b/app/models/conversation.rb @@ -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) diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 6ae44cbd6..7f9d9da6c 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -347,6 +347,7 @@ en: new: to: "To" subject: "Subject" + subject_default: "No subject" send: "Send" sending: "Sending..." abandon_changes: "Abandon changes?" -- GitLab