gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change redundant message

Browse Source
This commit is contained in:
Marc Delisle 2011-06-07 06:29:32 -04:00
parent 3d3739a24b
commit ce65b14ced
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/messages.php
View File

@ -51,8 +51,7 @@ $js_messages['strHostEmpty'] = __('The host name is empty!');
$js_messages['strUserEmpty'] = __('The user name is empty!');
$js_messages['strPasswordEmpty'] = __('The password is empty!');
$js_messages['strPasswordNotSame'] = __('The passwords aren\'t the same!');
$js_messages['strAddNewUser'] = __('Add a New User');
$js_messages['strCreateUser'] = __('Create User');
$js_messages['strAddUser'] = __('Add user');
$js_messages['strReloadingPrivileges'] = __('Reloading Privileges');
$js_messages['strRemovingSelectedUsers'] = __('Removing Selected Users');
$js_messages['strClose'] = __('Close');

6
js/server_privileges.js
View File

@ -126,7 +126,7 @@ function appendNewUser(new_user_string, new_user_initial, new_user_initial_strin
* AJAX scripts for server_privileges page.
*
* Actions ajaxified here:
* Add a new user
* Add user
* Revoke a user
* Edit privileges
* Export privileges
@ -169,7 +169,7 @@ $(document).ready(function() {
* @var button_options Object containing options for jQueryUI dialog buttons
*/
var button_options = {};
button_options[PMA_messages['strCreateUser']] = function() {
button_options[PMA_messages['strAddUser']] = function() {
/**
* @var $form stores reference to current form
@ -252,7 +252,7 @@ $(document).ready(function() {
.find("form[name=usersForm]").append('<input type="hidden" name="ajax_request" value="true" />')
.end()
.dialog({
title: PMA_messages['strAddNewUser'],
title: PMA_messages['strAddUser'],
width: 800,
// height is a workaround for this Chrome problem:
// http://bugs.jqueryui.com/ticket/4671

10
server_privileges.php
View File

@ -1676,7 +1676,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
echo ' <fieldset id="fieldset_add_user">' . "\n"
. ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1" class="' . $conditional_class . '">' . "\n"
. PMA_getIcon('b_usradd.png')
. ' ' . __('Add a new User') . '</a>' . "\n"
. ' ' . __('Add user') . '</a>' . "\n"
. ' </fieldset>' . "\n"
. ' <fieldset id="fieldset_delete_user">'
. ' <legend>' . "\n"
@ -1700,7 +1700,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
echo ' <fieldset id="fieldset_add_user">' . "\n"
. ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1">' . "\n"
. PMA_getIcon('b_usradd.png')
. ' ' . __('Add a new User') . '</a>' . "\n"
. ' ' . __('Add user') . '</a>' . "\n"
. ' </fieldset>' . "\n";
} // end if (display overview)
@ -2102,10 +2102,10 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
}
} elseif (isset($_REQUEST['adduser'])) {
// Add a new user
// Add user
$GLOBALS['url_query'] .= '&amp;adduser=1';
echo '<h2>' . "\n"
. PMA_getIcon('b_usradd.png') . __('Add a new User') . "\n"
. PMA_getIcon('b_usradd.png') . __('Add user') . "\n"
. '</h2>' . "\n"
. '<form name="usersForm" id="addUsersForm_' . $random_n . '" action="server_privileges.php" method="post">' . "\n"
. PMA_generate_common_hidden_inputs('', '');
@ -2299,7 +2299,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
$user_form .= '<fieldset id="fieldset_add_user">' . "\n"
. ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1&amp;dbname=' . htmlspecialchars($checkprivs) .'" val="'.'checkprivs='.htmlspecialchars($checkprivs). '&'.$GLOBALS['url_query'] . '" class="'.$conditional_class.'" name="db_specific">' . "\n"
. PMA_getIcon('b_usradd.png')
. ' ' . __('Add a new User') . '</a>' . "\n"
. ' ' . __('Add user') . '</a>' . "\n"
. '</fieldset>' . "\n";
echo $user_form ;
}