diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-09-30 19:56:49 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-09-30 19:56:49 +0000 |
| commit | fad92747bec989fd6728eb7349c9ede4674764ff (patch) | |
| tree | 6f1c6ca613dff0af2a769c6b13aa97d00cb432a9 /languages | |
| parent | 9af90ffc9a20033ca9fdd9182122c01600a0867b (diff) | |
| download | elgg-fad92747bec989fd6728eb7349c9ede4674764ff.tar.gz elgg-fad92747bec989fd6728eb7349c9ede4674764ff.tar.bz2 | |
Fixes #617, #2271 User validation removed from core to UserValidationByEmail plugin. Without a validation plugin, users can login immediately.
Fixes #2243 Removed "You have validated your email" email. Users are logged in immediately after registration or validating email.
Refs #2409 Added register, user plugin hook that is called only on self registration. Can be used to halt registration.
git-svn-id: http://code.elgg.org/elgg/trunk@6983 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'languages')
| -rw-r--r-- | languages/en.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/languages/en.php b/languages/en.php index 797cfee7a..95ec4ba38 100644 --- a/languages/en.php +++ b/languages/en.php @@ -22,7 +22,7 @@ $english = array( 'login' => "Log in", 'loginok' => "You have been logged in.", - 'loginerror' => "We couldn't log you in. This may be because you haven't validated your account yet, the details you supplied were incorrect, or you have made too many incorrect login attempts. Make sure your details are correct and please try again.", + 'loginerror' => "We couldn't log you in. Please check your credentials and try again.", 'logout' => "Log out", 'logoutok' => "You have been logged out.", @@ -379,7 +379,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.", 'register' => "Register", 'registerok' => "You have successfully registered for %s.", - 'registerbad' => "Your registration was unsuccessful. The username may already exist, your passwords might not match, or your username or password may be too short.", + 'registerbad' => "Your registration was unsuccessful because of an unknown error.", 'registerdisabled' => "Registration has been disabled by the system administrator", 'firstadminlogininstructions' => "Enable and disable plugins to customize your new Elgg site! (Remember to hit 'Save' when you're done.)", @@ -878,7 +878,7 @@ If you requested this click on the link below, otherwise ignore this email. 'likes:userslikedthis' => 'users like this', 'likes:river:annotate' => 'likes', 'likes:email:body' => '%s liked %s', - 'likes:email:subject' => 'A user liked one of your objects', + 'likes:email:subject' => 'A user liked one of your objects', /** * Comments |