fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-18 04:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix user_mailer.welcome.hashtags_recent_count not having plural form (#29607)

Browse source
This commit is contained in:
Claire 2024-03-16 17:38:20 +01:00 committed by GitHub
parent 726e7ad024
commit 82c2af0356
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,4 +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
%p= t('user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(hashtag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts), days: 2) %p= t('user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(hashtag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts))

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), days: 2) %> * #<%= 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_url(tag) %> <%= tag_url(tag) %>
<%- end %> <%- end %>

4
config/locales/en.yml
View file

@ -1868,7 +1868,9 @@ en:
follows_subtitle: Follow well-known accounts follows_subtitle: Follow well-known accounts
follows_title: Who to follow follows_title: Who to follow
follows_view_more: View more people to follow follows_view_more: View more people to follow
hashtags_recent_count: "%{people} people in the past %{days} days" hashtags_recent_count:
one: "%{people} person in the past 2 days"
other: "%{people} people in the past 2 days"
hashtags_subtitle: Explore what’s trending since past 2 days hashtags_subtitle: Explore what’s trending since past 2 days
hashtags_title: Trending hashtags hashtags_title: Trending hashtags
hashtags_view_more: View more trending hashtags hashtags_view_more: View more trending hashtags