Localisation updates from http://translatewiki.net.

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 815270f02fbb7a10e93277817eec4e5f3410df69..aec6120808d8f202e4dcf7e6ed231e1ac431e568 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -45,7 +45,7 @@ class ApplicationController < ActionController::Base
       if request.get?
         redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath
       else
       if request.get?
         redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath
       else

-        render :nothing => true, :status => :forbidden
+        render :text => "", :status => :forbidden

       end
     end
   end
       end
     end
   end


@@ -124,7 +124,7 @@ class ApplicationController < ActionController::Base
         flash[:error] = t('application.require_moderator.not_a_moderator')
         redirect_to :action => 'index'
       else
         flash[:error] = t('application.require_moderator.not_a_moderator')
         redirect_to :action => 'index'
       else

-        render :nothing => true, :status => :forbidden
+        render :text => "", :status => :forbidden

       end
     end
   end
       end
     end
   end


@@ -325,7 +325,7 @@ class ApplicationController < ActionController::Base
     begin
       yield
     rescue ActiveRecord::RecordNotFound => ex
     begin
       yield
     rescue ActiveRecord::RecordNotFound => ex

-      render :nothing => true, :status => :not_found
+      render :text => "", :status => :not_found

     rescue LibXML::XML::Error, ArgumentError => ex
       report_error ex.message, :bad_request
     rescue ActiveRecord::RecordInvalid => ex
     rescue LibXML::XML::Error, ArgumentError => ex
       report_error ex.message, :bad_request
     rescue ActiveRecord::RecordInvalid => ex


@@ -370,7 +370,7 @@ class ApplicationController < ActionController::Base
   rescue ActionView::Template::Error => ex
     ex = ex.original_exception
 
   rescue ActionView::Template::Error => ex
     ex = ex.original_exception
 

-    if ex.is_a?(ActiveRecord::StatementInvalid) and ex.message =~ /^Timeout::Error/
+    if ex.is_a?(ActiveRecord::StatementInvalid) and ex.message =~ /execution expired/

       ex = Timeout::Error.new
     end
 
       ex = Timeout::Error.new
     end
 


@@ -405,7 +405,7 @@ class ApplicationController < ActionController::Base
 
     respond_to do |format|
       format.html { render :template => "user/no_such_user", :status => :not_found }
 
     respond_to do |format|
       format.html { render :template => "user/no_such_user", :status => :not_found }

-      format.all { render :nothing => true, :status => :not_found }
+      format.all { render :text => "", :status => :not_found }

     end
   end
 
     end
   end
 


@@ -422,6 +422,24 @@ class ApplicationController < ActionController::Base
     request.body.rewind
   end
 
     request.body.rewind
   end
 

+  def preferred_editor
+    editor = if params[:editor]
+      params[:editor]
+    elsif @user and @user.preferred_editor
+      @user.preferred_editor
+    else
+      DEFAULT_EDITOR
+    end
+
+    if request.env['HTTP_USER_AGENT'] =~ /MSIE/ and editor == 'id'
+      editor = 'potlatch2'
+    end
+
+    editor
+  end
+
+  helper_method :preferred_editor
+

 private 
 
   # extract authorisation credentials from headers, returns user = nil if none
 private 
 
   # extract authorisation credentials from headers, returns user = nil if none