From f23d30100a3a85d4d099e9ea95a97b1dd5a3f9b0 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 9 Feb 2023 08:46:42 -0500 Subject: [PATCH 1/3] Cleanup unused i18n strings (#23426) * Remove partial 422/500 error translations * Add missing siblings for i18n unused warnings * Enable i18n unused string checking for all locales --- .github/workflows/check-i18n.yml | 2 +- config/locales/af.yml | 2 -- config/locales/bn.yml | 2 -- config/locales/br.yml | 2 -- config/locales/bs.yml | 2 -- config/locales/csb.yml | 2 -- config/locales/en-GB.yml | 2 -- config/locales/ga.yml | 4 ++-- config/locales/hi.yml | 2 -- config/locales/hr.yml | 2 -- config/locales/hy.yml | 1 - config/locales/ig.yml | 2 -- config/locales/ka.yml | 2 ++ config/locales/kab.yml | 3 ++- config/locales/kn.yml | 2 -- config/locales/kw.yml | 2 -- config/locales/la.yml | 2 -- config/locales/lt.yml | 2 ++ config/locales/mk.yml | 2 -- config/locales/ml.yml | 2 -- config/locales/mr.yml | 2 -- config/locales/ms.yml | 1 - config/locales/my.yml | 2 -- config/locales/pa.yml | 2 -- config/locales/sa.yml | 2 -- config/locales/sr-Latn.yml | 3 ++- config/locales/szl.yml | 2 -- config/locales/ta.yml | 2 -- config/locales/tai.yml | 2 -- config/locales/te.yml | 2 -- config/locales/tt.yml | 4 ++-- config/locales/ug.yml | 2 -- config/locales/ur.yml | 2 -- config/locales/uz.yml | 2 -- config/locales/zgh.yml | 2 -- 35 files changed, 13 insertions(+), 61 deletions(-) diff --git a/.github/workflows/check-i18n.yml b/.github/workflows/check-i18n.yml index 9a74630607..b2e6197868 100644 --- a/.github/workflows/check-i18n.yml +++ b/.github/workflows/check-i18n.yml @@ -30,7 +30,7 @@ jobs: - name: Check locale file normalization run: bundle exec i18n-tasks check-normalized - name: Check for unused strings - run: bundle exec i18n-tasks unused -l en + run: bundle exec i18n-tasks unused - name: Check for wrong string interpolations run: bundle exec i18n-tasks check-consistent-interpolations - name: Check that all required locale files exist diff --git a/config/locales/af.yml b/config/locales/af.yml index dadb61c756..ed86619911 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -96,9 +96,7 @@ af: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. exports: bookmarks: Boekmerke diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 5a40fad8f3..1f2550d298 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -232,9 +232,7 @@ bn: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. verification: verification: সত্যতা নির্ধারণ diff --git a/config/locales/br.yml b/config/locales/br.yml index c53fac24f6..6be93d2924 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -342,9 +342,7 @@ br: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. exports: archive_takeout: diff --git a/config/locales/bs.yml b/config/locales/bs.yml index adb1ccc2a2..2709636c9f 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -6,7 +6,5 @@ bs: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. diff --git a/config/locales/csb.yml b/config/locales/csb.yml index 0d4e4b36b2..e2a6dd4de6 100644 --- a/config/locales/csb.yml +++ b/config/locales/csb.yml @@ -6,7 +6,5 @@ csb: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index b02e00bf01..496d240a05 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -190,9 +190,7 @@ en-GB: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. sessions: browsers: diff --git a/config/locales/ga.yml b/config/locales/ga.yml index 7f1a2b6feb..073f2bad00 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -369,9 +369,7 @@ ga: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. exports: archive_takeout: @@ -437,6 +435,8 @@ ga: prev: Ceann roimhe seo preferences: other: Eile + posting_defaults: Posting defaults + public_timelines: Public timelines relationships: follow_selected_followers: Lean leantóirí roghnaithe followers: Leantóirí diff --git a/config/locales/hi.yml b/config/locales/hi.yml index 7678edc385..50fae82bd8 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -6,7 +6,5 @@ hi: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 7a9ee2dc39..0563712266 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -81,9 +81,7 @@ hr: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. exports: archive_takeout: diff --git a/config/locales/hy.yml b/config/locales/hy.yml index df7dd3e2e0..de995c5b5e 100644 --- a/config/locales/hy.yml +++ b/config/locales/hy.yml @@ -539,7 +539,6 @@ hy: '404': Էջը, որը փնտրում ես գոյութիւն չունի։ '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Չափազանց շատ հարցումներ '500': title: Էջը ճիշտ չէ diff --git a/config/locales/ig.yml b/config/locales/ig.yml index c327065183..6459396380 100644 --- a/config/locales/ig.yml +++ b/config/locales/ig.yml @@ -6,7 +6,5 @@ ig: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 41a51a8b09..ff08987d9a 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -394,6 +394,8 @@ ka: prev: წინა preferences: other: სხვა + posting_defaults: Posting defaults + public_timelines: Public timelines remote_follow: missing_resource: საჭირო გადამისამართების ურლ თქვენი ანგარიშისთვის ვერ მოიძებნა sessions: diff --git a/config/locales/kab.yml b/config/locales/kab.yml index 235aad5b38..7f77b2be78 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -508,7 +508,6 @@ kab: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests '500': title: Asebter-ayi d arameγtu @@ -630,6 +629,8 @@ kab: prev: Win iɛeddan preferences: other: Wiyaḍ + posting_defaults: Posting defaults + public_timelines: Public timelines privacy_policy: title: Tasertit tabaḍnit relationships: diff --git a/config/locales/kn.yml b/config/locales/kn.yml index d44eb868f3..998f613ef7 100644 --- a/config/locales/kn.yml +++ b/config/locales/kn.yml @@ -6,7 +6,5 @@ kn: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. diff --git a/config/locales/kw.yml b/config/locales/kw.yml index 7683e30423..4085046cf6 100644 --- a/config/locales/kw.yml +++ b/config/locales/kw.yml @@ -11,9 +11,7 @@ kw: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. settings: account: Akont diff --git a/config/locales/la.yml b/config/locales/la.yml index 0a4bec9ee9..244938ef6b 100644 --- a/config/locales/la.yml +++ b/config/locales/la.yml @@ -6,7 +6,5 @@ la: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 58d0ae4f48..28c9419591 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -426,6 +426,8 @@ lt: prev: Ankstesnis preferences: other: Kita + posting_defaults: Posting defaults + public_timelines: Public timelines remote_follow: missing_resource: Jūsų paskyros nukreipimo URL nerasta scheduled_statuses: diff --git a/config/locales/mk.yml b/config/locales/mk.yml index b538272dee..9504dc972e 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -6,7 +6,5 @@ mk: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. diff --git a/config/locales/ml.yml b/config/locales/ml.yml index d5442c96cb..ae39911456 100644 --- a/config/locales/ml.yml +++ b/config/locales/ml.yml @@ -87,9 +87,7 @@ ml: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. filters: contexts: diff --git a/config/locales/mr.yml b/config/locales/mr.yml index 9d7609ea4b..161e5e5717 100644 --- a/config/locales/mr.yml +++ b/config/locales/mr.yml @@ -6,7 +6,5 @@ mr: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 848580f0ce..1fc856c64f 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -827,7 +827,6 @@ ms: '422': title: Pengesahan keselamatan gagal '429': Terlalu banyak permintaan - '500': '503': Halaman tidak dapat disampaikan kerana kegagalan pelayan sementara. exports: archive_takeout: diff --git a/config/locales/my.yml b/config/locales/my.yml index 399105ce07..ae5a59e092 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -6,7 +6,5 @@ my: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. diff --git a/config/locales/pa.yml b/config/locales/pa.yml index 0fc957a99f..1a91937967 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -6,7 +6,5 @@ pa: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. diff --git a/config/locales/sa.yml b/config/locales/sa.yml index 229e4568c5..f8c64a7854 100644 --- a/config/locales/sa.yml +++ b/config/locales/sa.yml @@ -6,7 +6,5 @@ sa: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index dc62f22206..1a4a2b7b1e 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -209,7 +209,6 @@ sr-Latn: '404': Strana koju ste tražili ne postoji. '406': This page is not available in the requested format. '410': Strana koju ste tražili više ne postoji. - '422': '429': Uspored '500': content: Izvinjavamo se, nešto je pošlo po zlu sa ove strane. @@ -289,6 +288,8 @@ sr-Latn: prev: Prethodni preferences: other: Ostali + posting_defaults: Posting defaults + public_timelines: Public timelines remote_follow: missing_resource: Ne mogu da nađem zahtevanu adresu preusmeravanja za Vaš nalog sessions: diff --git a/config/locales/szl.yml b/config/locales/szl.yml index 4359f4d610..2e059c51ac 100644 --- a/config/locales/szl.yml +++ b/config/locales/szl.yml @@ -6,7 +6,5 @@ szl: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. diff --git a/config/locales/ta.yml b/config/locales/ta.yml index d691c0ec81..2d2bce86ad 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -203,9 +203,7 @@ ta: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. filters: index: diff --git a/config/locales/tai.yml b/config/locales/tai.yml index 3b22e9999b..f347ac6200 100644 --- a/config/locales/tai.yml +++ b/config/locales/tai.yml @@ -6,7 +6,5 @@ tai: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. diff --git a/config/locales/te.yml b/config/locales/te.yml index d325d0fba0..e3b3f97ab6 100644 --- a/config/locales/te.yml +++ b/config/locales/te.yml @@ -76,7 +76,5 @@ te: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. diff --git a/config/locales/tt.yml b/config/locales/tt.yml index b2986602db..01b491b11b 100644 --- a/config/locales/tt.yml +++ b/config/locales/tt.yml @@ -136,9 +136,7 @@ tt: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. exports: archive_takeout: @@ -183,6 +181,8 @@ tt: truncate: "…" preferences: other: Башка + posting_defaults: Posting defaults + public_timelines: Public timelines relationships: following: Язылгансыз sessions: diff --git a/config/locales/ug.yml b/config/locales/ug.yml index 779d4d226f..ea5bdb5c88 100644 --- a/config/locales/ug.yml +++ b/config/locales/ug.yml @@ -6,7 +6,5 @@ ug: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. diff --git a/config/locales/ur.yml b/config/locales/ur.yml index 31c2292bbd..a5ae83fd42 100644 --- a/config/locales/ur.yml +++ b/config/locales/ur.yml @@ -6,7 +6,5 @@ ur: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. diff --git a/config/locales/uz.yml b/config/locales/uz.yml index 94260c6660..caed654ec7 100644 --- a/config/locales/uz.yml +++ b/config/locales/uz.yml @@ -45,7 +45,5 @@ uz: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. diff --git a/config/locales/zgh.yml b/config/locales/zgh.yml index d29daf18c4..4750a6cee5 100644 --- a/config/locales/zgh.yml +++ b/config/locales/zgh.yml @@ -89,9 +89,7 @@ zgh: '404': The page you are looking for isn't here. '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. - '422': '429': Too many requests - '500': '503': The page could not be served due to a temporary server failure. exports: archive_takeout: From 67de888bad9b045787dd8fe6db77658b84137426 Mon Sep 17 00:00:00 2001 From: Claire Date: Fri, 10 Feb 2023 10:20:43 +0100 Subject: [PATCH 2/3] Fix server status URL being a required server setting (#23499) --- app/models/form/admin_settings.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index 001caa3765..070478e8ee 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -69,7 +69,7 @@ class Form::AdminSettings validates :show_domain_blocks_rationale, inclusion: { in: %w(disabled users all) }, if: -> { defined?(@show_domain_blocks_rationale) } validates :media_cache_retention_period, :content_cache_retention_period, :backups_retention_period, numericality: { only_integer: true }, allow_blank: true, if: -> { defined?(@media_cache_retention_period) || defined?(@content_cache_retention_period) || defined?(@backups_retention_period) } validates :site_short_description, length: { maximum: 200 }, if: -> { defined?(@site_short_description) } - validates :status_page_url, url: true + validates :status_page_url, url: true, allow_blank: true validate :validate_site_uploads KEYS.each do |key| From a9c220242bcc5f3d5e4c8ea92483f6b626a30ffa Mon Sep 17 00:00:00 2001 From: Claire Date: Fri, 10 Feb 2023 11:14:58 +0100 Subject: [PATCH 3/3] Fix admin-set follow recommandations being case-sensitive (#23500) Fixes #23472 --- app/models/account_suggestions/setting_source.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/account_suggestions/setting_source.rb b/app/models/account_suggestions/setting_source.rb index be9eff2335..7b8873e0c5 100644 --- a/app/models/account_suggestions/setting_source.rb +++ b/app/models/account_suggestions/setting_source.rb @@ -54,7 +54,7 @@ class AccountSuggestions::SettingSource < AccountSuggestions::Source next if username.blank? - [username, domain] + [username.downcase, domain&.downcase] end.compact end @@ -63,6 +63,6 @@ class AccountSuggestions::SettingSource < AccountSuggestions::Source end def to_ordered_list_key(account) - [account.username, account.domain] + [account.username.downcase, account.domain&.downcase] end end