Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3734 from gschlager/i18n-2 

Remove hard-coded fallback to English locale
This commit is contained in:
Sam 2015-09-07 08:44:12 +10:00
parent 87cd3a3b6a 3dd9dbf757
commit 6850476cb3
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/mailers/user_notifications.rb
View File

@ -41,11 +41,8 @@ class UserNotifications < ActionMailer::Base
build_email( user.email, template: "user_notifications.account_created", email_token: opts[:email_token]) build_email( user.email, template: "user_notifications.account_created", email_token: opts[:email_token])
end end
# On error, use english
def short_date(dt) def short_date(dt)
I18n.l(dt, format: :short) I18n.l(dt, format: :short)
rescue I18n::MissingTranslationData
I18n.l(dt, format: :short, locale: 'en')
end end
def digest(user, opts={}) def digest(user, opts={})