Fix broken i18n in text welcome mailer tags area (mastodon#32571)

ClearlyClaire · Oct 18, 2024 · afc4404 · afc4404
1 parent d0fb793
commit afc4404
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -244,6 +244,11 @@ def copyable_input(options = {})
     tag.input(type: :text, maxlength: 999, spellcheck: false, readonly: true, **options)
   end
 
+  def recent_tag_usage(tag)
+    people = tag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts
+    I18n.t 'user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(people), count: people
+  end
+
   private
 
   def storage_host_var

diff --git a/app/views/application/mailer/_hashtag.html.haml b/app/views/application/mailer/_hashtag.html.haml
@@ -17,5 +17,4 @@
                           %span.email-mini-hashtag-img-span
                             = image_tag full_asset_url(account.avatar.url), alt: '', width: 16, height: 16
                       %td
-                        - people = hashtag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts
-                        %p= t('user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(people), count: people)
+                        %p= recent_tag_usage(hashtag)
diff --git a/app/views/user_mailer/welcome.text.erb b/app/views/user_mailer/welcome.text.erb
@@ -53,7 +53,7 @@
 <%= t('user_mailer.welcome.hashtags_subtitle') %>
 
 <%- @tags.each do |tag| %>
-* #<%= tag.display_name %> · <%= t('user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(tag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts)) %>
+* #<%= tag.display_name %> · <%= recent_tag_usage(tag) %>
   <%= tag_url(tag) %>
 <%- end %>