Fix output of javascript strings - use english strings to walk the

tree but output strings in the correct locale. Closes #2362.

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7dcbe369b4eca7868f3b93084be921e5307f617e..bee4f9ce2f4dc5a6ec30ab8fb90b816675da3860 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -26,10 +26,10 @@ private
 
   def javascript_strings_for_key(key)
     js = ""
 
   def javascript_strings_for_key(key)
     js = ""

-    value = t(key)
+    value = t(key, :locale => "en")

 
     if value.is_a?(String)
 
     if value.is_a?(String)

-      js << "i18n_strings['#{key}'] = '" << escape_javascript(value) << "';\n"
+      js << "i18n_strings['#{key}'] = '" << escape_javascript(t(key)) << "';\n"

     else
       value.each_key do |k|
         js << javascript_strings_for_key("#{key}.#{k}")
     else
       value.each_key do |k|
         js << javascript_strings_for_key("#{key}.#{k}")