From 75edf38bbb4fbd8352bbc1a356ad7d54230313cc Mon Sep 17 00:00:00 2001
From: dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 18 May 2010 13:04:12 +0000
Subject: 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
---
 views/default/account/forms/login.php          | 2 +-
 views/default/account/forms/login_dropdown.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'views/default/account')

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>";
 
-- 
cgit v1.2.3