From 19edc4abb8442f9c5c554ca1cecfea9628fe09e1 Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Fri, 7 Jun 2019 21:53:01 +0200 Subject: [PATCH] FIX: English locale must not fall back to any other locale --- lib/i18n/backend/fallback_locale_list.rb | 2 +- spec/lib/i18n/fallback_locale_list_spec.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/i18n/backend/fallback_locale_list.rb b/lib/i18n/backend/fallback_locale_list.rb index d0abe59c06c..e1b3d25ebbb 100644 --- a/lib/i18n/backend/fallback_locale_list.rb +++ b/lib/i18n/backend/fallback_locale_list.rb @@ -12,7 +12,7 @@ module I18n 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 index 004ebfc0e59..793ac8b2a0a 100644 --- a/spec/lib/i18n/fallback_locale_list_spec.rb +++ b/spec/lib/i18n/fallback_locale_list_spec.rb @@ -27,6 +27,7 @@ describe I18n::Backend::FallbackLocaleList do 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