4 files changed, 11 insertions, 6 deletions
diff --git a/users/app/assets/javascripts/srp b/users/app/assets/javascripts/srp
-Subproject 635ea47f1c19d7985a8f5107c070ae19edf9dd5
+Subproject 076d6e251e4caf826787d87b11434e535960455
diff --git a/users/app/assets/javascripts/users.js.coffee b/users/app/assets/javascripts/users.js.coffee
index 6d1dda2..d0ec32f 100644
--- a/users/app/assets/javascripts/users.js.coffee
+++ b/users/app/assets/javascripts/users.js.coffee
@@ -37,10 +37,10 @@ srp.loggedIn = ->
 
 srp.error = (message) ->
   if $.isPlainObject(message) && message.errors
-    for key, value of message.errors
-      element = $('form input[name="session['+key+']"]')
+    for field, error of message.errors
+      element = $('form input[name="session['+field+']"]')
       next unless element
-      element.trigger('element:validate:fail.ClientSideValidations', value).data('valid', false)
+      element.trigger('element:validate:fail.ClientSideValidations', error).data('valid', false)
   else
     alert(message)
 
diff --git a/users/app/controllers/controller_extension/authentication.rb b/users/app/controllers/controller_extension/authentication.rb
index 87f7921..6ac7a5b 100644
--- a/users/app/controllers/controller_extension/authentication.rb
+++ b/users/app/controllers/controller_extension/authentication.rb
@@ -7,8 +7,12 @@ module ControllerExtension::Authentication
     helper_method :current_user, :logged_in?, :admin?
   end
 
-  def authentication_error
-    warden.winning_strategy.try(:message)
+  def authentication_errors
+    return unless errors = warden.winning_strategy.try(:message)
+    errors.inject({}) do |translated,err|
+      translated[err.first] = I18n.t(err.last)
+      translated
+    end
   end
 
   def logged_in?
diff --git a/users/app/controllers/sessions_controller.rb b/users/app/controllers/sessions_controller.rb
index 32d1ddc..bc910b5 100644
--- a/users/app/controllers/sessions_controller.rb
+++ b/users/app/controllers/sessions_controller.rb
@@ -4,7 +4,8 @@ class SessionsController < ApplicationController
 
   def new
     @session = Session.new
-    if @errors = authentication_error
+    if authentication_errors
+      @errors = authentication_errors
       render :status => 422
     end
   end