github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-18 10:42:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

BUGFIX: no translation for email_error_notifications to admin users

Browse Source
This commit is contained in:
Régis Hanol 2014-06-30 15:21:26 +02:00
parent 37d4324af3
commit dcd0b8fecf
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/services/group_message.rb
View File

@ -28,12 +28,14 @@ class GroupMessage
def create
unless sent_recently?
post = PostCreator.create( Discourse.system_user,
target_group_names: [@group_name],
archetype: Archetype.private_message,
subtype: TopicSubtype.system_message,
title: I18n.t("system_messages.#{@message_type}.subject_template", message_params),
raw: I18n.t("system_messages.#{@message_type}.text_body_template", message_params) )
post = PostCreator.create(
Discourse.system_user,
target_group_names: [@group_name],
archetype: Archetype.private_message,
subtype: TopicSubtype.system_message,
title: I18n.t("system_messages.#{@message_type}.subject_template", message_params),
raw: I18n.t("system_messages.#{@message_type}.text_body_template", message_params)
)
remember_message_sent
post
else
@ -43,7 +45,7 @@ class GroupMessage
def message_params
@message_params ||= begin
h = {base_url: Discourse.base_url}.merge(@opts[:message_params]||{})
h = { base_url: Discourse.base_url }.merge(@opts[:message_params] || {})
if @opts[:user]
h.merge!({
username: @opts[:user].username,

9
config/locales/server.en.yml
View File

@ -1334,7 +1334,7 @@ en:
The email encoding was unknown or not supported. Try again with UTF-8 plain text.
email_reject_post_error:
subject_template: "Email issue -- posting error"
subject_template: "Email issue -- Posting error"
text_body_template: |
We're sorry, but your email message to %{destination} didn't work.
@ -1347,6 +1347,13 @@ en:
The provided reply key is invalid or unknown, so we don't know what this email is in reply to. Contact a staff member.
email_error_notification:
subject_template: "Email issue -- POP authentication error"
text_body_template: |
There has been an authentication error while polling mails from the POP server.
Please make sure you have properly configured the POP credentials in [the site settings](%{base_url}/admin/site_settings/category/email).
too_many_spam_flags:
subject_template: "New account blocked"
text_body_template: |