Avoid wrapping an <li> in a <span>

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3213c5e4c41beac7312ca3a26472c5167acd60ea..10895dd60e1f57d9b2797709d2d875bc4a6720ab 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -9,31 +9,12 @@ module ApplicationHelper
     end
   end
 
-  def html_escape_unicode(text)
-    chars = ActiveSupport::Multibyte::Unicode.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" });
+    return link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" });
   end
 
   def atom_link_to(*args)
-    return link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" });
-  end
-
-  def javascript_strings
-    js = ""
-
-    js << "<script type='text/javascript'>\n"
-    js << "i18n_strings = new Array();\n"
-    js << javascript_strings_for_key("javascripts")
-    js << "</script>\n"
-
-    return raw(js)
+    return link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" });
   end
 
   def style_rules
@@ -107,20 +88,11 @@ module ApplicationHelper
     end
   end
 
-private
-
-  def javascript_strings_for_key(key)
-    js = ""
-    value = I18n.t(key, :locale => "en")
-
-    if value.is_a?(String)
-      js << "i18n_strings['#{key}'] = '" << escape_javascript(t(key)) << "';\n"
+  def dir
+    if dir = params[:dir]
+      dir == "rtl" ? "rtl" : "ltr"
     else
-      value.each_key do |k|
-        js << javascript_strings_for_key("#{key}.#{k}")
-      end
+      I18n.t("html.dir")
     end
-
-    return js
   end
 end