Merge branch 'master' into openid

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7dcbe369b4eca7868f3b93084be921e5307f617e..5fa021bcf4e695c130c2e4094fe1ecb2ccdb68cc 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,6 +1,24 @@
 module ApplicationHelper
 module ApplicationHelper

+  require 'rexml/document'
+
+  def sanitize(text)
+    Sanitize.clean(text, Sanitize::Config::OSM)
+  end
+

   def htmlize(text)
   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)


@@ -22,14 +40,54 @@ module ApplicationHelper
     return js
   end
 
     return js
   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
+      Timeout::timeout(4) do
+        response = 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"
+
+    if user.image
+      image_tag url_for_file_column(user, "image"), options
+    else
+      image_tag "anon_large.png", options
+    end
+  end
+
+  def user_thumbnail(user, options = {})
+    options[:class] ||= "user_thumbnail"
+
+    if user.image
+      image_tag url_for_file_column(user, "image"), options
+    else
+      image_tag "anon_small.png", options
+    end
+  end
+

 private
 
   def javascript_strings_for_key(key)
     js = ""
 private
 
   def javascript_strings_for_key(key)
     js = ""

-    value = t(key)
+    value = I18n.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}")