From a525e171affd7ade798511829b4e9739e24205a6 Mon Sep 17 00:00:00 2001
From: zrei <88964793+zrei@users.noreply.github.com>
Date: Sat, 16 May 2026 14:06:31 +0800
Subject: [PATCH 1/4] Add signup notification mailer preview and update I18n
 calls

---
 app/mailers/user_mailer.rb                    |  2 +-
 .../user_mailer/signup_notification.html.erb  | 20 +++++++++----------
 .../user_mailer/signup_notification.text.erb  | 10 +++++-----
 config/locales/mailers/en.yml                 |  4 +++-
 test/mailers/previews/user_mailer_preview.rb  |  6 ++++++
 5 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 6c8d85aa576..24222266b16 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -221,7 +221,7 @@ def signup_notification(user_id)
     I18n.with_locale(@user.preference.locale_for_mails) do
       mail(
         to: @user.email,
-        subject: t("user_mailer.signup_notification.subject", app_name: ArchiveConfig.APP_SHORT_NAME)
+        subject: default_i18n_subject(app_name: ArchiveConfig.APP_SHORT_NAME)
       )
     end
   end
diff --git a/app/views/user_mailer/signup_notification.html.erb b/app/views/user_mailer/signup_notification.html.erb
index cd76a1de5aa..456493a8b43 100644
--- a/app/views/user_mailer/signup_notification.html.erb
+++ b/app/views/user_mailer/signup_notification.html.erb
@@ -1,12 +1,12 @@
 <% content_for :message do %>
-<p><%= t('.welcome',
-           login: style_bold(@user.login)).html_safe %></p>
-<p><%= t('.activate.html',
-           activate_account_link: style_link(t('.activate_your_account'), activate_url(id: @user.confirmation_token))) %></p>
-<p><%= t('.features.html') %></p>
-<p><%= t('.information.html',
-           faq_link: style_link(t('.faq'), archive_faqs_url),
-           admin_posts_link: style_link(t('.admin_posts'), admin_posts_url),
-           contact_support_link: support_link(t '.contact_support')) %></p>
-<p><%= t('.bye') %></p>
+<p><%= t(".welcome.html",
+           login: style_bold(@user.login)) %></p>
+<p><%= t(".activate.html",
+           activate_account_link: style_link(t(".activate_your_account"), activate_url(id: @user.confirmation_token))) %></p>
+<p><%= t(".features.html") %></p>
+<p><%= t(".information.html",
+           faq_link: style_link(t(".faq"), archive_faqs_url),
+           admin_posts_link: style_link(t(".admin_posts"), admin_posts_url),
+           contact_support_link: support_link(t ".contact_support")) %></p>
+<p><%= t(".bye") %></p>
 <% end %>
diff --git a/app/views/user_mailer/signup_notification.text.erb b/app/views/user_mailer/signup_notification.text.erb
index 239596f911a..a2ecd3fde16 100644
--- a/app/views/user_mailer/signup_notification.text.erb
+++ b/app/views/user_mailer/signup_notification.text.erb
@@ -1,16 +1,16 @@
 <% content_for :message do %>
-<%= t('.welcome',
+<%= t(".welcome.text",
            login: @user.login) %>
 
-<%= t('.activate.text',
+<%= t(".activate.text",
            activate_account_url: activate_url(id: @user.confirmation_token)) %>
 
-<%= t('.features.text') %>
+<%= t(".features.text") %>
 
-<%= t('.information.text',
+<%= t(".information.text",
            faq_url: archive_faqs_url,
            admin_posts_url: admin_posts_url, 
            contact_support_url: new_feedback_report_url) %>
 
-<%= t('.bye') %>
+<%= t(".bye") %>
 <% end %>
diff --git a/config/locales/mailers/en.yml b/config/locales/mailers/en.yml
index dd1c6ff8b15..7e96a3f495e 100644
--- a/config/locales/mailers/en.yml
+++ b/config/locales/mailers/en.yml
@@ -817,7 +817,9 @@ en:
         html: There's lots of information and advice on how to use the Archive in our %{faq_link}. You'll find the latest news about site developments on %{admin_posts_link}. If you need more help, run into a bug, or have questions or comments, please %{contact_support_link}, who are always happy to help out.
         text: 'There''s lots of information and advice on how to use the Archive in our FAQ at %{faq_url}. You''ll find the latest news about site developments on AO3 News at %{admin_posts_url}. If you need more help, run into a bug, or have questions or comments, please contact Support, who are always happy to help out: %{contact_support_url}.'
       subject: "[%{app_name}] Activate your account"
-      welcome: Welcome to the Archive of Our Own, %{login}!
+      welcome:
+        html: Welcome to the Archive of Our Own, %{login}!
+        text: Welcome to the Archive of Our Own, %{login}!
   users:
     mailer:
       confirmation_instructions:
diff --git a/test/mailers/previews/user_mailer_preview.rb b/test/mailers/previews/user_mailer_preview.rb
index ff22ddfd1fc..b97e4a78e75 100644
--- a/test/mailers/previews/user_mailer_preview.rb
+++ b/test/mailers/previews/user_mailer_preview.rb
@@ -473,6 +473,12 @@ def related_work_notification_anon
     UserMailer.related_work_notification(user.id, related_work.id)
   end
 
+  # URL: /rails/mailers/user_mailer/signup_notification
+  def signup_notification
+    user = create(:user, :for_mailer_preview, confirmed_at: nil)
+    UserMailer.signup_notification(user.id)
+  end
+
   private
 
   def creatorship_notification_data(creation_type)

From a2707f046fa2a75f644c0cc4ec47a5fb3ea09199 Mon Sep 17 00:00:00 2001
From: zrei <88964793+zrei@users.noreply.github.com>
Date: Sat, 16 May 2026 14:21:09 +0800
Subject: [PATCH 2/4] fix reviewdog errors

---
 app/views/user_mailer/signup_notification.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/user_mailer/signup_notification.html.erb b/app/views/user_mailer/signup_notification.html.erb
index 456493a8b43..baf025c2cf8 100644
--- a/app/views/user_mailer/signup_notification.html.erb
+++ b/app/views/user_mailer/signup_notification.html.erb
@@ -1,12 +1,12 @@
 <% content_for :message do %>
 <p><%= t(".welcome.html",
-           login: style_bold(@user.login)) %></p>
+    login: style_bold(@user.login)) %></p>
 <p><%= t(".activate.html",
-           activate_account_link: style_link(t(".activate_your_account"), activate_url(id: @user.confirmation_token))) %></p>
+    activate_account_link: style_link(t(".activate_your_account"), activate_url(id: @user.confirmation_token))) %></p>
 <p><%= t(".features.html") %></p>
 <p><%= t(".information.html",
-           faq_link: style_link(t(".faq"), archive_faqs_url),
-           admin_posts_link: style_link(t(".admin_posts"), admin_posts_url),
-           contact_support_link: support_link(t ".contact_support")) %></p>
+    faq_link: style_link(t(".faq"), archive_faqs_url),
+    admin_posts_link: style_link(t(".admin_posts"), admin_posts_url),
+    contact_support_link: support_link(t(".contact_support"))) %></p>
 <p><%= t(".bye") %></p>
 <% end %>

From fae9f0f51d0a971d3458756bf72fa241822b6ea8 Mon Sep 17 00:00:00 2001
From: zrei <88964793+zrei@users.noreply.github.com>
Date: Sat, 16 May 2026 14:28:45 +0800
Subject: [PATCH 3/4] Indentation fix

---
 app/views/user_mailer/signup_notification.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/user_mailer/signup_notification.html.erb b/app/views/user_mailer/signup_notification.html.erb
index baf025c2cf8..10a5c0214b9 100644
--- a/app/views/user_mailer/signup_notification.html.erb
+++ b/app/views/user_mailer/signup_notification.html.erb
@@ -1,12 +1,12 @@
 <% content_for :message do %>
 <p><%= t(".welcome.html",
-    login: style_bold(@user.login)) %></p>
+  login: style_bold(@user.login)) %></p>
 <p><%= t(".activate.html",
-    activate_account_link: style_link(t(".activate_your_account"), activate_url(id: @user.confirmation_token))) %></p>
+  activate_account_link: style_link(t(".activate_your_account"), activate_url(id: @user.confirmation_token))) %></p>
 <p><%= t(".features.html") %></p>
 <p><%= t(".information.html",
-    faq_link: style_link(t(".faq"), archive_faqs_url),
-    admin_posts_link: style_link(t(".admin_posts"), admin_posts_url),
-    contact_support_link: support_link(t(".contact_support"))) %></p>
+  faq_link: style_link(t(".faq"), archive_faqs_url),
+  admin_posts_link: style_link(t(".admin_posts"), admin_posts_url),
+  contact_support_link: support_link(t(".contact_support"))) %></p>
 <p><%= t(".bye") %></p>
 <% end %>

From 5a3cbfa60a8c9ca5b6fc6702f96846442e91516e Mon Sep 17 00:00:00 2001
From: zrei <88964793+zrei@users.noreply.github.com>
Date: Sat, 16 May 2026 20:21:52 +0800
Subject: [PATCH 4/4] Fix indentation issues in signup notification mailer text

---
 app/views/user_mailer/signup_notification.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/user_mailer/signup_notification.html.erb b/app/views/user_mailer/signup_notification.html.erb
index 10a5c0214b9..c88cb4a27a7 100644
--- a/app/views/user_mailer/signup_notification.html.erb
+++ b/app/views/user_mailer/signup_notification.html.erb
@@ -1,12 +1,12 @@
 <% content_for :message do %>
 <p><%= t(".welcome.html",
-  login: style_bold(@user.login)) %></p>
+         login: style_bold(@user.login)) %></p>
 <p><%= t(".activate.html",
-  activate_account_link: style_link(t(".activate_your_account"), activate_url(id: @user.confirmation_token))) %></p>
+         activate_account_link: style_link(t(".activate_your_account"), activate_url(id: @user.confirmation_token))) %></p>
 <p><%= t(".features.html") %></p>
 <p><%= t(".information.html",
-  faq_link: style_link(t(".faq"), archive_faqs_url),
-  admin_posts_link: style_link(t(".admin_posts"), admin_posts_url),
-  contact_support_link: support_link(t(".contact_support"))) %></p>
+         faq_link: style_link(t(".faq"), archive_faqs_url),
+         admin_posts_link: style_link(t(".admin_posts"), admin_posts_url),
+         contact_support_link: support_link(t(".contact_support"))) %></p>
 <p><%= t(".bye") %></p>
 <% end %>