Skip to content

A platform for community discussion. Free, open, simple.

FIX: Parameterize Unsubscribe Title i18n String (#43313)

Chris Alberti3bcce9f68e66
diff --git a/app/views/email/unsubscribe.html.erb b/app/views/email/unsubscribe.html.erb
index f36a5e497ee..5c07622bc4e 100644
--- a/app/views/email/unsubscribe.html.erb
+++ b/app/views/email/unsubscribe.html.erb
@@ -14,7 +14,7 @@
<%- end %>
<%- else %>
<br/>
- <h2><%= t 'unsubscribe.title'%> <%= @user.email %></h2>
+ <h2><%= t 'unsubscribe.title', email: @user.email %></h2>
<br/>
<%= form_tag(email_perform_unsubscribe_path(key: params[:key])) do %>
<%if @topic %>
@@ -92,7 +92,7 @@
<% end %>
<br/>
- <% text = @type=='digest' ? t('unsubscribe.submit') : t('unsubscribe.title') %>
+ <% text = @type=='digest' ? t('unsubscribe.submit') : t('unsubscribe.unsubscribe') %>
<%= submit_tag text, class: 'btn btn-danger' %>
<%- end %>
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 47adc676da8..9a767ff208e 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1403,7 +1403,8 @@ en:
marked_insecure_from_theme_component_reason: "upload used in theme component"
unsubscribe:
- title: "Unsubscribe"
+ title: "Unsubscribe %{email}"
+ unsubscribe: "Unsubscribe"
stop_watching_topic: "Stop watching this topic, %{link}"
mute_topic: "Mute all notifications for this topic, %{link}"
unwatch_category: "Stop watching all topics in %{category}"