X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/596ab82461c6662cbfbe027c16e332d75a1e3c2e..121df0ce751af5e8c5688eba2ddfc8334c0cf58c:/app/helpers/application_helper.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 010737245..ab0ba82a8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -3,6 +3,14 @@ module ApplicationHelper
     return sanitize(auto_link(simple_format(text), :urls))
   end
 
+  def html_escape_unicode(text)
+    chars = ActiveSupport::Multibyte::Chars.u_unpack(text).map do |c|
+      c < 127 ? c.chr : "&##{c.to_s};"
+    end
+
+    return chars.join("")
+  end
+
   def rss_link_to(*args)
     return link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" });
   end
@@ -15,7 +23,7 @@ module ApplicationHelper
     js = ""
 
     js << "<script type='text/javascript'>\n"
-    js << "rails_i18n = new Array();\n"
+    js << "i18n_strings = new Array();\n"
     js << javascript_strings_for_key("javascripts")
     js << "</script>\n"
 
@@ -26,10 +34,10 @@ private
 
   def javascript_strings_for_key(key)
     js = ""
-    value = t(key)
+    value = t(key, :locale => "en")
 
     if value.is_a?(String)
-      js << "rails_i18n['#{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}")