* Made "Account not active" and "Couldn't log in with those details" translatable

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index cd38dd9406592f0ee957bd0334dc22c4d8d201d1..b58a6a71c08b86927b2309a90839f08ea29ba11c 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -154,9 +154,9 @@ class UserController < ApplicationController
         end
         return
       elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
-        @notice = "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
+        @notice = I18n.t('user.login.account not active')
       else
-        @notice = "Sorry, couldn't log in with those details."
+        @notice = I18n.t('user.login.auth failure')
       end
     end
   end

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2663516f16078307659eafa13c43b976aa98540c..974449171d550e70d0d461cbd755cbe4c742a903 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -514,6 +514,8 @@ en:
       password: "Password: "
       lost password link: "Lost your password?"
       login_button: "Login"
+      account not active: "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
+      auth failure: "Sorry, couldn't log in with those details."
     lost_password:
       title: "lost password"
       heading: "Forgotten Password?"