gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-12-07 14:53:38 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Pluralize trends mails (untested)

Browse Source
This commit is contained in:
GunChleoc 2023-09-01 17:01:56 +01:00
parent 47dcd16c33
commit cc6afa65b4
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin_mailer/_new_trending_links.text.erb
View File

@ -2,7 +2,7 @@
<% new_trending_links.each do |link| %> <% new_trending_links.each do |link| %>
- <%= link.title %> · <%= link.url %> - <%= link.title %> · <%= link.url %>
<%= standard_locale_name(link.language) %> · <%= raw t('admin.trends.links.usage_comparison', today: link.history.get(Time.now.utc).accounts, yesterday: link.history.get(Time.now.utc - 1.day).accounts) %> · <%= t('admin.trends.tags.current_score', score: link.trend.score.round(2)) %> <%= standard_locale_name(link.language) %> · <%= raw t('admin.trends.links.usage_comparison', count: link.history.get(Time.now.utc).accounts, yesterday: link.history.get(Time.now.utc - 1.day).accounts) %> · <%= t('admin.trends.tags.current_score', score: link.trend.score.round(2)) %>
<% end %> <% end %>
<%= raw t('application_mailer.view')%> <%= admin_trends_links_url %> <%= raw t('application_mailer.view')%> <%= admin_trends_links_url %>

2
app/views/admin_mailer/_new_trending_tags.text.erb
View File

@ -2,7 +2,7 @@
<% new_trending_tags.each do |tag| %> <% new_trending_tags.each do |tag| %>
- #<%= tag.display_name %> - #<%= tag.display_name %>
<%= raw t('admin.trends.tags.usage_comparison', today: tag.history.get(Time.now.utc).accounts, yesterday: tag.history.get(Time.now.utc - 1.day).accounts) %> · <%= t('admin.trends.tags.current_score', score: tag.trend.score.round(2)) %> <%= raw t('admin.trends.tags.usage_comparison', count: tag.history.get(Time.now.utc).accounts, yesterday: tag.history.get(Time.now.utc - 1.day).accounts) %> · <%= t('admin.trends.tags.current_score', score: tag.trend.score.round(2)) %>
<% end %> <% end %>
<%= raw t('application_mailer.view')%> <%= admin_trends_tags_url(status: 'pending_review') %> <%= raw t('application_mailer.view')%> <%= admin_trends_tags_url(status: 'pending_review') %>

16
config/locales/en.yml
View File

@ -1027,7 +1027,9 @@ en:
one: Shared by one person over the last week one: Shared by one person over the last week
other: Shared by %{count} people over the last week other: Shared by %{count} people over the last week
title: Trending links title: Trending links
usage_comparison: Shared %{today} times today, compared to %{yesterday} yesterday usage_comparison:
one: Shared %{count} time today, compared to %{yesterday} yesterday
other: Shared %{count} times today, compared to %{yesterday} yesterday
not_allowed_to_trend: Not allowed to trend not_allowed_to_trend: Not allowed to trend
only_allowed: Only allowed only_allowed: Only allowed
pending_review: Pending review pending_review: Pending review
@ -1072,7 +1074,9 @@ en:
trendable: Can appear under trends trendable: Can appear under trends
trending_rank: 'Trending #%{rank}' trending_rank: 'Trending #%{rank}'
usable: Can be used usable: Can be used
usage_comparison: Used %{today} times today, compared to %{yesterday} yesterday usage_comparison:
one: Used %{count} time today, compared to %{yesterday} yesterday
other: Used %{count} times today, compared to %{yesterday} yesterday
used_by_over_week: used_by_over_week:
one: Used by one person over the last week one: Used by one person over the last week
other: Used by %{count} people over the last week other: Used by %{count} people over the last week
@ -1759,11 +1763,11 @@ en:
tag: 'Public posts tagged #%{hashtag}' tag: 'Public posts tagged #%{hashtag}'
scheduled_statuses: scheduled_statuses:
over_daily_limit: over_daily_limit:
one: You have exceeded the limit of %{limit} scheduled post for today one: You have exceeded the limit of %{count} scheduled post for today
other: You have exceeded the limit of %{limit} scheduled posts for today other: You have exceeded the limit of %{count} scheduled posts for today
over_total_limit: over_total_limit:
one: You have exceeded the limit of %{limit} scheduled post one: You have exceeded the limit of %{count} scheduled post
other: You have exceeded the limit of %{limit} scheduled posts other: You have exceeded the limit of %{count} scheduled posts
too_soon: The scheduled date must be in the future too_soon: The scheduled date must be in the future
self_destruct: self_destruct:
lead_html: Unfortunately, <strong>%{domain}</strong> is permanently closing down. If you had an account there, you will not be able to continue using it, but you can still request a backup of your data. lead_html: Unfortunately, <strong>%{domain}</strong> is permanently closing down. If you had an account there, you will not be able to continue using it, but you can still request a backup of your data.

4
spec/models/scheduled_status_spec.rb
View File

@ -24,7 +24,7 @@ RSpec.describe ScheduledStatus do
it 'is not valid', :aggregate_failures do it 'is not valid', :aggregate_failures do
expect(subject).to_not be_valid expect(subject).to_not be_valid
expect(subject.errors[:base]).to include(I18n.t('scheduled_statuses.over_total_limit', limit: ScheduledStatus::TOTAL_LIMIT)) expect(subject.errors[:base]).to include(I18n.t('scheduled_statuses.over_total_limit', count: ScheduledStatus::TOTAL_LIMIT))
end end
end end
@ -43,7 +43,7 @@ RSpec.describe ScheduledStatus do
it 'is not valid', :aggregate_failures do it 'is not valid', :aggregate_failures do
expect(subject).to_not be_valid expect(subject).to_not be_valid
expect(subject.errors[:base]).to include(I18n.t('scheduled_statuses.over_daily_limit', limit: ScheduledStatus::DAILY_LIMIT)) expect(subject.errors[:base]).to include(I18n.t('scheduled_statuses.over_daily_limit', count: ScheduledStatus::DAILY_LIMIT))
end end
end end
end end