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

FIX: use site default locale for flag title and body

This commit is contained in:
Arpit Jalan 2016-05-05 00:19:05 +05:30
parent 484cd8b362
commit acbec76411
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/post_action.rb
View File

@ -213,8 +213,8 @@ SQL
return unless opts[:message] && [:notify_moderators, :notify_user, :spam].include?(post_action_type) return unless opts[:message] && [:notify_moderators, :notify_user, :spam].include?(post_action_type)
title = I18n.t("post_action_types.#{post_action_type}.email_title", title: post.topic.title) title = I18n.t("post_action_types.#{post_action_type}.email_title", title: post.topic.title, locale: SiteSetting.default_locale)
body = I18n.t("post_action_types.#{post_action_type}.email_body", message: opts[:message], link: "#{Discourse.base_url}#{post.url}") body = I18n.t("post_action_types.#{post_action_type}.email_body", message: opts[:message], link: "#{Discourse.base_url}#{post.url}", locale: SiteSetting.default_locale)
warning = opts[:is_warning] if opts[:is_warning].present? warning = opts[:is_warning] if opts[:is_warning].present?
title = title.truncate(255, separator: /\s/) title = title.truncate(255, separator: /\s/)