From cc6afa65b439ce595a07ffcb8f994f4ee83aa3a0 Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Fri, 1 Sep 2023 17:01:56 +0100 Subject: [PATCH] Pluralize trends mails (untested) --- .../admin_mailer/_new_trending_links.text.erb | 2 +- .../admin_mailer/_new_trending_tags.text.erb | 2 +- config/locales/en.yml | 16 ++++++++++------ spec/models/scheduled_status_spec.rb | 4 ++-- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/views/admin_mailer/_new_trending_links.text.erb b/app/views/admin_mailer/_new_trending_links.text.erb index 0e2a6a20a6..8a0ff57371 100644 --- a/app/views/admin_mailer/_new_trending_links.text.erb +++ b/app/views/admin_mailer/_new_trending_links.text.erb @@ -2,7 +2,7 @@ <% new_trending_links.each do |link| %> - <%= 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 %> <%= raw t('application_mailer.view')%> <%= admin_trends_links_url %> diff --git a/app/views/admin_mailer/_new_trending_tags.text.erb b/app/views/admin_mailer/_new_trending_tags.text.erb index c9bd1bc717..bffa17814d 100644 --- a/app/views/admin_mailer/_new_trending_tags.text.erb +++ b/app/views/admin_mailer/_new_trending_tags.text.erb @@ -2,7 +2,7 @@ <% new_trending_tags.each do |tag| %> - #<%= 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 %> <%= raw t('application_mailer.view')%> <%= admin_trends_tags_url(status: 'pending_review') %> diff --git a/config/locales/en.yml b/config/locales/en.yml index b278921212..17a9d243ce 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1027,7 +1027,9 @@ en: one: Shared by one person over the last week other: Shared by %{count} people over the last week 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 only_allowed: Only allowed pending_review: Pending review @@ -1072,7 +1074,9 @@ en: trendable: Can appear under trends trending_rank: 'Trending #%{rank}' 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: one: Used by one person over the last week other: Used by %{count} people over the last week @@ -1759,11 +1763,11 @@ en: tag: 'Public posts tagged #%{hashtag}' scheduled_statuses: over_daily_limit: - one: You have exceeded the limit of %{limit} scheduled post for today - other: You have exceeded the limit of %{limit} scheduled posts for today + one: You have exceeded the limit of %{count} scheduled post for today + other: You have exceeded the limit of %{count} scheduled posts for today over_total_limit: - one: You have exceeded the limit of %{limit} scheduled post - other: You have exceeded the limit of %{limit} scheduled posts + one: You have exceeded the limit of %{count} scheduled post + other: You have exceeded the limit of %{count} scheduled posts too_soon: The scheduled date must be in the future self_destruct: lead_html: Unfortunately, %{domain} 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. diff --git a/spec/models/scheduled_status_spec.rb b/spec/models/scheduled_status_spec.rb index 15031a5895..2a91e0c480 100644 --- a/spec/models/scheduled_status_spec.rb +++ b/spec/models/scheduled_status_spec.rb @@ -24,7 +24,7 @@ RSpec.describe ScheduledStatus do it 'is not valid', :aggregate_failures do 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 @@ -43,7 +43,7 @@ RSpec.describe ScheduledStatus do it 'is not valid', :aggregate_failures do 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