Skip to content

Commit 3a8bc60

Browse files
committed
fix build
1 parent 291acca commit 3a8bc60

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

lib/js_locale_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def self.output_locale(locale, translations = nil)
1111
plugin_translations.merge! YAML::load(File.open(file))
1212
end
1313
# merge translations (plugin translations overwrite default translations)
14-
translations[locale_str]['js'].merge!(plugin_translations[locale_str]['js'])
14+
translations[locale_str]['js'].merge!(plugin_translations[locale_str]['js']) if translations[locale_str] && plugin_translations[locale_str]
1515

1616
# We used to split the admin versus the client side, but it's much simpler to just
1717
# include both for now due to the small size of the admin section.

0 commit comments

Comments
 (0)