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

diff --git a/languages/en.php b/languages/en.php
index 44f901c42b1e33bae3f7c8009fa19b3cde859fb7..d82254ec4a485366d4e2b723ea1d08e4e292a6bd 100644 (file)
--- 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 168bef604e6906af4a2c82f15eac48f005e6b225..594c645de1082c3e85623e6b2223ad0b52f36604 100644 (file)
--- 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 16f7ee78b71a67609b50958bacfd068733e40df8..5e5afd520ad7e13d7038476e5270190f65499855 100644 (file)
--- 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>";