diff options
| -rw-r--r-- | admin_users.php | 4 | ||||
| -rw-r--r-- | edituser.php | 2 | ||||
| -rw-r--r-- | login.php | 2 | ||||
| -rw-r--r-- | login_register.php | 10 | ||||
| -rw-r--r-- | modules_v3/login_block/module.php | 2 | ||||
| -rw-r--r-- | modules_v3/todo/module.php | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/admin_users.php b/admin_users.php index 3912232096..273f158630 100644 --- a/admin_users.php +++ b/admin_users.php @@ -426,7 +426,7 @@ case 'createform': <!--table--> <table id="adduser"> <tr> - <td><?php echo WT_I18N::translate('User name'), help_link('useradmin_username'); ?></td> + <td><?php echo WT_I18N::translate('Username'), help_link('useradmin_username'); ?></td> <td colspan="3" ><input type="text" name="username" autofocus /></td> </tr> <tr> @@ -678,7 +678,7 @@ default: '<tr>', '<th style="margin:0 -2px 1px 1px; padding:6px 0 5px;"> </th>', '<th> user-id </th>', - '<th>', WT_I18N::translate('User name'), '</th>', + '<th>', WT_I18N::translate('Username'), '</th>', '<th>', WT_I18N::translate('Real name'), '</th>', '<th>', WT_I18N::translate('Email'), '</th>', '<th> </th>', /* COLSPAN does not work? */ diff --git a/edituser.php b/edituser.php index 21813bf17d..1edd917595 100644 --- a/edituser.php +++ b/edituser.php @@ -143,7 +143,7 @@ echo '<table class="list_table center ', $TEXT_DIRECTION, '">'; echo '<tr><td class="topbottombar" colspan="2"><h2>', WT_I18N::translate('My account'), '</h2></td></tr>'; echo '<tr><td class="descriptionbox width20 wrap">'; -echo WT_I18N::translate('User name'), help_link('edituser_username'), '</td><td class="optionbox">'; +echo WT_I18N::translate('Username'), help_link('edituser_username'), '</td><td class="optionbox">'; echo '<input type="text" name="form_username" value="', WT_USER_NAME, '" autofocus />'; echo '</td></tr>'; @@ -182,7 +182,7 @@ echo '</td></tr></table><br /><br />'; <table class="center facts_table width50"> <tr><td class="topbottombar" colspan="2"><?php echo WT_I18N::translate('Login'); ?></td></tr> <tr> - <td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width50"><label for="username"><?php echo WT_I18N::translate('User name'), '</label>', help_link('username'); ?></td> + <td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width50"><label for="username"><?php echo WT_I18N::translate('Username'), '</label>', help_link('username'); ?></td> <td class="optionbox <?php echo $TEXT_DIRECTION; ?>"><input type="text" id="username" name="username" value="<?php echo htmlspecialchars($username); ?>" size="20" class="formField" /></td> </tr> <tr> diff --git a/login_register.php b/login_register.php index de247f32fe..001db0e8b0 100644 --- a/login_register.php +++ b/login_register.php @@ -72,7 +72,7 @@ switch ($action) { <span class="warning"><?php echo $message; ?></span> <table class="center facts_table width25"> <tr><td class="topbottombar" colspan="2"><?php echo WT_I18N::translate('Lost password request'), help_link('pls_note11'); ?></td></tr> - <tr><td class="descriptionbox wrap <?php echo $TEXT_DIRECTION; ?>"><label for="username"><?php echo WT_I18N::translate('User name'); ?></label></td><td class="optionbox <?php echo $TEXT_DIRECTION; ?>"><input type="text" id="username" name="user_name" value="" /></td></tr> + <tr><td class="descriptionbox wrap <?php echo $TEXT_DIRECTION; ?>"><label for="username"><?php echo WT_I18N::translate('Username'); ?></label></td><td class="optionbox <?php echo $TEXT_DIRECTION; ?>"><input type="text" id="username" name="user_name" value="" /></td></tr> <tr><td class="topbottombar" colspan="2"><input type="submit" value="<?php echo WT_I18N::translate('Lost password request'); ?>" /></td></tr> </table> </form> @@ -117,7 +117,7 @@ switch ($action) { $mail_body = ''; $mail_body .= WT_I18N::translate('Hello %s ...', $newuserName) . "\r\n\r\n"; $mail_body .= WT_I18N::translate('A new password was requested for your user name.') . "\r\n\r\n"; - $mail_body .= WT_I18N::translate('User name') . ": " . $user_name . "\r\n"; + $mail_body .= WT_I18N::translate('Username') . ": " . $user_name . "\r\n"; $mail_body .= WT_I18N::translate('Password') . ": " . $user_new_pw . "\r\n\r\n"; $mail_body .= WT_I18N::translate('Recommendation:') . "\r\n"; @@ -364,7 +364,7 @@ switch ($action) { $mail_body .= WT_SERVER_NAME.WT_SCRIPT_PATH . "login_register.php?user_name=".urlencode($user_name)."&user_hashcode=".urlencode(get_user_setting($user_id, 'reg_hashcode'))."&action=userverify"; if ($TEXT_DIRECTION=='rtl') $mail_body .= "</a>"; $mail_body .= "\r\n"; - $mail_body .= WT_I18N::translate('User name') . " " . $user_name . "\r\n"; + $mail_body .= WT_I18N::translate('Username') . " " . $user_name . "\r\n"; $mail_body .= WT_I18N::translate('Verification code:') . " " . get_user_setting($user_id, 'reg_hashcode') . "\r\n\r\n"; $mail_body .= WT_I18N::translate('Comments').": " . $user_comments . "\r\n\r\n"; $mail_body .= WT_I18N::translate('If you didn\'t request an account, you can just delete this message.') . " "; @@ -380,7 +380,7 @@ switch ($action) { $mail_body = ''; $mail_body .= WT_I18N::translate('Hello Administrator ...') . "\r\n\r\n"; $mail_body .= WT_I18N::translate('A prospective user has registered with webtrees at %s.', get_gedcom_setting(WT_GED_ID, 'title').' - '.WT_SERVER_NAME.WT_SCRIPT_PATH) . "\r\n\r\n"; - $mail_body .= WT_I18N::translate('User name') . " " . $user_name . "\r\n"; + $mail_body .= WT_I18N::translate('Username') . " " . $user_name . "\r\n"; $mail_body .= WT_I18N::translate('Real name') . " " . $user_realname . "\r\n"; $mail_body .= WT_I18N::translate('Email Address:') . " " . $user_email . "\r\n\r\n"; $mail_body .= WT_I18N::translate('Comments').": " . $user_comments . "\r\n\r\n"; @@ -443,7 +443,7 @@ switch ($action) { <input type="hidden" name="time" value="" /> <table class="center facts_table width25"> <tr><td class="topbottombar" colspan="2"><?php echo WT_I18N::translate('User verification'), help_link('pls_note07'); ?></td></tr> - <tr><td class="descriptionbox wrap <?php echo $TEXT_DIRECTION; ?>"><label for="username"><?php echo WT_I18N::translate('User name'); ?></label></td><td class="optionbox <?php echo $TEXT_DIRECTION; ?>"><input type="text" id="username" name="user_name" value="<?php echo $user_name; ?>" /></td></tr> + <tr><td class="descriptionbox wrap <?php echo $TEXT_DIRECTION; ?>"><label for="username"><?php echo WT_I18N::translate('Username'); ?></label></td><td class="optionbox <?php echo $TEXT_DIRECTION; ?>"><input type="text" id="username" name="user_name" value="<?php echo $user_name; ?>" /></td></tr> <tr><td class="descriptionbox wrap <?php echo $TEXT_DIRECTION; ?>"><label for="user_password"><?php echo WT_I18N::translate('Password'); ?></label></td><td class="optionbox <?php echo $TEXT_DIRECTION; ?>"><input type="password" id="user_password" name="user_password" value="" /></td></tr> <tr><td class="descriptionbox wrap <?php echo $TEXT_DIRECTION; ?>"><label for="user_hashcode"><?php echo WT_I18N::translate('Verification code:'); ?></label></td><td class="facts_value <?php echo $TEXT_DIRECTION; ?>"><input type="text" id="user_hashcode" name="user_hashcode" value="<?php echo $user_hashcode; ?>" /></td></tr> <tr><td class="topbottombar" colspan="2"><input type="submit" value="<?php echo WT_I18N::translate('Send'); ?>" /></td></tr> diff --git a/modules_v3/login_block/module.php b/modules_v3/login_block/module.php index 061d4a13e2..6f1d444b44 100644 --- a/modules_v3/login_block/module.php +++ b/modules_v3/login_block/module.php @@ -74,7 +74,7 @@ class login_block_WT_Module extends WT_Module implements WT_Module_Block { $content .= "<tr><td "; $content .= write_align_with_textdir_check("right", true); $content .= " class=\"{$TEXT_DIRECTION} wrap width50\">"; - $content .= WT_I18N::translate('User name'); + $content .= WT_I18N::translate('Username'); $content .= help_link('username'); $content .= "</td><td "; $content .= write_align_with_textdir_check("left", true); diff --git a/modules_v3/todo/module.php b/modules_v3/todo/module.php index 1053bf477a..e8d3432c4c 100644 --- a/modules_v3/todo/module.php +++ b/modules_v3/todo/module.php @@ -92,7 +92,7 @@ class todo_WT_Module extends WT_Module implements WT_Module_Block { $content .= '<th class="list_label" style="cursor:pointer;">'.WT_Gedcom_Tag::getLabel('DATE').'</th>'; $content .= '<th class="list_label" style="cursor:pointer;">'.WT_I18N::translate('Record').'</th>'; if ($show_unassigned || $show_other) { - $content .= '<th class="list_label" style="cursor:pointer;">'.WT_I18N::translate('User name').'</th>'; + $content .= '<th class="list_label" style="cursor:pointer;">'.WT_I18N::translate('Username').'</th>'; } $content .= '<th class="list_label" style="cursor:pointer;">'.WT_Gedcom_Tag::getLabel('TEXT').'</th>'; $content .= '</tr></thead><tbody>'; |