From: Tom Hughes <tom@compton.nu>
Date: Thu, 8 Oct 2009 12:25:55 +0000 (+0000)
Subject: Fix output of javascript strings - use english strings to walk the
X-Git-Tag: live~6551
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fb9789929c4353d3a655235bf2ecfc1ae7c94c49?hp=468d2766d8be5314d426e4e7b3ea70a4e0e1f60e

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 7dcbe369b..bee4f9ce2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -26,10 +26,10 @@ private
 
   def javascript_strings_for_key(key)
     js = ""
-    value = t(key)
+    value = t(key, :locale => "en")
 
     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}")