aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-18 13:04:12 +0000
committerdave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-18 13:04:12 +0000
commit75edf38bbb4fbd8352bbc1a356ad7d54230313cc (patch)
tree0648c8e13e462a83a723a747a2654274691a3af3
parent8783e3bdd666768041a812bf146e4913000cb688 (diff)
downloadelgg-75edf38bbb4fbd8352bbc1a356ad7d54230313cc.tar.gz
elgg-75edf38bbb4fbd8352bbc1a356ad7d54230313cc.tar.bz2
as you can login with either username or email, reflect this in the lang.
git-svn-id: http://code.elgg.org/elgg/trunk@6081 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--languages/en.php1
-rw-r--r--views/default/account/forms/login.php2
-rw-r--r--views/default/account/forms/login_dropdown.php2
3 files changed, 3 insertions, 2 deletions
diff --git a/languages/en.php b/languages/en.php
index 44f901c42..d82254ec4 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -200,6 +200,7 @@ $english = array(
'name' => "Display name",
'email' => "Email address",
'username' => "Username",
+ 'loginusername' => "Username or email",
'password' => "Password",
'passwordagain' => "Password (again for verification)",
'admin_option' => "Make this user an admin?",
diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php
index 168bef604..594c645de 100644
--- a/views/default/account/forms/login.php
+++ b/views/default/account/forms/login.php
@@ -8,7 +8,7 @@
* @link http://elgg.org/
*/
-$form_body = "<label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea')) . "</label>";
+$form_body = "<label>" . elgg_echo('loginusername') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea')) . "</label>";
$form_body .= "<br />";
$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login_textarea')) . "</label><br />";
diff --git a/views/default/account/forms/login_dropdown.php b/views/default/account/forms/login_dropdown.php
index 16f7ee78b..5e5afd520 100644
--- a/views/default/account/forms/login_dropdown.php
+++ b/views/default/account/forms/login_dropdown.php
@@ -5,7 +5,7 @@
*/
if (!isloggedin()) {
- $form_body = "<p class='loginbox'><label>" . elgg_echo('username') . "</label>" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea name'));
+ $form_body = "<p class='loginbox'><label>" . elgg_echo('loginusername') . "</label>" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea name'));
$form_body .= "<label>" . elgg_echo('password') . "</label>" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login_textarea'));
$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . " <span class='remember'><label><input type=\"checkbox\" name=\"persistent\" value=\"true\" />".elgg_echo('user:persistent')."</label></span></p>";