mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-22 10:38:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Matt Jankowski 2024-10-18 03:19:37 -04:00 committed by Claire
parent d0fb7939bb
commit afc440435c
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/helpers/application_helper.rb
View file

@ -244,6 +244,11 @@ module ApplicationHelper
tag.input(type: :text, maxlength: 999, spellcheck: false, readonly: true, **options) tag.input(type: :text, maxlength: 999, spellcheck: false, readonly: true, **options)
end 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 private
def storage_host_var def storage_host_var

3
app/views/application/mailer/_hashtag.html.haml
View file

@ -17,5 +17,4 @@
%span.email-mini-hashtag-img-span %span.email-mini-hashtag-img-span
= image_tag full_asset_url(account.avatar.url), alt: '', width: 16, height: 16 = image_tag full_asset_url(account.avatar.url), alt: '', width: 16, height: 16
%td %td
- people = hashtag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts %p= recent_tag_usage(hashtag)
%p= t('user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(people), count: people)

2
app/views/user_mailer/welcome.text.erb
View file

@ -53,7 +53,7 @@
<%= t('user_mailer.welcome.hashtags_subtitle') %> <%= t('user_mailer.welcome.hashtags_subtitle') %>
<%- @tags.each do |tag| %> <%- @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) %> <%= tag_url(tag) %>
<%- end %> <%- end %>