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

Merge remote-tracking branch 'origin/master' into useNamespaces_master

Browse Source
This commit is contained in:
Hugues Peccatte 2015-10-04 18:04:49 +02:00
commit 6f4676cdfc
46 changed files with 146 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db_central_columns.php
View File

@ -78,7 +78,7 @@ if (isset($_REQUEST['edit_central_columns_page'])) {
if (isset($_POST['multi_edit_central_column_save'])) {
$message = PMA_updateMultipleColumn();
if (!is_bool($message)) {
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON('message', $message);
}
}

2
db_create.php
View File

@ -52,7 +52,7 @@ if (! $result) {
*/
if ($GLOBALS['is_ajax_request'] == true) {
$response = PMA\libraries\Response::getInstance();
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON('message', $message);
} else {
include_once 'index.php';

12
db_designer.php
View File

@ -37,7 +37,7 @@ if (isset($_REQUEST['operation'])) {
if ($_REQUEST['operation'] == 'deletePage') {
$success = PMA_deletePage($_REQUEST['selected_page']);
$response->isSuccess($success);
$response->setRequestStatus($success);
} elseif ($_REQUEST['operation'] == 'savePage') {
if ($_REQUEST['save_page'] == 'same') {
$page = $_REQUEST['selected_page'];
@ -46,12 +46,12 @@ if (isset($_REQUEST['operation'])) {
$response->addJSON('id', $page);
}
$success = PMA_saveTablePositions($page);
$response->isSuccess($success);
$response->setRequestStatus($success);
} elseif ($_REQUEST['operation'] == 'setDisplayField') {
PMA_saveDisplayField(
$_REQUEST['db'], $_REQUEST['table'], $_REQUEST['field']
);
$response->isSuccess(true);
$response->setRequestStatus(true);
} elseif ($_REQUEST['operation'] == 'addNewRelation') {
list($success, $message) = PMA_addNewRelation(
$_REQUEST['db'],
@ -62,7 +62,7 @@ if (isset($_REQUEST['operation'])) {
$_REQUEST['on_delete'],
$_REQUEST['on_update']
);
$response->isSuccess($success);
$response->setRequestStatus($success);
$response->addJSON('message', $message);
} elseif ($_REQUEST['operation'] == 'removeRelation') {
list($success, $message) = PMA_removeRelation(
@ -71,11 +71,11 @@ if (isset($_REQUEST['operation'])) {
$_REQUEST['T2'],
$_REQUEST['F2']
);
$response->isSuccess($success);
$response->setRequestStatus($success);
$response->addJSON('message', $message);
} elseif ($_REQUEST['operation'] == 'save_setting_value') {
$success = PMA_saveDesignerSetting($_REQUEST['index'], $_REQUEST['value']);
$response->isSuccess($success);
$response->setRequestStatus($success);
}
return;

2
db_operations.php
View File

@ -182,7 +182,7 @@ if (/*overload*/mb_strlen($GLOBALS['db'])
*/
if ($GLOBALS['is_ajax_request'] == true) {
$response = PMA\libraries\Response::getInstance();
$response->isSuccess($message->isSuccess());
$response->setRequestStatus($message->isSuccess());
$response->addJSON('message', $message);
$response->addJSON('newname', $_REQUEST['newname']);
$response->addJSON(

10
doc/config.rst
View File

@ -2038,7 +2038,8 @@ Tabs display settings
:type: string
:default: ``'welcome'``
Defines the tab displayed by default on server view. Possible values:
Defines the tab displayed by default on server view. The possible values
are the localized equivalent of:
* ``welcome`` (recommended for multi-user setups)
* ``databases``,
@ -2051,8 +2052,8 @@ Tabs display settings
:type: string
:default: ``'structure'``
Defines the tab displayed by default on database view. Possible
values:
Defines the tab displayed by default on database view. The possible values
are the localized equivalent of:
* ``structure``
* ``sql``
@ -2064,7 +2065,8 @@ Tabs display settings
:type: string
:default: ``'browse'``
Defines the tab displayed by default on table view. Possible values:
Defines the tab displayed by default on table view. The possible values
are the localized equivalent of:
* ``structure``
* ``sql``

8
import.php
View File

@ -358,7 +358,7 @@ if (! empty($_REQUEST['id_bookmark'])) {
if ($GLOBALS['is_ajax_request'] == true) {
$message = PMA\libraries\Message::success(__('Showing bookmark'));
$response = PMA\libraries\Response::getInstance();
$response->isSuccess($message->isSuccess());
$response->setRequestStatus($message->isSuccess());
$response->addJSON('message', $message);
$response->addJSON('sql_query', $import_text);
$response->addJSON('action_bookmark', $_REQUEST['action_bookmark']);
@ -373,7 +373,7 @@ if (! empty($_REQUEST['id_bookmark'])) {
if ($GLOBALS['is_ajax_request'] == true) {
$message = PMA\libraries\Message::success(__('The bookmark has been deleted.'));
$response = PMA\libraries\Response::getInstance();
$response->isSuccess($message->isSuccess());
$response->setRequestStatus($message->isSuccess());
$response->addJSON('message', $message);
$response->addJSON('action_bookmark', $_REQUEST['action_bookmark']);
$response->addJSON('id_bookmark', $id_bookmark);
@ -793,7 +793,7 @@ if ($go_sql) {
}
$response = PMA\libraries\Response::getInstance();
$response->isSuccess(true);
$response->setRequestStatus(true);
$response->addJSON('message', PMA\libraries\Message::success($msg));
$response->addJSON(
'sql_query',
@ -801,7 +801,7 @@ if ($go_sql) {
);
} else if ($result == false) {
$response = PMA\libraries\Response::getInstance();
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON('message', PMA\libraries\Message::error($msg));
} else {
$active_page = $goto;

5
libraries/Response.php
View File

@ -136,7 +136,7 @@ class Response
*
* @return void
*/
public function isSuccess($state)
public function setRequestStatus($state)
{
$this->_isSuccess = ($state == true);
}
@ -294,8 +294,7 @@ class Response
if ($this->_isSuccess) {
// Note: the old judge sentence is:
// $this->_isAjaxPage && $this->_isSuccess
// Removal the first, because console need log all queries, if caused any
// bug, contact Edward Cheng
// Removal the first, because console need log all queries
$this->addJSON('_title', $this->getHeader()->getTitleTag());
if (isset($GLOBALS['dbi'])) {

14
libraries/SavedSearches.php
View File

@ -243,7 +243,7 @@ class SavedSearches
__('Please provide a name for this bookmarked search.')
);
$response = Response::getInstance();
$response->isSuccess($message->isSuccess());
$response->setRequestStatus($message->isSuccess());
$response->addJSON('fieldWithError', 'searchName');
$response->addJSON('message', $message);
exit;
@ -258,7 +258,7 @@ class SavedSearches
__('Missing information to save the bookmarked search.')
);
$response = Response::getInstance();
$response->isSuccess($message->isSuccess());
$response->setRequestStatus($message->isSuccess());
$response->addJSON('message', $message);
exit;
}
@ -280,7 +280,7 @@ class SavedSearches
__('An entry with this name already exists.')
);
$response = Response::getInstance();
$response->isSuccess($message->isSuccess());
$response->setRequestStatus($message->isSuccess());
$response->addJSON('fieldWithError', 'searchName');
$response->addJSON('message', $message);
exit;
@ -317,7 +317,7 @@ class SavedSearches
__('An entry with this name already exists.')
);
$response = Response::getInstance();
$response->isSuccess($message->isSuccess());
$response->setRequestStatus($message->isSuccess());
$response->addJSON('fieldWithError', 'searchName');
$response->addJSON('message', $message);
exit;
@ -344,7 +344,7 @@ class SavedSearches
__('Missing information to delete the search.')
);
$response = Response::getInstance();
$response->isSuccess($message->isSuccess());
$response->setRequestStatus($message->isSuccess());
$response->addJSON('fieldWithError', 'searchId');
$response->addJSON('message', $message);
exit;
@ -372,7 +372,7 @@ class SavedSearches
__('Missing information to load the search.')
);
$response = Response::getInstance();
$response->isSuccess($message->isSuccess());
$response->setRequestStatus($message->isSuccess());
$response->addJSON('fieldWithError', 'searchId');
$response->addJSON('message', $message);
exit;
@ -390,7 +390,7 @@ class SavedSearches
if (false === ($oneResult = $GLOBALS['dbi']->fetchArray($resList))) {
$message = Message::error(__('Error while loading the search.'));
$response = Response::getInstance();
$response->isSuccess($message->isSuccess());
$response->setRequestStatus($message->isSuccess());
$response->addJSON('fieldWithError', 'searchId');
$response->addJSON('message', $message);
exit;

2
libraries/Util.php
View File

@ -779,7 +779,7 @@ class Util
*/
if (!empty($GLOBALS['is_ajax_request'])) {
$response = Response::getInstance();
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON('message', $error_msg);
exit;
}

2
libraries/common.inc.php
View File

@ -1105,7 +1105,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
* an ajax request if there is a token mismatch
*/
if (isset($response) && $response->isAjax() && $token_mismatch) {
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON(
'message',
Message::error(__('Error: Token mismatch'))

14
libraries/controllers/TableStructureController.php
View File

@ -154,7 +154,7 @@ class TableStructureController extends TableController
$reserved_keywords_names[] = trim($this->table);
}
if (count($reserved_keywords_names) == 0) {
$this->response->isSuccess(false);
$this->response->setRequestStatus(false);
}
$this->response->addJSON(
'message', sprintf(
@ -167,7 +167,7 @@ class TableStructureController extends TableController
)
);
} else {
$this->response->isSuccess(false);
$this->response->setRequestStatus(false);
}
return;
}
@ -246,7 +246,7 @@ class TableStructureController extends TableController
);
}
} else {
$this->response->isSuccess(false);
$this->response->setRequestStatus(false);
$this->response->addJSON('message', __('No column selected.'));
}
}
@ -463,7 +463,7 @@ class TableStructureController extends TableController
array_splice($column_names, $i, 0, $column);
}
if (empty($changes)) { // should never happen
$this->response->isSuccess(false);
$this->response->setRequestStatus(false);
return;
}
// move columns
@ -476,7 +476,7 @@ class TableStructureController extends TableController
);
$tmp_error = $this->dbi->getError();
if ($tmp_error) {
$this->response->isSuccess(false);
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error($tmp_error));
} else {
$message = Message::success(
@ -734,7 +734,7 @@ class TableStructureController extends TableController
Util::getMessage($message, $sql_query, 'success')
);
} else {
$this->response->isSuccess(false);
$this->response->setRequestStatus(false);
$this->response->addJSON(
'message',
Message::rawError(
@ -1006,7 +1006,7 @@ class TableStructureController extends TableController
// Column reverted back to original
$this->dbi->query($revert_query);
$this->response->isSuccess(false);
$this->response->setRequestStatus(false);
$this->response->addJSON(
'message',
Message::rawError(

8
libraries/controllers/table/TableChartController.php
View File

@ -71,7 +71,7 @@ class TableChartController extends TableController
// Throw error if no sql query is set
if (!isset($this->sql_query) || $this->sql_query == '') {
$this->response->isSuccess(false);
$this->response->setRequestStatus(false);
$this->response->addHTML(
Message::error(__('No SQL query was set to fetch data.'))
);
@ -144,7 +144,7 @@ class TableChartController extends TableController
}
if ($numeric_column_count == 0) {
$this->response->isSuccess(false);
$this->response->setRequestStatus(false);
$this->response->addJSON(
'message',
__('No numeric columns present in the table to plot.')
@ -208,7 +208,7 @@ class TableChartController extends TableController
}
if (empty($data)) {
$this->response->isSuccess(false);
$this->response->setRequestStatus(false);
$this->response->addJSON('message', __('No data to display'));
return;
}
@ -223,7 +223,7 @@ class TableChartController extends TableController
}
$sanitized_data[] = $tmp_row;
}
$this->response->isSuccess(true);
$this->response->setRequestStatus(true);
$this->response->addJSON('message', null);
$this->response->addJSON('chartData', json_encode($sanitized_data));
}

2
libraries/controllers/table/TableGisVisualizationController.php
View File

@ -92,7 +92,7 @@ class TableGisVisualizationController extends TableController
{
// Throw error if no sql query is set
if (! isset($this->sql_query) || $this->sql_query == '') {
$this->response->isSuccess(false);
$this->response->setRequestStatus(false);
$this->response->addHTML(
Message::error(__('No SQL query was set to fetch data.'))
);

2
libraries/controllers/table/TableIndexesController.php
View File

@ -166,7 +166,7 @@ class TableIndexesController extends TableController
include 'tbl_structure.php';
}
} else {
$this->response->isSuccess(false);
$this->response->setRequestStatus(false);
$this->response->addJSON('message', $error);
}
}

4
libraries/core.lib.php
View File

@ -224,8 +224,8 @@ function PMA_fatalError(
if ($GLOBALS['is_ajax_request']) {
$response = PMA\libraries\Response::getInstance();
$response->isSuccess(false);
$response->addJSON('message', Message::error($error_message));
$response->setRequestStatus(false);
$response->addJSON('message', PMA\libraries\Message::error($error_message));
} else {
$error_message = strtr($error_message, array('<br />' => '[br]'));

4
libraries/db_common.inc.php
View File

@ -67,7 +67,7 @@ if (! isset($is_db) || ! $is_db) {
if (!/*overload*/mb_strlen($db) || ! $is_db) {
$response = PMA\libraries\Response::getInstance();
if ($response->isAjax()) {
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON(
'message',
Message::error(__('No databases selected.'))
@ -101,7 +101,7 @@ if (isset($_REQUEST['submitcollation'])
*/
if ($GLOBALS['is_ajax_request'] == true) {
$response = PMA\libraries\Response::getInstance();
$response->isSuccess($message->isSuccess());
$response->setRequestStatus($message->isSuccess());
$response->addJSON('message', $message);
exit;
}

2
libraries/db_table_exists.lib.php
View File

@ -27,7 +27,7 @@ if (empty($is_db)) {
if (! defined('IS_TRANSFORMATION_WRAPPER')) {
$response = PMA\libraries\Response::getInstance();
if ($response->isAjax()) {
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON(
'message',
Message::error(__('No databases selected.'))

2
libraries/display_git_revision.lib.php
View File

@ -18,7 +18,7 @@ function PMA_printGitRevision()
{
if (! $GLOBALS['PMA_Config']->get('PMA_VERSION_GIT')) {
$response = PMA\libraries\Response::getInstance();
$response->isSuccess(false);
$response->setRequestStatus(false);
return;
}

4
libraries/import.lib.php
View File

@ -1371,8 +1371,8 @@ function PMA_stopImport( Message $error_message )
$_SESSION['Import_message']['message'] = $msg;
$response = PMA\libraries\Response::getInstance();
$response->isSuccess(false);
$response->addJSON('message', Message::error($msg));
$response->setRequestStatus(false);
$response->addJSON('message', PMA\libraries\Message::error($msg));
exit;
}

2
libraries/operations.lib.php
View File

@ -2164,7 +2164,7 @@ function PMA_moveOrCopyTable($db, $table)
if ($message->isSuccess()) {
$response->addJSON('db', $GLOBALS['db']);
} else {
$response->isSuccess(false);
$response->setRequestStatus(false);
}
exit;
}

2
libraries/plugins/auth/AuthenticationConfig.php
View File

@ -27,7 +27,7 @@ class AuthenticationConfig extends AuthenticationPlugin
{
$response = PMA\libraries\Response::getInstance();
if ($response->isAjax()) {
$response->isSuccess(false);
$response->setRequestStatus(false);
// reload_flag removes the token parameter from the URL and reloads
$response->addJSON('reload_flag', '1');
if (defined('TESTSUITE')) {

2
libraries/plugins/auth/AuthenticationCookie.php
View File

@ -71,7 +71,7 @@ class AuthenticationCookie extends AuthenticationPlugin
$response = Response::getInstance();
if ($response->isAjax()) {
$response->isSuccess(false);
$response->setRequestStatus(false);
// redirect_flag redirects to the login page
$response->addJSON('redirect_flag', '1');
if (defined('TESTSUITE')) {

2
libraries/plugins/auth/AuthenticationHttp.php
View File

@ -29,7 +29,7 @@ class AuthenticationHttp extends AuthenticationPlugin
{
$response = Response::getInstance();
if ($response->isAjax()) {
$response->isSuccess(false);
$response->setRequestStatus(false);
// reload_flag removes the token parameter from the URL and reloads
$response->addJSON('reload_flag', '1');
if (defined('TESTSUITE')) {

2
libraries/replication_gui.lib.php
View File

@ -955,7 +955,7 @@ function PMA_handleControlRequest()
if ($refresh) {
$response = PMA\libraries\Response::getInstance();
if ($response->isAjax()) {
$response->isSuccess($result);
$response->setRequestStatus($result);
$response->addJSON(
'message',
$result

2
libraries/rte/rte_events.lib.php
View File

@ -193,7 +193,7 @@ function PMA_EVN_handleEditor()
$response->addJSON('insert', ! empty($event));
$response->addJSON('message', $output);
} else {
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON('message', $message);
}
exit;

2
libraries/rte/rte_export.lib.php
View File

@ -48,7 +48,7 @@ function PMA_RTE_handleExport($export_data)
$response = Message::error($message);
if ($GLOBALS['is_ajax_request'] == true) {
$response = PMA\libraries\Response::getInstance();
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON('message', $message);
exit;
} else {

4
libraries/rte/rte_general.lib.php
View File

@ -81,11 +81,11 @@ function PMA_RTE_sendEditor($type, $mode, $item, $title, $db, $operation = null)
$message = Message::error($message);
if ($GLOBALS['is_ajax_request']) {
$response = PMA\libraries\Response::getInstance();
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON('message', $message);
exit;
} else {
$message->display();
}
}
}
}

10
libraries/rte/rte_routines.lib.php
View File

@ -162,7 +162,7 @@ function PMA_RTN_handleEditor()
$message = Message::error($message);
if ($GLOBALS['is_ajax_request']) {
$response = PMA\libraries\Response::getInstance();
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON('message', $message);
exit;
} else {
@ -284,7 +284,7 @@ function PMA_RTN_handleRequestCreateOrEdit($errors, $db)
$response = PMA\libraries\Response::getInstance();
if (!$message->isSuccess()) {
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON('message', $output);
exit;
}
@ -1290,7 +1290,7 @@ function PMA_RTN_handleExecute()
$message = Message::error($message);
if ($GLOBALS['is_ajax_request']) {
$response = PMA\libraries\Response::getInstance();
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON('message', $message);
exit;
} else {
@ -1456,7 +1456,7 @@ function PMA_RTN_handleExecute()
// Print/send output
if ($GLOBALS['is_ajax_request']) {
$response = PMA\libraries\Response::getInstance();
$response->isSuccess($message->isSuccess());
$response->setRequestStatus($message->isSuccess());
$response->addJSON('message', $message->getDisplay() . $output);
$response->addJSON('dialog', false);
exit;
@ -1503,7 +1503,7 @@ function PMA_RTN_handleExecute()
$message = Message::error($message);
$response = PMA\libraries\Response::getInstance();
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON('message', $message);
exit;
}

2
libraries/rte/rte_triggers.lib.php
View File

@ -184,7 +184,7 @@ function PMA_TRI_handleEditor()
$response->addJSON('message', $output);
} else {
$response->addJSON('message', $message);
$response->isSuccess(false);
$response->setRequestStatus(false);
}
exit;
}

4
libraries/server_databases.lib.php
View File

@ -498,9 +498,9 @@ function PMA_dropMultiDatabases()
$message->addParam($number_of_databases);
}
}
if ($GLOBALS['is_ajax_request'] && $message instanceof Message) {
if ($GLOBALS['is_ajax_request'] && $message instanceof PMA\libraries\Message) {
$response = PMA\libraries\Response::getInstance();
$response->isSuccess($message->isSuccess());
$response->setRequestStatus($message->isSuccess());
$response->addJSON('message', $message);
exit;
}

2
libraries/server_variables.lib.php
View File

@ -110,7 +110,7 @@ function PMA_getAjaxReturnForSetVal($variable_doc_links)
)
);
} else {
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON(
'error',
__('Setting variable failed')

12
libraries/sql.lib.php
View File

@ -683,7 +683,7 @@ function PMA_setColumnProperty($pmatable, $request_index)
);
if (gettype($retval) != 'boolean') {
$response = PMA\libraries\Response::getInstance();
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON('message', $retval->getString());
exit;
}
@ -715,7 +715,7 @@ function PMA_setColumnOrderOrVisibility($table, $db)
}
$response = PMA\libraries\Response::getInstance();
$response->isSuccess($retval == true);
$response->setRequestStatus($retval == true);
exit;
}
@ -742,8 +742,8 @@ function PMA_addBookmark($pmaAbsoluteUri, $goto)
$msg->addParam($_POST['bkm_fields']['bkm_label']);
$response->addJSON('message', $msg);
} else {
$msg = Message::error(__('Bookmark not created!'));
$response->isSuccess(false);
$msg = PMA\libraries\message::error(__('Bookmark not created!'));
$response->setRequestStatus(false);
$response->addJSON('message', $msg);
}
exit;
@ -908,9 +908,9 @@ function PMA_getDefaultSqlQueryForBrowse($db, $table)
function PMA_handleQueryExecuteError($is_gotofile, $error, $full_sql_query)
{
if ($is_gotofile) {
$message = Message::rawError($error);
$message = PMA\libraries\Message::rawError($error);
$response = PMA\libraries\Response::getInstance();
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON('message', $message);
} else {
PMA\libraries\Util::mysqlDie($error, $full_sql_query, '', '');

15
po/es.po
View File

@ -4,16 +4,16 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.6.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2015-10-01 07:36-0400\n"
"PO-Revision-Date: 2015-09-16 13:02+0200\n"
"Last-Translator: Ronnie Simon <ronniesimonf@gmail.com>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/phpmyadmin/"
"master/es/>\n"
"PO-Revision-Date: 2015-10-04 09:17+0200\n"
"Last-Translator: Luis Ruiz <luisan00@hotmail.com>\n"
"Language-Team: Spanish "
"<https://hosted.weblate.org/projects/phpmyadmin/master/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2.4-dev\n"
"X-Generator: Weblate 2.5-dev\n"
#: changelog.php:37 license.php:30
#, php-format
@ -961,10 +961,9 @@ msgid "Do you really want to TRUNCATE the selected partition(s)?"
msgstr "¿Desea realmente TRUNCAR las particiones seleccionadas?"
#: js/messages.php:66
#, fuzzy
#| msgid "Do you really want to TRUNCATE the selected partition(s)?"
msgid "Do you really want to remove partitioning?"
msgstr "¿Desea realmente TRUNCAR las particiones seleccionadas?"
msgstr "¿Desea realmente eliminar el particionado?"
#: js/messages.php:68
msgid ""
@ -12449,7 +12448,7 @@ msgstr "Requiere conexiones encriptadas con SSL."
#: libraries/server_privileges.lib.php:771
msgid "Requires a valid X509 certificate."
msgstr "Requiere de un certificado X509 válido."
msgstr "Requiere un certificado X509 válido."
#: libraries/server_privileges.lib.php:803
#: libraries/server_privileges.lib.php:812

118
po/zh_CN.po
View File

@ -4,16 +4,16 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.6.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2015-10-01 07:36-0400\n"
"PO-Revision-Date: 2015-09-28 11:58+0200\n"
"Last-Translator: whh <whhlcj@126.com>\n"
"Language-Team: Chinese (China) <https://hosted.weblate.org/projects/"
"phpmyadmin/master/zh_CN/>\n"
"PO-Revision-Date: 2015-10-04 04:17+0200\n"
"Last-Translator: Terry Weng <wengshiyu@gmail.com>\n"
"Language-Team: Chinese (China) "
"<https://hosted.weblate.org/projects/phpmyadmin/master/zh_CN/>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 2.5\n"
"X-Generator: Weblate 2.5-dev\n"
#: changelog.php:37 license.php:30
#, php-format
@ -2966,10 +2966,9 @@ msgid "No bookmarks"
msgstr "没有书签"
#: libraries/Console.class.php:183
#, fuzzy
#| msgid "Skip current error"
msgid "During current session"
msgstr "忽略当前错误"
msgstr "在当前会话期间"
#: libraries/Console.class.php:215
msgid "Explain"
@ -3196,10 +3195,9 @@ msgid "Sort:"
msgstr "排序："
#: libraries/DBQbe.class.php:630
#, fuzzy
#| msgid "Sort:"
msgid "Sort order:"
msgstr "排序："
msgstr "排序规则："
#: libraries/DBQbe.class.php:679
msgid "Show:"
@ -3375,7 +3373,6 @@ msgstr "于下列表："
#: libraries/DbSearch.class.php:447 libraries/display_export.lib.php:48
#: libraries/replication_gui.lib.php:380
#, fuzzy
#| msgid "Unselect All"
msgid "Unselect all"
msgstr "全不选"
@ -3548,7 +3545,6 @@ msgstr "选中项："
#: libraries/server_user_groups.lib.php:231
#: templates/database/structure/check_all_tables.phtml:3
#: templates/database/structure/check_all_tables.phtml:4
#, fuzzy
#| msgid "Check All"
msgid "Check all"
msgstr "全选"
@ -3633,10 +3629,9 @@ msgid "Error while moving uploaded file."
msgstr "移动已上传的文件时发生错误。"
#: libraries/File.class.php:497
#, fuzzy
#| msgid "Cannot read (moved) upload file."
msgid "Cannot read uploaded file."
msgstr "无法读取（移动后的）上传文件。"
msgstr "无法读取上传的文件。"
#: libraries/Footer.class.php:74
#, php-format
@ -3766,7 +3761,7 @@ msgstr "索引 %1$s 和 %2$s 似乎是相同的，可以删除其中一个。"
#: libraries/Linter.class.php:96
msgid ""
"Linting is disabled for this query because it exceeds the maximum length."
msgstr ""
msgstr "由于超出最大长度本次查询的链接已禁用。"
#: libraries/Linter.class.php:162
#, php-format
@ -3897,7 +3892,6 @@ msgstr "设计器"
#: libraries/Menu.class.php:508 libraries/Util.class.php:4313
#: templates/database/structure/check_all_tables.phtml:33
#, fuzzy
#| msgid "Textarea columns"
msgid "Central columns"
msgstr "文本框列"
@ -3911,10 +3905,9 @@ msgid "Databases"
msgstr "数据库"
#: libraries/Menu.class.php:566
#, fuzzy
#| msgid "Users"
msgid "User accounts"
msgstr "用户"
msgstr "用户账户"
#: libraries/Menu.class.php:593 libraries/ServerStatusData.class.php:122
#: libraries/Util.class.php:4292 libraries/server_common.lib.php:36
@ -4549,15 +4542,14 @@ msgid "Max: %s%s"
msgstr "最大限制：%s %s"
#: libraries/Util.class.php:665
#, fuzzy
#| msgid "Static data"
msgid "Static analysis:"
msgstr "静态数据"
msgstr "静态分析："
#: libraries/Util.class.php:668
#, php-format
msgid "%d errors were found during analysis."
msgstr ""
msgstr "分析时发现%d个错误。"
#: libraries/Util.class.php:730 libraries/rte/rte_events.lib.php:110
#: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
@ -4581,7 +4573,7 @@ msgstr "略过解析 SQL"
#: libraries/Util.class.php:1189
#, php-format
msgid "Analyze Explain at %s"
msgstr ""
msgstr "分析解释了%s"
#: libraries/Util.class.php:1222
#, fuzzy
@ -4596,17 +4588,15 @@ msgid "Submit query"
msgstr "提交查询"
#: libraries/Util.class.php:1245 libraries/config/messages.inc.php:898
#, fuzzy
#| msgid "Create PHP Code"
msgid "Create PHP code"
msgstr "创建 PHP 代码"
#: libraries/Util.class.php:1307
#, fuzzy
#| msgid "Edit index"
msgctxt "Inline edit query"
msgid "Edit inline"
msgstr "编辑索引"
msgstr "编辑内嵌"
#. l10n: Short week day name
#: libraries/Util.class.php:1653
@ -4728,7 +4718,6 @@ msgid "Check privileges for database \"%s\"."
msgstr "检查数据库 \"%s\" 的权限。"
#: libraries/build_html_for_db.lib.php:181
#, fuzzy
#| msgid "Check Privileges"
msgid "Check privileges"
msgstr "检查权限"
@ -4737,38 +4726,36 @@ msgstr "检查权限"
msgid ""
"The configuration storage is not ready for the central list of columns "
"feature."
msgstr ""
msgstr "设置存储未准备好列的中心表功能。"
#: libraries/central_columns.lib.php:283
#, php-format
msgid "Could not add %1$s as they already exist in central list!"
msgstr ""
msgstr "%1$s 已存在中央列表无法添加！"
#: libraries/central_columns.lib.php:298
#, fuzzy
#| msgid "Could not save configuration"
msgid "Could not add columns!"
msgstr "无法保存设置"
msgstr "无法添加列！"
#: libraries/central_columns.lib.php:373
#, php-format
msgid ""
"Couldn't remove Column(s) %1$s as they don't exist in central columns list!"
msgstr ""
msgstr "无法删除不存在中央列的 %1$s 列！"
#: libraries/central_columns.lib.php:385
#, fuzzy
#| msgid "Could not save recent table!"
msgid "Could not remove columns!"
msgstr "无法保存最近使用的表！"
msgstr "无法移除列！"
#: libraries/central_columns.lib.php:530
msgid "YES"
msgstr ""
msgstr "好的"
#: libraries/central_columns.lib.php:530
msgid "NO"
msgstr ""
msgstr "不好"
#: libraries/central_columns.lib.php:695
#: libraries/central_columns.lib.php:1383
@ -4794,7 +4781,6 @@ msgid "Length/Values"
msgstr "长度/值"
#: libraries/central_columns.lib.php:706
#, fuzzy
#| msgid "Attributes"
msgid "Attribute"
msgstr "属性"
@ -4805,7 +4791,6 @@ msgid "A_I"
msgstr ""
#: libraries/central_columns.lib.php:750
#, fuzzy
#| msgid "Select Tables"
msgid "Select a table"
msgstr "选择表"
@ -4816,16 +4801,14 @@ msgid "Add column"
msgstr "添加字段"
#: libraries/central_columns.lib.php:816
#, fuzzy
#| msgid "Select two columns"
msgid "Select a column."
msgstr "选择两列"
msgstr "选择字段。"
#: libraries/central_columns.lib.php:1263
#, fuzzy
#| msgid "Add column"
msgid "Add new column"
msgstr "添加字段"
msgstr "添加新字段"
#: libraries/central_columns.lib.php:1384
#: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1003
@ -4882,6 +4865,8 @@ msgid ""
"setting for [em]$cfg['Servers'][%3$d]['SessionTimeZone'][/em]. phpMyAdmin is "
"currently using the default time zone of the database server."
msgstr ""
"无法为服务器 %2$d 设置时区 %1$s 。请检查您的配置中 "
"[em]$cfg['Servers'][%3$d]['SessionTimeZone'][/em] 字段。服务器当前使用默认时区。"
#: libraries/common.inc.php:1036
#, php-format
@ -4947,19 +4932,17 @@ msgstr "已禁用"
#: libraries/config.values.php:98
msgid "key"
msgstr ""
msgstr "键值"
#: libraries/config.values.php:99
#, fuzzy
#| msgid "Display columns table"
msgid "display column"
msgstr "显示字段表"
msgstr "显示字段"
#: libraries/config.values.php:102
#, fuzzy
#| msgid "Welcome to %s"
msgid "Welcome"
msgstr "欢迎使用 %s"
msgstr "欢迎使用"
#: libraries/config.values.php:122
msgid "Open"
@ -4982,22 +4965,19 @@ msgid "Never send error reports"
msgstr "从不发送错误报告"
#: libraries/config.values.php:132
#, fuzzy
#| msgid "Reset to default"
msgid "Server default"
msgstr "恢复默认"
msgstr "服务器默认"
#: libraries/config.values.php:133
#, fuzzy
#| msgid "Enabled"
msgid "Enable"
msgstr "已启用"
msgstr "启用"
#: libraries/config.values.php:134
#, fuzzy
#| msgid "Disabled"
msgid "Disable"
msgstr "已禁用"
msgstr "禁用"
#: libraries/config.values.php:163
#: libraries/plugins/export/ExportHtmlword.class.php:69
@ -5155,7 +5135,7 @@ msgid "Key should contain letters, numbers [em]and[/em] special characters."
msgstr "短语密码应包含字母、数字[em]和[/em]特殊字符。"
#: libraries/config/ServerConfigChecks.class.php:382
#, fuzzy, php-format
#, php-format
#| msgid ""
#| "This %soption%s should be disabled as it allows attackers to bruteforce "
#| "login to any MySQL server. If you feel this is necessary, use %strusted "
@ -5169,8 +5149,8 @@ msgid ""
"protection with trusted proxies list may not be reliable if your IP belongs "
"to an ISP where thousands of users, including you, are connected to."
msgstr ""
"该%s选项%s应该被关闭以防止有人尝试暴力破解 MySQL 服务器。如果有必要，您可以使"
"用%s可信代理表%s。但如果您和许多人共用一个 IP 地址，该措施的安全性将下降。"
"该 %s选项%s 应该被关闭以防止有人尝试暴力破解 MySQL 服务器。如果有必要，您可以使用 %s可信代理表%s 。但如果您和许多人共用一个 IP "
"地址，该措施的安全性将下降。"
#: libraries/config/ServerConfigChecks.class.php:402
msgid ""
@ -5327,13 +5307,12 @@ msgid ""
"Restricts the MySQL servers the user can enter when a login to an arbitrary "
"MySQL server is enabled by matching the IP or hostname of the MySQL server "
"to the given regular expression."
msgstr ""
msgstr "限制用户可以登录到任意启用了通过正则表达式匹配IP或主机名登录的MySQL服务器。"
#: libraries/config/messages.inc.php:26
#, fuzzy
#| msgid "Cannot log in to the MySQL server"
msgid "Restrict login to MySQL server"
msgstr "无法登录 MySQL 服务器"
msgstr "限制登录到 MySQL 服务器"
#: libraries/config/messages.inc.php:28
msgid ""
@ -5418,13 +5397,12 @@ msgstr "启用 CodeMirror"
msgid ""
"Find any errors in the query before executing it. Requires CodeMirror to be "
"enabled."
msgstr ""
msgstr "查询前查找错误。需要启用镜像代码功能。"
#: libraries/config/messages.inc.php:67
#, fuzzy
#| msgid "Enable SQL Validator"
msgid "Enable linter"
msgstr "启用 SQL 校验器"
msgstr "启用代码检查"
#: libraries/config/messages.inc.php:69
msgid ""
@ -5496,7 +5474,7 @@ msgstr "删除语句确认"
#: libraries/config/messages.inc.php:97
msgid ""
"Log SQL queries and their execution time, to be displayed in the console"
msgstr ""
msgstr "记录SQL查询和执行时间，显示在控制台中。"
#: libraries/config/messages.inc.php:101
msgid "Tab that is displayed when entering a database."
@ -5523,16 +5501,14 @@ msgid "Default table tab"
msgstr "表默认标签页"
#: libraries/config/messages.inc.php:110
#, fuzzy
#| msgid "Enclose table and column names with backquotes"
msgid "Autocomplete of the table and column names in the SQL queries."
msgstr "给表名及字段名加上反引号"
msgstr "自动补全SQL查询中的表名和字段名。"
#: libraries/config/messages.inc.php:113
#, fuzzy
#| msgid "Enclose table and column names with backquotes"
msgid "Enable autocomplete for table and column names"
msgstr "给表名及字段名加上反引号"
msgstr "启用自动补全表名和字段名"
#: libraries/config/messages.inc.php:116
msgid "Whether the table structure actions should be hidden."
@ -5571,10 +5547,10 @@ msgid "Maximum execution time"
msgstr "最长执行时间"
#: libraries/config/messages.inc.php:132 libraries/display_export.lib.php:794
#, fuzzy, php-format
#, php-format
#| msgid "Add %s statement"
msgid "Use %s statement"
msgstr "添加 %s 语句"
msgstr "使用 %s 语句"
#: libraries/config/messages.inc.php:134 prefs_manage.php:318
msgid "Save as file"
@ -5714,10 +5690,9 @@ msgid "Overwrite existing file(s)"
msgstr "覆盖现有文件"
#: libraries/config/messages.inc.php:181
#, fuzzy
#| msgid "Export table headers"
msgid "Export as separate files"
msgstr "导出表头"
msgstr "导出为单独的文件"
#: libraries/config/messages.inc.php:185
msgid "Remember file name template"
@ -5756,10 +5731,9 @@ msgid "Export views as tables"
msgstr "将视图作为表导出"
#: libraries/config/messages.inc.php:195
#, fuzzy
#| msgid "Missing phpMyAdmin configuration storage tables"
msgid "Export related metadata from phpMyAdmin configuration storage"
msgstr "丢失 phpMyAdmin 高级功能数据表"
msgstr "从phpMyAdmin设置存储中导出相关元数据"
#: libraries/config/messages.inc.php:197 libraries/config/messages.inc.php:198
#: libraries/config/messages.inc.php:200 libraries/config/messages.inc.php:202
@ -5778,7 +5752,7 @@ msgstr "使用十六进制表示 BINARY 和 BLOB 数据"
msgid ""
"Add IF NOT EXISTS (less efficient as indexes will be generated during table "
"creation)"
msgstr ""
msgstr "添加IF NOT EXISTS语句（效率更低因为创建表时索引会自动生成）"
#: libraries/config/messages.inc.php:211
msgid "Use ignore inserts"

4
server_privileges.php
View File

@ -139,7 +139,7 @@ if (isset($_REQUEST['change_copy']) && $username == $_REQUEST['old_username']
$response->addHTML(
PMA\libraries\Message::error(__('Username and hostname didn\'t change.'))->getDisplay()
);
$response->isSuccess(false);
$response->setRequestStatus(false);
exit;
}
@ -305,7 +305,7 @@ if ($GLOBALS['is_ajax_request']
if (! empty($message) && $message instanceof PMA\libraries\Message) {
$response = PMA\libraries\Response::getInstance();
$response->isSuccess($message->isSuccess());
$response->setRequestStatus($message->isSuccess());
$response->addJSON('message', $message);
$response->addJSON($extra_data);
exit;

4
server_status_processes.php
View File

@ -29,7 +29,7 @@ if ($response->isAjax() && !empty($_REQUEST['kill'])) {
$query = $GLOBALS['dbi']->getKillQuery((int)$_REQUEST['kill']);
if ($GLOBALS['dbi']->tryQuery($query)) {
$message = PMA\libraries\Message::success(__('Thread %s was successfully killed.'));
$response->isSuccess(true);
$response->setRequestStatus(true);
} else {
$message = PMA\libraries\Message::error(
__(
@ -37,7 +37,7 @@ if ($response->isAjax() && !empty($_REQUEST['kill'])) {
. ' It probably has already been closed.'
)
);
$response->isSuccess(false);
$response->setRequestStatus(false);
}
$message->addParam($_REQUEST['kill']);
$response->addJSON('message', $message);

2
tbl_addfield.php
View File

@ -100,7 +100,7 @@ if (isset($_REQUEST['do_save_data'])) {
} else {
$error_message_html = PMA\libraries\Util::mysqlDie('', '', false, $err_url, false);
$response->addHTML($error_message_html);
$response->isSuccess(false);
$response->setRequestStatus(false);
exit;
}
} // end do alter table

2
tbl_create.php
View File

@ -92,7 +92,7 @@ if (isset($_REQUEST['do_save_data'])) {
}
} else {
$response = PMA\libraries\Response::getInstance();
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON('message', $GLOBALS['dbi']->getError());
}
exit;

4
tbl_export.php
View File

@ -71,12 +71,12 @@ if (isset($_REQUEST['templateAction']) && $cfgRelation['exporttemplateswork']) {
$response = PMA\libraries\Response::getInstance();
if (! $result) {
$error = $GLOBALS['dbi']->getError($GLOBALS['controllink']);
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON('message', $error);
exit;
}
$response->isSuccess(true);
$response->setRequestStatus(true);
if ('create' == $_REQUEST['templateAction']) {
$response->addJSON(
'data',

4
tbl_operations.php
View File

@ -231,7 +231,7 @@ if (isset($result) && empty($message_to_show)) {
&& $GLOBALS['ajax_request'] == true
) {
$response = PMA\libraries\Response::getInstance();
$response->isSuccess($_message->isSuccess());
$response->setRequestStatus($_message->isSuccess());
$response->addJSON('message', $_message);
$response->addJSON(
'sql_query', PMA\libraries\Util::getMessage(null, $sql_query)
@ -245,7 +245,7 @@ if (isset($result) && empty($message_to_show)) {
$_message->isError(true);
if ($GLOBALS['ajax_request'] == true) {
$response = PMA\libraries\Response::getInstance();
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON('message', $_message);
exit;
}

2
tbl_replace.php
View File

@ -430,7 +430,7 @@ if ($response->isAjax() && ! isset($_POST['ajax_page_request'])) {
= PMA\libraries\Util::getMessage($message, $GLOBALS['display_query']);
$response = PMA\libraries\Response::getInstance();
$response->isSuccess($message->isSuccess());
$response->setRequestStatus($message->isSuccess());
$response->addJSON('message', $message);
$response->addJSON($extra_data);
exit;

2
tbl_row_action.php
View File

@ -67,7 +67,7 @@ if (!empty($submit_mult)) {
|| ! is_array($_REQUEST['rows_to_delete']))
) {
$response = PMA\libraries\Response::getInstance();
$response->isSuccess(false);
$response->setRequestStatus(false);
$response->addJSON('message', __('No row selected.'));
}

4
test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
View File

@ -76,7 +76,7 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase
$mockResponse = $this->getMockBuilder('PMA\libraries\Response')
->disableOriginalConstructor()
->setMethods(array('isAjax', 'isSuccess', 'addJSON'))
->setMethods(array('isAjax', 'setRequestStatus', 'addJSON'))
->getMock();
$mockResponse->expects($this->once())
@ -85,7 +85,7 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase
->will($this->returnValue(true));
$mockResponse->expects($this->once())
->method('isSuccess')
->method('setRequestStatus')
->with(false);
$mockResponse->expects($this->once())

2
test/libraries/stubs/ResponseStub.php
View File

@ -157,7 +157,7 @@ class Response
*
* @return void
*/
public function isSuccess($state)
public function setRequestStatus($state)
{
$this->_isSuccess = $state;
}

2
user_password.php
View File

@ -88,7 +88,7 @@ function PMA_getChangePassMessage($change_password_message, $sql_query = '')
$response = PMA\libraries\Response::getInstance();
if ($change_password_message['error']) {
$response->addJSON('message', $change_password_message['msg']);
$response->isSuccess(false);
$response->setRequestStatus(false);
} else {
$sql_query = PMA\libraries\Util::getMessage(
$change_password_message['msg'],

4
view_create.php
View File

@ -96,7 +96,7 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
. $GLOBALS['dbi']->getError()
)
);
$response->isSuccess(false);
$response->setRequestStatus(false);
exit;
}
@ -140,7 +140,7 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
'message',
PMA\libraries\Util::getMessage(PMA\libraries\Message::success(), $sql_query)
);
$response->isSuccess(true);
$response->setRequestStatus(true);
}
exit;