We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 291acca commit 3a8bc60Copy full SHA for 3a8bc60
1 file changed
lib/js_locale_helper.rb
@@ -11,7 +11,7 @@ def self.output_locale(locale, translations = nil)
11
plugin_translations.merge! YAML::load(File.open(file))
12
end
13
# merge translations (plugin translations overwrite default translations)
14
- translations[locale_str]['js'].merge!(plugin_translations[locale_str]['js'])
+ translations[locale_str]['js'].merge!(plugin_translations[locale_str]['js']) if translations[locale_str] && plugin_translations[locale_str]
15
16
# We used to split the admin versus the client side, but it's much simpler to just
17
# include both for now due to the small size of the admin section.
0 commit comments