DEV: Remove unused code and rename interpolation key

This commit is contained in:
Gerhard Schlager 2022-04-15 12:13:37 +02:00 committed by Gerhard Schlager
parent 9e2303427c
commit 87c872823b
2 changed files with 3 additions and 7 deletions
app/mailers
config/locales

View File

@ -21,12 +21,8 @@ class GroupSmtpMailer < ActionMailer::Base
enable_starttls_auto: from_group.smtp_ssl enable_starttls_auto: from_group.smtp_ssl
} }
user_name = post.user.username
if SiteSetting.enable_names && SiteSetting.display_name_on_email_from
user_name = post.user.name unless post.user.name.blank?
end
group_name = from_group.name_full_preferred group_name = from_group.name_full_preferred
build_email( build_email(
to_address, to_address,
message: post.raw, message: post.raw,
@ -49,7 +45,7 @@ class GroupSmtpMailer < ActionMailer::Base
locale: SiteSetting.default_locale, locale: SiteSetting.default_locale,
delivery_method_options: delivery_options, delivery_method_options: delivery_options,
from: from_group.smtp_from_address, from: from_group.smtp_from_address,
from_alias: I18n.t('email_from_without_site', user_name: group_name), from_alias: I18n.t('email_from_without_site', group_name: group_name),
html_override: html_override(post), html_override: html_override(post),
cc: cc_addresses cc: cc_addresses
) )

View File

@ -3496,7 +3496,7 @@ en:
subject_re: "Re: " subject_re: "Re: "
subject_pm: "[PM] " subject_pm: "[PM] "
email_from: "%{user_name} via %{site_name}" email_from: "%{user_name} via %{site_name}"
email_from_without_site: "%{user_name}" email_from_without_site: "%{group_name}"
user_notifications: user_notifications:
previous_discussion: "Previous Replies" previous_discussion: "Previous Replies"