Set default formats in the database now that rails handles enums

[rails.git] / lib / nominatim.rb

diff --git a/lib/nominatim.rb b/lib/nominatim.rb
index 5b1c7ac3203ca92ffdcda856ed3a47ba5a15cc01..33a0c3e26ac04e7297355414a29916effb4f2871 100644 (file)
--- a/lib/nominatim.rb
+++ b/lib/nominatim.rb
@@ -1,7 +1,9 @@
 module Nominatim
 module Nominatim

+  extend ActionView::Helpers::NumberHelper
+

   def self.describe_location(lat, lon, zoom = nil, language = nil)
     zoom = zoom || 14
   def self.describe_location(lat, lon, zoom = nil, language = nil)
     zoom = zoom || 14

-    language = language || request.user_preferred_languages.join(',')
+    language = language || http_accept_language.user_preferred_languages.join(',')

 
     Rails.cache.fetch "/nominatim/location/#{lat}/#{lon}/#{zoom}/#{language}" do
       url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
 
     Rails.cache.fetch "/nominatim/location/#{lat}/#{lon}/#{zoom}/#{language}" do
       url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"