From bcdee51aeb7e2ecbeaddfbc7643b5d52148cc589 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Tue, 11 Jul 2023 17:01:28 -0400 Subject: [PATCH] Remove the `sr` locale override .rb files History here: 2019-06 - Files added to Mastodon: https://github.com/mastodon/mastodon/pull/11061 Same Day - Details of the issue added on upstream: https://github.com/svenfuchs/rails-i18n/issues/853 2021-05 - Upstream fix: https://github.com/svenfuchs/rails-i18n/pull/925/files 2022-01 - Upstream fix part two: https://github.com/svenfuchs/rails-i18n/pull/972/files 2022-02 - Upstream release with fixes: https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md#702-2022-02-12 It looks like these files were only in place to nudge the pluralization rules, which have since been fixed in `rails-i18n`. --- .rubocop_todo.yml | 9 --------- config/locales/sr-Latn.rb | 5 ----- config/locales/sr.rb | 5 ----- 3 files changed, 19 deletions(-) delete mode 100644 config/locales/sr-Latn.rb delete mode 100644 config/locales/sr.rb diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 0f8fa67709e5e..a0fbd63dd0542 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -150,13 +150,6 @@ Metrics/CyclomaticComplexity: Metrics/PerceivedComplexity: Max: 27 -# Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, CheckDefinitionPathHierarchyRoots, Regex, IgnoreExecutableScripts, AllowedAcronyms. -# CheckDefinitionPathHierarchyRoots: lib, spec, test, src -# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS -Naming/FileName: - Exclude: - - 'config/locales/sr-Latn.rb' - # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns. # SupportedStyles: snake_case, normalcase, non_integer # AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64 @@ -844,8 +837,6 @@ Style/RedundantConstantBase: Exclude: - 'config/environments/production.rb' - 'config/initializers/sidekiq.rb' - - 'config/locales/sr-Latn.rb' - - 'config/locales/sr.rb' # This cop supports unsafe autocorrection (--autocorrect-all). # Configuration parameters: SafeForConstants. diff --git a/config/locales/sr-Latn.rb b/config/locales/sr-Latn.rb deleted file mode 100644 index b7a403a8e1c83..0000000000000 --- a/config/locales/sr-Latn.rb +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -require 'rails_i18n/common_pluralizations/romanian' - -::RailsI18n::Pluralization::Romanian.with_locale(:'sr-Latn') diff --git a/config/locales/sr.rb b/config/locales/sr.rb deleted file mode 100644 index 0605de33482ab..0000000000000 --- a/config/locales/sr.rb +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -require 'rails_i18n/common_pluralizations/romanian' - -::RailsI18n::Pluralization::Romanian.with_locale(:sr)