github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-23 02:25:40 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gerhard Schlager 2019-06-07 21:53:01 +02:00
parent a08b2589d4
commit 19edc4abb8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/i18n/backend/fallback_locale_list.rb
View File

@ -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)

1
spec/lib/i18n/fallback_locale_list_spec.rb
View File

@ -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