From 87c872823bef3afc6309b9440b6a708238d6ceff Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <gerhard.schlager@discourse.org>
Date: Fri, 15 Apr 2022 12:13:37 +0200
Subject: [PATCH] DEV: Remove unused code and rename interpolation key

---
 app/mailers/group_smtp_mailer.rb | 8 ++------
 config/locales/server.en.yml     | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/mailers/group_smtp_mailer.rb b/app/mailers/group_smtp_mailer.rb
index 15e20959e10..222a5d39392 100644
--- a/app/mailers/group_smtp_mailer.rb
+++ b/app/mailers/group_smtp_mailer.rb
@@ -21,12 +21,8 @@ class GroupSmtpMailer < ActionMailer::Base
       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
+
     build_email(
       to_address,
       message: post.raw,
@@ -49,7 +45,7 @@ class GroupSmtpMailer < ActionMailer::Base
       locale: SiteSetting.default_locale,
       delivery_method_options: delivery_options,
       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),
       cc: cc_addresses
     )
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 2c5598d9cf0..7e3442be530 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -3496,7 +3496,7 @@ en:
   subject_re: "Re: "
   subject_pm: "[PM] "
   email_from: "%{user_name} via %{site_name}"
-  email_from_without_site: "%{user_name}"
+  email_from_without_site: "%{group_name}"
 
   user_notifications:
     previous_discussion: "Previous Replies"