From 6dd80b902c9a890e7f3a0ef84ee1813ab6d02eba Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Fri, 1 Sep 2023 16:38:11 +0100 Subject: [PATCH 1/7] Pluralize scheduled status limits (untested) --- app/models/scheduled_status.rb | 4 ++-- config/locales/en.yml | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/models/scheduled_status.rb b/app/models/scheduled_status.rb index 27f0cbd280c..330a86b48f5 100644 --- a/app/models/scheduled_status.rb +++ b/app/models/scheduled_status.rb @@ -30,10 +30,10 @@ class ScheduledStatus < ApplicationRecord end def validate_total_limit - errors.add(:base, I18n.t('scheduled_statuses.over_total_limit', limit: TOTAL_LIMIT)) if account.scheduled_statuses.count >= TOTAL_LIMIT + errors.add(:base, I18n.t('scheduled_statuses.over_total_limit', count: TOTAL_LIMIT)) if account.scheduled_statuses.count >= TOTAL_LIMIT end def validate_daily_limit - errors.add(:base, I18n.t('scheduled_statuses.over_daily_limit', limit: DAILY_LIMIT)) if account.scheduled_statuses.where('scheduled_at::date = ?::date', scheduled_at).count >= DAILY_LIMIT + errors.add(:base, I18n.t('scheduled_statuses.over_daily_limit', count: DAILY_LIMIT)) if account.scheduled_statuses.where('scheduled_at::date = ?::date', scheduled_at).count >= DAILY_LIMIT end end diff --git a/config/locales/en.yml b/config/locales/en.yml index 8199fa52c7b..edbd43f022a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1586,8 +1586,12 @@ en: account: Public posts from @%{acct} tag: 'Public posts tagged #%{hashtag}' scheduled_statuses: - over_daily_limit: You have exceeded the limit of %{limit} scheduled posts for today - over_total_limit: You have exceeded the limit of %{limit} scheduled posts + over_daily_limit: + 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 %{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. From 7840530d60afb220ea12e378e22e8fd2b3e34640 Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Fri, 1 Sep 2023 16:46:48 +0100 Subject: [PATCH 2/7] Pluralize migration cooldown text --- config/locales/en.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index edbd43f022a..c314d00d6d0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1434,7 +1434,9 @@ en: incoming_migrations_html: To move from another account to this one, first you need to create an account alias. moved_msg: Your account is now redirecting to %{acct} and your followers are being moved over. not_redirecting: Your account is not redirecting to any other account currently. - on_cooldown: You have recently migrated your account. This function will become available again in %{count} days. + on_cooldown: + one: You have recently migrated your account. This function will become available again in %{count} day. + other: You have recently migrated your account. This function will become available again in %{count} days. past_migrations: Past migrations proceed_with_move: Move followers redirected_msg: Your account is now redirecting to %{acct}. From e554397918133113a6145b661da3e729233ea832 Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Fri, 1 Sep 2023 16:55:18 +0100 Subject: [PATCH 3/7] Pluralize rows processing limit --- config/locales/en.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index c314d00d6d0..23b6a2dfed6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1308,7 +1308,9 @@ en: empty: Empty CSV file incompatible_type: Incompatible with the selected import type invalid_csv_file: 'Invalid CSV file. Error: %{error}' - over_rows_processing_limit: contains more than %{count} rows + over_rows_processing_limit: + one: contains more than %{count} row + other: contains more than %{count} rows too_large: File is too large failures: Failures imported: Imported From db30248f9e6b57e7050ed3ccd679b6aeb1a6bc90 Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Fri, 1 Sep 2023 17:01:56 +0100 Subject: [PATCH 4/7] Pluralize trends mails (untested) --- app/views/admin_mailer/_new_trending_links.text.erb | 2 +- app/views/admin_mailer/_new_trending_tags.text.erb | 2 +- config/locales/en.yml | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/views/admin_mailer/_new_trending_links.text.erb b/app/views/admin_mailer/_new_trending_links.text.erb index 0e2a6a20a6d..8a0ff57371d 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 f738caaf3db..8b7e76c3b6b 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: Trends.tags.score(tag.id).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: Trends.tags.score(tag.id).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 23b6a2dfed6..0446fe3b57c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -894,7 +894,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 @@ -935,7 +937,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 From f018ea8ff44bf07e526bdb0140ffa92ce822ee6b Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Fri, 1 Sep 2023 19:37:31 +0100 Subject: [PATCH 5/7] Fix blank space --- config/locales/en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 0446fe3b57c..eb81874363e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1596,10 +1596,10 @@ en: scheduled_statuses: over_daily_limit: one: You have exceeded the limit of %{count} scheduled post for today - other: You have exceeded the limit of %{count} scheduled posts for today + other: You have exceeded the limit of %{count} scheduled posts for today over_total_limit: one: You have exceeded the limit of %{count} scheduled post - other: You have exceeded the limit of %{count} scheduled posts + 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. From a536f5c26aaaee7f126f5dbc03a887ec60c22bd5 Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Sun, 24 Sep 2023 09:09:12 +0100 Subject: [PATCH 6/7] Fix variable name for scheduled status limits --- app/models/scheduled_status.rb | 4 ++-- config/locales/en.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/scheduled_status.rb b/app/models/scheduled_status.rb index 330a86b48f5..27f0cbd280c 100644 --- a/app/models/scheduled_status.rb +++ b/app/models/scheduled_status.rb @@ -30,10 +30,10 @@ class ScheduledStatus < ApplicationRecord end def validate_total_limit - errors.add(:base, I18n.t('scheduled_statuses.over_total_limit', count: TOTAL_LIMIT)) if account.scheduled_statuses.count >= TOTAL_LIMIT + errors.add(:base, I18n.t('scheduled_statuses.over_total_limit', limit: TOTAL_LIMIT)) if account.scheduled_statuses.count >= TOTAL_LIMIT end def validate_daily_limit - errors.add(:base, I18n.t('scheduled_statuses.over_daily_limit', count: DAILY_LIMIT)) if account.scheduled_statuses.where('scheduled_at::date = ?::date', scheduled_at).count >= DAILY_LIMIT + errors.add(:base, I18n.t('scheduled_statuses.over_daily_limit', limit: DAILY_LIMIT)) if account.scheduled_statuses.where('scheduled_at::date = ?::date', scheduled_at).count >= DAILY_LIMIT end end diff --git a/config/locales/en.yml b/config/locales/en.yml index eb81874363e..27c4ef8408f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1595,11 +1595,11 @@ en: tag: 'Public posts tagged #%{hashtag}' scheduled_statuses: over_daily_limit: - one: You have exceeded the limit of %{count} scheduled post for today - other: You have exceeded the limit of %{count} scheduled posts for today + one: You have exceeded the limit of %{limit} scheduled post for today + other: You have exceeded the limit of %{limit} scheduled posts for today over_total_limit: - one: You have exceeded the limit of %{count} scheduled post - other: You have exceeded the limit of %{count} scheduled posts + one: You have exceeded the limit of %{limit} scheduled post + other: You have exceeded the limit of %{limit} 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. From 4d8d285936d0999a87f1dd4e5a676ac6140690f3 Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Sun, 24 Sep 2023 09:16:11 +0100 Subject: [PATCH 7/7] Revert variable name in trends e-mails --- app/views/admin_mailer/_new_trending_links.text.erb | 2 +- app/views/admin_mailer/_new_trending_tags.text.erb | 2 +- config/locales/en.yml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/admin_mailer/_new_trending_links.text.erb b/app/views/admin_mailer/_new_trending_links.text.erb index 8a0ff57371d..0e2a6a20a6d 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', 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)) %> + <%= 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)) %> <% 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 8b7e76c3b6b..f738caaf3db 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', 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: Trends.tags.score(tag.id).round(2)) %> + <%= 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: Trends.tags.score(tag.id).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 27c4ef8408f..30e7a69ac3f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -895,8 +895,8 @@ en: other: Shared by %{count} people over the last week title: Trending links usage_comparison: - one: Shared %{count} time today, compared to %{yesterday} yesterday - other: Shared %{count} times today, compared to %{yesterday} yesterday + one: Shared %{today} time today, compared to %{yesterday} yesterday + other: Shared %{today} times today, compared to %{yesterday} yesterday not_allowed_to_trend: Not allowed to trend only_allowed: Only allowed pending_review: Pending review @@ -938,8 +938,8 @@ en: trending_rank: 'Trending #%{rank}' usable: Can be used usage_comparison: - one: Used %{count} time today, compared to %{yesterday} yesterday - other: Used %{count} times today, compared to %{yesterday} yesterday + one: Used %{today} time today, compared to %{yesterday} yesterday + other: Used %{today} 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