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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Michal Čihař 2012-04-09 00:19:53 +02:00
commit 1b05f5a05a
4 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/db_structure.js
View File

@ -298,7 +298,10 @@ $(document).ready(function() {
/**
* @var question String containing the question to be asked for confirmation
*/
var question = 'TRUNCATE ' + curr_table_name;
var question =
PMA_messages.strTruncateTableStrongWarning + ' '
+ PMA_messages.strDoYouReally
+ '<br /><br />TRUNCATE ' + curr_table_name;
$this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function(url) {

15
js/functions.js
View File

@ -2282,7 +2282,10 @@ $(document).ready(function() {
/**
* @var question String containing the question to be asked for confirmation
*/
var question = PMA_messages['strDropDatabaseStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + '\n' + 'DROP DATABASE ' + escapeHtml(window.parent.db);
var question =
PMA_messages.strDropDatabaseStrongWarning + ' '
+ PMA_messages.strDoYouReally
+ '<br /><br />DROP DATABASE ' + escapeHtml(window.parent.db);
$(this).PMA_confirm(question, $(this).attr('href'), function(url) {
@ -3341,7 +3344,10 @@ $(document).ready(function() {
/**
* @var question String containing the question to be asked for confirmation
*/
var question = PMA_messages['strDropTableStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + '\n' + 'DROP TABLE ' + window.parent.table;
var question =
PMA_messages.strDropTableStrongWarning + ' '
+ PMA_messages.strDoYouReally
+ '<br /><br />DROP TABLE ' + window.parent.table;
$(this).PMA_confirm(question, $(this).attr('href'), function(url) {
@ -3372,7 +3378,10 @@ $(document).ready(function() {
/**
* @var question String containing the question to be asked for confirmation
*/
var question = PMA_messages['strTruncateTableStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + '\n' + 'TRUNCATE TABLE ' + window.parent.table;
var question =
PMA_messages.strTruncateTableStrongWarning + ' '
+ PMA_messages.strDoYouReally
+ '<br /><br />TRUNCATE ' + window.parent.table;
$(this).PMA_confirm(question, $(this).attr('href'), function(url) {

8
libraries/display_tbl.lib.php
View File

@ -2385,13 +2385,13 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
$message->addMessage(', ', '');
}
$messagge_qt = PMA_Message::notice(__('Query took %01.4f sec'));
$messagge_qt = PMA_Message::notice(__('Query took %01.4f sec') . ')');
$messagge_qt->addParam($GLOBALS['querytime']);
$message->addMessage($messagge_qt, '');
$message->addMessage(')', '');
$message->addMessage(isset($sorted_column_message) ? $sorted_column_message : '', '');
if (isset($sorted_column_message)) {
$message->addMessage($sorted_column_message, '');
}
PMA_showMessage($message, $sql_query, 'success');

4
sql.php
View File

@ -763,11 +763,9 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
}
if (isset($GLOBALS['querytime'])) {
$_querytime = PMA_Message::notice(__('Query took %01.4f sec'));
$_querytime = PMA_Message::notice('(' . __('Query took %01.4f sec') . ')');
$_querytime->addParam($GLOBALS['querytime']);
$message->addMessage('(');
$message->addMessage($_querytime);
$message->addMessage(')');
}
if ($GLOBALS['is_ajax_request'] == true) {