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:
Weblate 2014-01-23 10:50:06 +01:00
commit 94f664c540
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libraries/DisplayResults.class.php
View File

@ -3402,7 +3402,7 @@ class PMA_DisplayResults
'db' => $this->__get('db'),
'table' => $this->__get('table'),
'sql_query' => $url_sql_query,
'message_to_show' => __('The row has been deleted'),
'message_to_show' => __('The row has been deleted.'),
'goto' => (empty($goto) ? 'tbl_sql.php' : $goto),
);
@ -3418,7 +3418,7 @@ class PMA_DisplayResults
'db' => $this->__get('db'),
'table' => $this->__get('table'),
'sql_query' => $del_query,
'message_to_show' => __('The row has been deleted'),
'message_to_show' => __('The row has been deleted.'),
'goto' => $lnk_goto,
);
$del_url = 'sql.php' . PMA_URL_getCommon($_url_params);
@ -4588,7 +4588,7 @@ class PMA_DisplayResults
} elseif (! isset($printview) || ($printview != '1')) {
$table_html .= PMA_Util::getMessage(
__('Your SQL query has been executed successfully'),
__('Your SQL query has been executed successfully.'),
$this->__get('sql_query'), 'success'
);
}
@ -4924,12 +4924,6 @@ class PMA_DisplayResults
$unlim_num_rows = $this->__get('unlim_num_rows'); // To use in isset()
if (isset($unlim_num_rows) && ($unlim_num_rows != $total)) {
$selectstring = ', ' . $unlim_num_rows . ' ' . __('in query');
} else {
$selectstring = '';
}
if (! empty($limit_clause)) {
$limit_data
@ -4987,19 +4981,25 @@ class PMA_DisplayResults
$message->addMessage('(');
if (!$message_view_warning) {
$message_total = PMA_Message::notice($pre_count . __('%d total'));
$message_total->addParam($total);
if (isset($unlim_num_rows) && ($unlim_num_rows != $total)) {
$message_total = PMA_Message::notice($pre_count . __('%1$d total, %2$d in query'));
$message_total->addParam($total);
$message_total->addParam($unlim_num_rows);
} else {
$message_total = PMA_Message::notice($pre_count . __('%d total'));
$message_total->addParam($total);
}
if (!empty($after_count)) {
$message_total->addMessage($after_count);
}
$message->addMessage($message_total, '');
$message->addMessage($selectstring, '');
$message->addMessage(', ', '');
}
$message_qt = PMA_Message::notice(__('Query took %01.4f sec') . ')');
$message_qt = PMA_Message::notice(__('Query took %01.4f seconds.') . ')');
$message_qt->addParam($this->__get('querytime'));
$message->addMessage($message_qt, '');
@ -5634,7 +5634,7 @@ class PMA_DisplayResults
if ($dispresult && $GLOBALS['dbi']->numRows($dispresult) > 0) {
list($dispval) = $GLOBALS['dbi']->fetchRow($dispresult, 0);
} else {
$dispval = __('Link not found');
$dispval = __('Link not found!');
}
@$GLOBALS['dbi']->freeResult($dispresult);