github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-21 01:35:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: If a date translation is missing, don't raise an exception

Browse Source
This commit is contained in:
Robin Ward 2015-05-26 11:59:32 -04:00
parent 6801cc957f
commit d0741f752f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/mailers/user_notifications.rb
View File

@ -41,17 +41,24 @@ class UserNotifications < ActionMailer::Base
build_email( user.email, template: "user_notifications.account_created", email_token: opts[:email_token])
end
# On error, use english
def short_date(dt)
I18n.l(dt, format: :short)
rescue I18n::MissingTranslationData
I18n.l(dt, format: :short, locale: 'en')
end
def digest(user, opts={})
@user = user
@base_url = Discourse.base_url
min_date = opts[:since] || @user.last_emailed_at || @user.last_seen_at || 1.month.ago
min_date = 2.month.ago
@site_name = SiteSetting.title
@header_color = ColorScheme.hex_for_name('header_background')
@last_seen_at = I18n.l(@user.last_seen_at || @user.created_at, format: :short)
@last_seen_at = short_date(@user.last_seen_at || @user.created_at)
# A list of topics to show the user
@featured_topics = Topic.for_digest(user, min_date, limit: SiteSetting.digest_topics, top_order: true).to_a
@ -80,8 +87,8 @@ class UserNotifications < ActionMailer::Base
build_email user.email,
from_alias: I18n.t('user_notifications.digest.from', site_name: SiteSetting.title),
subject: I18n.t('user_notifications.digest.subject_template',
site_name: @site_name,
date: I18n.l(Time.now, format: :short))
site_name: @site_name,
date: short_date(Time.now))
end
end