X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/561f2f694adc8ac57011eac1eec5929425276c59..d57755b737cbb38a590b0e017a4b5c6c661aea62:/app/helpers/application_helper.rb?ds=sidebyside

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 37dcf90e0..fb422cc17 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 = ""
 
@@ -75,38 +56,6 @@ module ApplicationHelper
     content_tag(tag, capture(&block), :class => "hide_unless_administrator")
   end
 
-  def describe_location(lat, lon, zoom = nil, language = nil)
-    zoom = zoom || 14
-    language = language || request.user_preferred_languages.join(',')
-    url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
-
-    begin
-      response = OSM::Timer.timeout(4) do
-        REXML::Document.new(Net::HTTP.get(URI.parse(url)))
-      end
-    rescue Exception
-      response = nil
-    end
-
-    if response and result = response.get_text("reversegeocode/result")
-      result.to_s
-    else
-      "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}"
-    end
-  end
-
-  def user_image(user, options = {})
-    options[:class] ||= "user_image"
-
-    image_tag user.image.url(:large), options
-  end
-
-  def user_thumbnail(user, options = {})
-    options[:class] ||= "user_thumbnail"
-
-    image_tag user.image.url(:small), options
-  end
-
   def preferred_editor
     if params[:editor]
       params[:editor]
@@ -139,20 +88,15 @@ module ApplicationHelper
     end
   end
 
-private
-
-  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