From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Wed, 3 Jun 2009 01:42:55 +0000 (+0000)
Subject:  * Made "Account not active" and "Couldn't log in with those details" translatable
X-Git-Tag: live~7208
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9a051df2d22dbdfe43c2014ec70ac992aa630da3?hp=dffde07308bded89e6a27ada0b2b811d0baecfdc;ds=sidebyside

 * 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 cd38dd940..b58a6a71c 100644
--- 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 2663516f1..974449171 100644
--- 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?"