FIX: English locale must not fall back to any other locale

Mystery-cyf · Jun 7, 2019 · 19edc4a · 19edc4a
1 parent a08b258
commit 19edc4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/i18n/backend/fallback_locale_list.rb b/lib/i18n/backend/fallback_locale_list.rb
@@ -12,7 +12,7 @@ def [](locale)
         site_locale = SiteSetting.default_locale.to_sym
 
         locale_list =
-          if locale == site_locale || site_locale == :en
+          if locale == site_locale || site_locale == :en || fallback_locale == :en
             [locale, fallback_locale, :en]
           else
             site_fallback_locale = LocaleSiteSetting.fallback_locale(site_locale)

diff --git a/spec/lib/i18n/fallback_locale_list_spec.rb b/spec/lib/i18n/fallback_locale_list_spec.rb
@@ -27,6 +27,7 @@
     expect(list[:ru]).to eq([:ru, :de, :en])
     expect(list[:de]).to eq([:de, :en])
     expect(list[:en]).to eq([:en])
+    expect(list[:en_US]).to eq([:en_US, :en])
   end
 
   context "when plugin registered fallback locale" do