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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 010737245..d805e27ad 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,6 +1,18 @@
 module ApplicationHelper
   def htmlize(text)
-    return sanitize(auto_link(simple_format(text), :urls))
+    return linkify(sanitize(simple_format(text)))
+  end
+
+  def linkify(text)
+    return auto_link(text, :link => :urls, :html => { :rel => "nofollow" })
+  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)
@@ -15,7 +27,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 +38,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}")