aboutsummaryrefslogtreecommitdiff
path: root/languages
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-14 23:22:13 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-14 23:22:13 +0000
commit25530a3caf7ea6714f22830a4792756507a722b0 (patch)
tree1da40b8831853f1240ad80cc94a09fbfaf00601b /languages
parent202241825d11a2b7952e42a222857da90921bdca (diff)
downloadelgg-25530a3caf7ea6714f22830a4792756507a722b0.tar.gz
elgg-25530a3caf7ea6714f22830a4792756507a722b0.tar.bz2
Refs #1417 Elgg core now passes back useful messages to user when log in fails - uservalidationbyemail is next
git-svn-id: http://code.elgg.org/elgg/trunk@7317 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'languages')
-rw-r--r--languages/en.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/languages/en.php b/languages/en.php
index 522f9e364..118ad8883 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -21,6 +21,9 @@ $english = array(
'login' => "Log in",
'loginok' => "You have been logged in.",
'loginerror' => "We couldn't log you in. Please check your credentials and try again.",
+ 'login:empty' => "Username and password are required.",
+ 'login:baduser' => "Unable to load your user account.",
+ 'auth:nopams' => "Internal error. No user authentication method installed.",
'logout' => "Log out",
'logoutok' => "You have been logged out.",
@@ -174,6 +177,10 @@ $english = array(
'RegistrationException:EmptyPassword' => 'The password fields cannot be empty',
'RegistrationException:PasswordMismatch' => 'Passwords must match',
+ 'LoginException:BannedUser' => 'You have been banned from this site and cannot log in',
+ 'LoginException:UsernameFailure' => 'We could not log you in. Please check your username and password.',
+ 'LoginException:PasswordFailure' => 'We could not log you in. Please check your username and password.',
+ 'LoginException:AccountLocked' => 'Your account has been locked for too many log in failures.',
'memcache:notinstalled' => 'PHP memcache module not installed, you must install php5-memcache',
'memcache:noservers' => 'No memcache servers defined, please populate the $CONFIG->memcache_servers variable',