Handle authentication failure callbacks with no message

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 38a61208c4635120ea9864a65dfd360728914baa..8b04167b0325191ea5fa860b2b30043ed6cf435e 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -335,7 +335,7 @@ class UsersController < ApplicationController
   ##
   # omniauth failure callback
   def auth_failure
   ##
   # omniauth failure callback
   def auth_failure

-    flash[:error] = t("users.auth_failure.#{params[:message]}")
+    flash[:error] = t(params[:message], :scope => "users.auth_failure", :default => t("users.auth_failure.unknown_error"))

     redirect_to params[:origin] || login_url
   end
 
     redirect_to params[:origin] || login_url
   end
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7a2aba1aa055e0da4352a3e6c2145ac56969eb67..caee480d9448425f5a0b38aa01e916a7e4ad7bf5 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2623,6 +2623,7 @@ en:
       no_authorization_code: No authorization code
       unknown_signature_algorithm: Unknown signature algorithm
       invalid_scope: Invalid scope
       no_authorization_code: No authorization code
       unknown_signature_algorithm: Unknown signature algorithm
       invalid_scope: Invalid scope

+      unknown_error: Authentication failed

     auth_association:
       heading: Your ID is not associated with a OpenStreetMap account yet.
       option_1: |
     auth_association:
       heading: Your ID is not associated with a OpenStreetMap account yet.
       option_1: |