i18next: Revert some changes, as es/pt/pt-PT aren't mixed up (yet)

2 files changed, 24 insertions, 22 deletions

diff --git a/spec/i18next_plurals_spec.cr b/spec/i18next_plurals_spec.cr
index 57a93340..dab97710 100644
--- a/spec/i18next_plurals_spec.cr
+++ b/spec/i18next_plurals_spec.cr
@@ -17,7 +17,7 @@ FORM_TESTS = {
   "cy"    => I18next::Plurals::PluralForms::Special_Welsh,
   "fr"    => I18next::Plurals::PluralForms::Special_French_Portuguese,
   "en"    => I18next::Plurals::PluralForms::Single_not_one,
-  "es"    => I18next::Plurals::PluralForms::Special_Spanish_Italian,
+  "es"    => I18next::Plurals::PluralForms::Single_not_one,
   "ga"    => I18next::Plurals::PluralForms::Special_Irish,
   "gd"    => I18next::Plurals::PluralForms::Special_Scottish_Gaelic,
   "he"    => I18next::Plurals::PluralForms::Special_Hebrew,
@@ -33,8 +33,8 @@ FORM_TESTS = {
   "mt"    => I18next::Plurals::PluralForms::Special_Maltese,
   "or"    => I18next::Plurals::PluralForms::Special_Odia,
   "pl"    => I18next::Plurals::PluralForms::Special_Polish_Kashubian,
-  "pt"    => I18next::Plurals::PluralForms::Special_French_Portuguese,
-  "pt-PT" => I18next::Plurals::PluralForms::Special_French_Portuguese,
+  "pt"    => I18next::Plurals::PluralForms::Single_gt_one,
+  "pt-BR" => I18next::Plurals::PluralForms::Special_French_Portuguese,
   "ro"    => I18next::Plurals::PluralForms::Special_Romanian,
   "sk"    => I18next::Plurals::PluralForms::Special_Czech_Slovak,
   "sl"    => I18next::Plurals::PluralForms::Special_Slovenian,
@@ -77,10 +77,10 @@ SUFFIX_TESTS = {
     {num: 10, suffix: "_plural"},
   ],
   "es" => [
-    {num: 0, suffix: "_2"},
-    {num: 1, suffix: "_0"},
-    {num: 10, suffix: "_2"},
-    {num: 6_000_000, suffix: "_1"},
+    {num: 0, suffix: "_plural"},
+    {num: 1, suffix: ""},
+    {num: 10, suffix: "_plural"},
+    {num: 6_000_000, suffix: "_plural"},
   ],
   "fr" => [
     {num: 0, suffix: "_0"},
@@ -166,7 +166,7 @@ SUFFIX_TESTS = {
     {num: 1, suffix: "_0"},
     {num: 5, suffix: "_2"},
   ],
-  "pt" => [
+  "pt-BR" => [
     {num: 0, suffix: "_0"},
     {num: 1, suffix: "_0"},
     {num: 10, suffix: "_2"},
@@ -174,11 +174,10 @@ SUFFIX_TESTS = {
     {num: 9_000_000, suffix: "_1"},
   ],
   "pt-PT" => [
-    {num: 0, suffix: "_0"},
-    {num: 1, suffix: "_0"},
-    {num: 10, suffix: "_2"},
-    {num: 42, suffix: "_2"},
-    {num: 9_000_000, suffix: "_1"},
+    {num: 0, suffix: ""},
+    {num: 1, suffix: ""},
+    {num: 10, suffix: "_plural"},
+    {num: 9_000_000, suffix: "_plural"},
   ],
   "ro" => [
     {num: 0, suffix: "_1"},
diff --git a/src/invidious/helpers/i18next.cr b/src/invidious/helpers/i18next.cr
index a857c67b..252af6b9 100644
--- a/src/invidious/helpers/i18next.cr
+++ b/src/invidious/helpers/i18next.cr
@@ -37,6 +37,8 @@ module I18next::Plurals
     Special_Odia             = 23
 
     # Mixed v3/v4 rules in Weblate
+    # `es`, `pt` and `pt-PT` doesn't seem to have been refreshed
+    # by weblate yet, but I suspect it will happen one day.
     # See: https://github.com/translate/translate/issues/4873
     Special_French_Portuguese
     Special_Hungarian_Serbian
@@ -46,11 +48,11 @@ module I18next::Plurals
   private PLURAL_SETS = {
     PluralForms::Single_gt_one => [
       "ach", "ak", "am", "arn", "br", "fil", "gun", "ln", "mfe", "mg",
-      "mi", "oc", "tg", "tl", "ti", "tr", "uz", "wa",
+      "mi", "oc", "pt", "tg", "tl", "ti", "tr", "uz", "wa",
     ],
     PluralForms::Single_not_one => [
       "af", "an", "ast", "az", "bg", "bn", "ca", "da", "de", "dev", "el", "en",
-      "eo", "et", "eu", "fi", "fo", "fur", "fy", "gl", "gu", "ha", "hi",
+      "eo", "es", "et", "eu", "fi", "fo", "fur", "fy", "gl", "gu", "ha", "hi",
       "hu", "hy", "ia", "kk", "kn", "ku", "lb", "mai", "ml", "mn", "mr",
       "nah", "nap", "nb", "ne", "nl", "nn", "no", "nso", "pa", "pap", "pms",
       "ps", "rm", "sco", "se", "si", "so", "son", "sq", "sv", "sw",
@@ -88,12 +90,11 @@ module I18next::Plurals
     "sk"  => PluralForms::Special_Czech_Slovak,
     "sl"  => PluralForms::Special_Slovenian,
     # Mixed v3/v4 rules
-    "es" => PluralForms::Special_Spanish_Italian,
-    "fr" => PluralForms::Special_French_Portuguese,
-    "hr" => PluralForms::Special_Hungarian_Serbian,
-    "it" => PluralForms::Special_Spanish_Italian,
-    "pt" => PluralForms::Special_French_Portuguese,
-    "sr" => PluralForms::Special_Hungarian_Serbian,
+    "fr"    => PluralForms::Special_French_Portuguese,
+    "hr"    => PluralForms::Special_Hungarian_Serbian,
+    "it"    => PluralForms::Special_Spanish_Italian,
+    "pt-BR" => PluralForms::Special_French_Portuguese,
+    "sr"    => PluralForms::Special_Hungarian_Serbian,
   }
 
   # These are the v1 and v2 compatible suffixes.
@@ -164,7 +165,9 @@ module I18next::Plurals
 
     def get_plural_form(locale : String) : PluralForms
       # Extract the ISO 639-1 or 639-2 code from an RFC 5646 language code
-      locale = locale.split('-')[0]
+      if !locale.matches?(/^pt-BR$/)
+        locale = locale.split('-')[0]
+      end
 
       return self.forms[locale] if self.forms[locale]?