765806 - Adding the oxford comma - thanks cliff

daviddavis · Feb 14, 2012 · 930cef9 · 930cef9
1 parent 6d1e6dc
commit 930cef9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/app/controllers/failed_authentication_controller.rb b/src/app/controllers/failed_authentication_controller.rb
@@ -22,7 +22,7 @@ def unauthenticated_ui
     # otherwise, these actions would report an error that user must be logged in to perform them.
 
     if request.env['HTTP_X_FORWARDED_USER'].blank?
-      flash[:error] = {"notices" => [_("You have entered an incorrect username or password combination or your account may currently be disabled. Please try again or contact your administrator.")]}.to_json
+      flash[:error] = {"notices" => [_("You have entered an incorrect username or password combination, or your account may currently be disabled. Please try again or contact your administrator.")]}.to_json
       redirect_to new_user_session_url
     else
       flash[:error] = {"notices" => [_("You do not have valid credentials to access this system. Please contact your administrator.")]}.to_json