From fe8a330fd6bdc1ee72758a9f40c90db7653ea28d Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Sun, 16 May 2010 16:39:16 +0000 Subject: [PATCH] user.login.account suspended so translators don't have to type out anchors --- app/controllers/user_controller.rb | 3 ++- config/locales/en.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index e07b65af7..d86c9a4ba 100644 --- 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 6b2db6ba1..9bdfe0e3c 100644 --- 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.
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.
Please contact the webmaster if you wish to discuss this. + account suspended: Sorry, your account has been suspended due to suspicious activity.
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" -- 2.43.2