IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: don't tell staged users they can visit topics in email notifications

Browse Source
This commit is contained in:
Régis Hanol
2016-02-26 23:56:56 +01:00
parent 936c785952
commit 21b51090bf
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/email/message_builder.rb
View File

@@ -33,11 +33,13 @@ module Email
if @opts[:include_respond_instructions] == false
@template_args[:respond_instructions] = ''
else
@template_args[:respond_instructions] = if allow_reply_by_email?
@opts[:private_reply] ? I18n.t('user_notifications.reply_by_email_pm', @template_args) : I18n.t('user_notifications.reply_by_email', @template_args)
if @opts[:only_reply_by_email]
string = "user_notifications.only_reply_by_email"
else
@opts[:private_reply] ? I18n.t('user_notifications.visit_link_to_respond_pm', @template_args) : I18n.t('user_notifications.visit_link_to_respond', @template_args)
string = allow_reply_by_email? ? "user_notifications.reply_by_email" : "user_notifications.visit_link_to_respond"
string << "_pm" if @opts[:private_reply]
end
@template_args[:respond_instructions] = I18n.t(string, @template_args)
end
end
end