From 34a631c6226a0ea28c466f7973ccd89243b875aa Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Fri, 1 Sep 2023 16:38:11 +0100 Subject: [PATCH 1/8] Pluralize scheduled status limits (untested) --- app/models/scheduled_status.rb | 4 ++-- config/locales/en.yml | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/models/scheduled_status.rb b/app/models/scheduled_status.rb index 1f4f04268d4..b241790d769 100644 --- a/app/models/scheduled_status.rb +++ b/app/models/scheduled_status.rb @@ -31,10 +31,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 2ab8f015d36..18d831b73ec 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1754,9 +1754,13 @@ 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 - too_soon: date must be in the future + 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 + over_total_limit: + 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. title: This server is closing down From 5a244a7a28600fb89f2e3f1c7f33024c4e86ecd9 Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Fri, 1 Sep 2023 16:46:48 +0100 Subject: [PATCH 2/8] 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 18d831b73ec..685139d3342 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1602,7 +1602,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 47dcd16c33e3457febe885e98626c42b55e4a464 Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Fri, 1 Sep 2023 16:55:18 +0100 Subject: [PATCH 3/8] 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 685139d3342..b278921212f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1451,7 +1451,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 cc6afa65b439ce595a07ffcb8f994f4ee83aa3a0 Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Fri, 1 Sep 2023 17:01:56 +0100 Subject: [PATCH 4/8] 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 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 c9bd1bc7172..bffa17814d0 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 b278921212f..17a9d243ce0 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 15031a58952..2a91e0c4809 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 From ec4d5818c691eea76cfe2130f4f940bbb11464d2 Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Fri, 1 Sep 2023 19:37:31 +0100 Subject: [PATCH 5/8] 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 17a9d243ce0..8133b30b9b4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1764,10 +1764,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 29a779159eb1f49f72e6e0d6cbd16d2ce3c1de8d Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Sun, 24 Sep 2023 09:09:12 +0100 Subject: [PATCH 6/8] 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 b241790d769..1f4f04268d4 100644 --- a/app/models/scheduled_status.rb +++ b/app/models/scheduled_status.rb @@ -31,10 +31,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 8133b30b9b4..3e70edc9411 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1763,11 +1763,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 fa0907d92352167374b689fab2c60a2ff830e934 Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Sun, 24 Sep 2023 09:16:11 +0100 Subject: [PATCH 7/8] Revert variable name in trends e-mails --- app/views/admin_mailer/_new_trending_links.text.erb | 2 +- config/locales/en.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 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/config/locales/en.yml b/config/locales/en.yml index 3e70edc9411..3bdd50c8c65 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1028,8 +1028,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 @@ -1075,8 +1075,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 From 4b9864bf2e0f8aa6afff4a8eb4356319c377f462 Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Thu, 2 Jan 2025 15:33:53 +0000 Subject: [PATCH 8/8] Change placeholder names to 'count' --- app/models/scheduled_status.rb | 4 ++-- .../admin_mailer/_new_trending_links.text.erb | 2 +- config/locales/en.yml | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/models/scheduled_status.rb b/app/models/scheduled_status.rb index 1f4f04268d4..b241790d769 100644 --- a/app/models/scheduled_status.rb +++ b/app/models/scheduled_status.rb @@ -31,10 +31,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/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/config/locales/en.yml b/config/locales/en.yml index 3bdd50c8c65..8133b30b9b4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1028,8 +1028,8 @@ en: other: Shared by %{count} people over the last week title: Trending links usage_comparison: - one: Shared %{today} time today, compared to %{yesterday} yesterday - other: Shared %{today} times today, compared to %{yesterday} yesterday + 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 @@ -1075,8 +1075,8 @@ en: trending_rank: 'Trending #%{rank}' usable: Can be used usage_comparison: - one: Used %{today} time today, compared to %{yesterday} yesterday - other: Used %{today} times today, compared to %{yesterday} yesterday + 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 @@ -1763,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.