From 3a8bc60bf2011d6f8ea1c358e4c712e7030f26ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Tue, 19 Nov 2013 17:16:07 +0100
Subject: [PATCH] fix build

---
 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 b170380207f..e17578bc4db 100644
--- a/lib/js_locale_helper.rb
+++ b/lib/js_locale_helper.rb
@@ -11,7 +11,7 @@ module JsLocaleHelper
       plugin_translations.merge! YAML::load(File.open(file))
     end
     # merge translations (plugin translations overwrite default translations)
-    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]
 
     # We used to split the admin versus the client side, but it's much simpler to just
     # include both for now due to the small size of the admin section.