Issue unsaved changes alerts on IE.

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

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 6c6ffacb25396f80113b60e68a6c38a3477292a7..c5624db146b4cdbfb86d03f84308c2d6f721f96e 100644 (file)
--- 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
     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
 
   def api_call_handle_error
     begin


@@ -113,8 +126,7 @@ 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
       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
     rescue Exception => ex
       report_error "#{ex.class}: #{ex.message}", :internal_server_error
     end


@@ -135,7 +147,6 @@ class ApplicationController < ActionController::Base
   end
 
 private 
   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 
   # 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