X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3d0ca940d26bdc23aa791178b01b816185c5a086..4a93c5de4b6a35d47afe20ad61724289b3fd02ac:/app/controllers/application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 082c5cf65..c5624db14 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -100,6 +100,19 @@ class ApplicationController < ActionController::Base
     response.headers['Error'] = message
     render :text => message, :status => status
   end
+  
+  def set_locale
+    if @user
+      if !@user.languages.empty?
+        request.user_preferred_languages = @user.languages
+      elsif !request.user_preferred_languages.empty?
+        @user.languages = request.user_preferred_languages
+        @user.save
+      end
+    end
+
+    I18n.locale = request.compatible_language_from(I18n.available_locales)
+  end
 
   def api_call_handle_error
     begin
@@ -113,8 +126,9 @@ class ApplicationController < ActionController::Base
       ex.record.errors.each { |attr,msg| message << "#{attr}: #{msg} (#{ex.record[attr].inspect})" }
       report_error message, :bad_request
     rescue OSM::APIError => ex
-      render_opts = ex.render_opts
-      report_error render_opts[:text], render_opts[:status]
+      report_error ex.message, ex.status
+    rescue Exception => ex
+      report_error "#{ex.class}: #{ex.message}", :internal_server_error
     end
   end
 
@@ -126,8 +140,13 @@ class ApplicationController < ActionController::Base
     raise OSM::APIBadMethodError.new(method) unless ok
   end
 
-private 
+  def api_call_timeout
+    Timeout::timeout(APP_CONFIG['api_timeout'], OSM::APITimeoutError) do
+      yield
+    end
+  end
 
+private 
   # extract authorisation credentials from headers, returns user = nil if none
   def get_auth_data 
     if request.env.has_key? 'X-HTTP_AUTHORIZATION'          # where mod_rewrite might have put it