Use report_error so Potlatch can see the errors

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 926be87ba3148183df3f463ca8e5f7986d71d563..d715c618df35f0697dac19fc5399df4191c1891b 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -104,14 +104,15 @@ class ApplicationController < ActionController::Base
       # check if the user has been banned
       if not  @user.active_blocks.empty?
         # NOTE: need slightly more helpful message than this.
       # check if the user has been banned
       if not  @user.active_blocks.empty?
         # NOTE: need slightly more helpful message than this.

-        render :text => t('application.setup_user_auth.blocked'), :status => :forbidden
+        report_error t('application.setup_user_auth.blocked'), :forbidden

       end
 
       # if the user hasn't seen the contributor terms then don't
       # allow editing - they have to go to the web site and see
       # (but can decline) the CTs to continue.
       if REQUIRE_TERMS_SEEN and not @user.terms_seen
       end
 
       # if the user hasn't seen the contributor terms then don't
       # allow editing - they have to go to the web site and see
       # (but can decline) the CTs to continue.
       if REQUIRE_TERMS_SEEN and not @user.terms_seen

-        render :text => t('application.setup_user_auth.need_to_see_terms'), :status => :forbidden
+        set_locale
+        report_error t('application.setup_user_auth.need_to_see_terms'), :forbidden

       end
     end
   end
       end
     end
   end