user.login.account suspended so translators don't have to type out anchors

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index e07b65af76502278deb69b98c62283bc76f20e39..d86c9a4bafef12ae71260ad06ba43002b8084ac5 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -197,7 +197,8 @@ class UserController < ApplicationController
       elsif User.authenticate(:username => email_or_display_name, :password => pass, :pending => true)
         flash.now[:error] = t 'user.login.account not active'
       elsif User.authenticate(:username => email_or_display_name, :password => pass, :suspended => true)
-        flash.now[:error] = t 'user.login.account suspended'
+        webmaster = link_to t('user.login.webmaster'), "mailto:webmaster@openstreetmap.org"
+        flash.now[:error] = t 'user.login.account suspended', :webmaster => webmaster
       else
         flash.now[:error] = t 'user.login.auth failure'
       end

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6b2db6ba1d7135a4e989504422bf958394915029..9bdfe0e3c329339181f0f1fb4f43e2ca7477e443 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1489,7 +1489,8 @@ en:
       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."
-      account suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> if you wish to discuss this.
+      account suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the {{webmaster}} if you wish to discuss this.
+      webmaster: webmaster
       auth failure: "Sorry, could not log in with those details."
     logout:
       title: "Logout"