X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/fe8d5c05731841436657b0bef359575fc4b2fe51..7599f98957334d1924550205f7ba12a726de7eb0:/app/helpers/application_helper.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3213c5e4c..18f233e50 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -9,14 +9,6 @@ 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" });
   end
@@ -25,17 +17,6 @@ module ApplicationHelper
     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)
-  end
-
   def style_rules
     css = ""
 
@@ -107,20 +88,23 @@ module ApplicationHelper
     end
   end
 
-private
+  def dir
+    if dir = params[:dir]
+      dir == "rtl" ? "rtl" : "ltr"
+    else
+      I18n.t("html.dir")
+    end
+  end
 
-  def javascript_strings_for_key(key)
-    js = ""
-    value = I18n.t(key, :locale => "en")
+  def friendly_date(date)
+    content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
+  end
 
-    if value.is_a?(String)
-      js << "i18n_strings['#{key}'] = '" << escape_javascript(t(key)) << "';\n"
+  def note_author(object, link_options = {})
+    if object.author.nil?
+      h(object.author_name)
     else
-      value.each_key do |k|
-        js << javascript_strings_for_key("#{key}.#{k}")
-      end
+      link_to h(object.author_name), link_options.merge({:controller => "user", :action => "view", :display_name => object.author_name})
     end
-
-    return js
   end
 end