Drop the MapQuest Open layer

[rails.git] / app / controllers / amf_controller.rb

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index f6ae7f231443228d4a349f98b318d832d6b4aa26..9cd6857483982e89cb8c5feec0098ee774a540d2 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -151,7 +151,7 @@ class AmfController < ApplicationController
         cs = Changeset.find(closeid.to_i)
         cs.set_closed_time_now
         if cs.user_id != user.id
         cs = Changeset.find(closeid.to_i)
         cs.set_closed_time_now
         if cs.user_id != user.id

-          fail OSM::APIUserChangesetMismatchError.new
+          raise OSM::APIUserChangesetMismatchError.new

         elsif closecomment.empty?
           cs.save!
         else
         elsif closecomment.empty?
           cs.save!
         else


@@ -189,12 +189,14 @@ class AmfController < ApplicationController
   def getpresets(usertoken, lang) #:doc:
     user = getuser(usertoken)
 
   def getpresets(usertoken, lang) #:doc:
     user = getuser(usertoken)
 

-    if user && !user.languages.empty?
-      http_accept_language.user_preferred_languages = user.languages
-    end
+    langs = if user && !user.languages.empty?
+              Locale.list(user.languages)
+            else
+              Locale.list(http_accept_language.user_preferred_languages)
+            end

 
 

-    lang = http_accept_language.compatible_language_from(getlocales)
-    (real_lang, localised) = getlocalized(lang)
+    lang = getlocales.preferred(langs)
+    (real_lang, localised) = getlocalized(lang.to_s)

 
     # Tell Potlatch what language it's using
     localised["__potlatch_locale"] = real_lang
 
     # Tell Potlatch what language it's using
     localised["__potlatch_locale"] = real_lang


@@ -469,11 +471,11 @@ class AmfController < ApplicationController
       return -1, t("application.setup_user_auth.blocked") if user.blocks.active.exists?
 
       query = Trace.visible_to(user)
       return -1, t("application.setup_user_auth.blocked") if user.blocks.active.exists?
 
       query = Trace.visible_to(user)

-      if searchterm.to_i > 0
-        query = query.where(:id => searchterm.to_i)
-      else
-        query = query.where("MATCH(name) AGAINST (?)", searchterm).limit(21)
-      end
+      query = if searchterm.to_i > 0
+                query.where(:id => searchterm.to_i)
+              else
+                query.where("MATCH(name) AGAINST (?)", searchterm).limit(21)
+              end

       gpxs = query.collect do |gpx|
         [gpx.id, gpx.name, gpx.description]
       end
       gpxs = query.collect do |gpx|
         [gpx.id, gpx.name, gpx.description]
       end


@@ -675,7 +677,7 @@ class AmfController < ApplicationController
 
         # -- Save revised way
 
 
         # -- Save revised way
 

-        pointlist.collect! do|a|
+        pointlist.collect! do |a|

           renumberednodes[a] ? renumberednodes[a] : a
         end # renumber nodes
         new_way = Way.new
           renumberednodes[a] ? renumberednodes[a] : a
         end # renumber nodes
         new_way = Way.new


@@ -866,15 +868,14 @@ class AmfController < ApplicationController
 
   def getuser(token) #:doc:
     if token =~ /^(.+)\:(.+)$/
 
   def getuser(token) #:doc:
     if token =~ /^(.+)\:(.+)$/

-      user = User.authenticate(:username => $1, :password => $2)
+      User.authenticate(:username => $1, :password => $2)

     else
     else

-      user = User.authenticate(:token => token)
+      User.authenticate(:token => token)

     end
     end

-    user

   end
 
   def getlocales
   end
 
   def getlocales

-    Dir.glob("#{Rails.root}/config/potlatch/locales/*").collect { |f| File.basename(f, ".yml") }
+    @locales ||= Locale.list(Dir.glob("#{Rails.root}/config/potlatch/locales/*").collect { |f| File.basename(f, ".yml") })

   end
 
   ##
   end
 
   ##