merge 19601:19888 of rails_port into the openID branch

[rails.git] / app / helpers / application_helper.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7dcbe369b4eca7868f3b93084be921e5307f617e..d805e27adee83bfe8518ec846b943940e5fd7dbb 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,6 +1,18 @@
 module ApplicationHelper
   def htmlize(text)
 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)
   end
 
   def rss_link_to(*args)


@@ -26,10 +38,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}")