From da64b90d4f19307522289253b6540e525909f303 Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Thu, 7 Mar 2019 12:51:12 -0500 Subject: [PATCH] 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. --- lib/js_locale_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb index 21fba9804e..377d11e550 100644 --- a/lib/js_locale_helper.rb +++ b/lib/js_locale_helper.rb @@ -86,7 +86,7 @@ module JsLocaleHelper end def self.load_translations_merged(*locales) - locales = locales.compact + locales = locales.uniq.compact @loaded_merges ||= {} @loaded_merges[locales.join('-')] ||= begin all_translations = {}