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 #3110 from riking/notification_lanaguage 

FIX: Respect user locale for reply notifications
This commit is contained in:
Robin Ward 2015-01-20 15:17:18 -05:00
parent 350554e198 03fd275b45
commit e3b4d12e46
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/services/post_alerter.rb
View File

@ -118,7 +118,13 @@ class PostAlerter
if collapsed if collapsed
post = first_unread_post(user,post.topic) || post post = first_unread_post(user,post.topic) || post
count = unread_count(user, post.topic) count = unread_count(user, post.topic)
opts[:display_username] = I18n.t('embed.replies', count: count) if count > 1 I18n.with_locale(if SiteSetting.allow_user_locale && user.locale.present?
user.locale
else
SiteSetting.default_locale
end) do
opts[:display_username] = I18n.t('embed.replies', count: count) if count > 1
end
end end
UserActionObserver.log_notification(original_post, user, type, opts[:acting_user_id]) UserActionObserver.log_notification(original_post, user, type, opts[:acting_user_id])