Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: missing translations when "en" set as fallbackLocale 

When a plugin registers a language and sets fallbackLocale="en", fallback strings were missing. This commit strips any duplicate ":en" symbols when loading merged translations.
This commit is contained in:
Penar Musaraj 2019-03-07 12:51:12 -05:00
parent bc52437153
commit da64b90d4f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/js_locale_helper.rb
View File

@ -86,7 +86,7 @@ module JsLocaleHelper
end end
def self.load_translations_merged(*locales) def self.load_translations_merged(*locales)
locales = locales.compact locales = locales.uniq.compact
@loaded_merges ||= {} @loaded_merges ||= {}
@loaded_merges[locales.join('-')] ||= begin @loaded_merges[locales.join('-')] ||= begin
all_translations = {} all_translations = {}