From 3dcabaeb4072f90e2a3cf14c95494f5567c4cc73 Mon Sep 17 00:00:00 2001 From: YF Date: Mon, 21 Mar 2016 08:37:50 +0100 Subject: [PATCH 1/2] Translated using Weblate (Chinese (China)) Currently translated at 88.2% (2834 of 3211 strings) [CI skip] --- po/zh_CN.po | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 4381efbe30..6bebb50c20 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-alpha1\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-02-17 11:55+0100\n" -"PO-Revision-Date: 2015-11-19 08:10+0000\n" -"Last-Translator: disorderman \n" -"Language-Team: Chinese (China) \n" +"PO-Revision-Date: 2016-03-21 08:37+0000\n" +"Last-Translator: YF \n" +"Language-Team: Chinese (China) " +"\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-dev\n" +"X-Generator: Weblate 2.6-dev\n" #: changelog.php:37 license.php:33 #, php-format @@ -573,7 +573,7 @@ msgid "Bookmark %s has been created." msgstr "已创建书签 %s。" #: import.php:680 -#, fuzzy, php-format +#, php-format #| msgid "Import has been successfully finished, %d queries executed." msgid "Import has been successfully finished, %d query executed." msgid_plural "Import has been successfully finished, %d queries executed." @@ -750,7 +750,7 @@ msgstr "" msgid "" "The curl extension was not found and allow_url_fopen is disabled. Due to " "this some features such as error reporting or version check are disabled." -msgstr "" +msgstr "curl 扩展未找到并且 allow_url_fopen 已禁用。因此一些功能如错误报告和版本检查已禁用。" #: index.php:499 msgid "" @@ -913,10 +913,9 @@ msgid "Do you really want to TRUNCATE the selected partition(s)?" msgstr "您真的要清空所选择的分区吗？" #: js/messages.php:85 -#, fuzzy #| msgid "Do you really want to TRUNCATE the selected partition(s)?" msgid "Do you really want to remove partitioning?" -msgstr "您真的要清空所选择的分区吗？" +msgstr "您真的要移除分区吗？" #: js/messages.php:86 msgid "Do you really want to RESET SLAVE?" @@ -1626,10 +1625,9 @@ msgid "Formatting SQL…" msgstr "正在格式化SQL……" #: js/messages.php:346 -#, fuzzy #| msgid "Bad parameters!" msgid "No parameters found!" -msgstr "参数无效！" +msgstr "未找到参数！" #: js/messages.php:350 #: templates/database/designer/aggregate_query_panel.phtml:63 @@ -2480,22 +2478,19 @@ msgid "" msgstr "" #: js/messages.php:711 -#, fuzzy #| msgid "Copy database to" msgid "Copy tables to" -msgstr "复制数据库到" +msgstr "复制数据表到" #: js/messages.php:712 -#, fuzzy #| msgid "Add table prefix:" msgid "Add table prefix" -msgstr "添加表前缀：" +msgstr "添加表前缀" #: js/messages.php:713 -#, fuzzy #| msgid "Replace table prefix" msgid "Replace table with prefix" -msgstr "修改表前缀" +msgstr "替换表前缀" #: js/messages.php:714 templates/database/structure/check_all_tables.phtml:29 msgid "Copy table with prefix" @@ -2924,7 +2919,7 @@ msgstr "数据库" #, php-format msgid "Showing %1$d bookmark (both private and shared)" msgid_plural "Showing %1$d bookmarks (both private and shared)" -msgstr[0] "" +msgstr[0] "已显示 %1$d 个书签（包括私有和共享）" #: libraries/Console.php:107 msgid "No bookmarks" From a3088fd8bf99295302faae25d57ef9a49e00df2d Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 22 Mar 2016 11:32:44 +1100 Subject: [PATCH 2/2] Fix #12116 Fulltext indexes are not copied when using copy database function Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/Table.php | 35 ++++++++++++++++++++--------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d143a0f28..fb29c50ab4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ phpMyAdmin - ChangeLog - issue #12026 Fixed parsing of UNION SELECT with brackets - issue #12109 Fixed parsing of CREATE TABLE [AS] SELECT - issue #12105 Multi-server drap-and-drop import always fails +- issue #12116 Fulltext indexes are not copied when using copy database function 4.5.5.1 (2016-02-29) - issue #11971 CREATE UNIQUE INDEX index type is not recognized by parser. diff --git a/libraries/Table.php b/libraries/Table.php index d467c9c922..2860e3d258 100644 --- a/libraries/Table.php +++ b/libraries/Table.php @@ -940,30 +940,35 @@ class Table $parser = new Parser($GLOBALS['sql_indexes']); + $GLOBALS['sql_indexes'] = ''; /** * The ALTER statement that generates the indexes. * @var \SqlParser\Statements\AlterStatement $statement */ - $statement = $parser->statements[0]; + foreach ($parser->statements as $statement) { - // Changing the altered table to the destination. - $statement->table = $destination; + // Changing the altered table to the destination. + $statement->table = $destination; - // Removing the name of the constraints. - foreach ($statement->altered as $idx => $altered) { - // All constraint names are removed because they must be unique. - if ($altered->options->has('CONSTRAINT')) { - $altered->field = null; + // Removing the name of the constraints. + foreach ($statement->altered as $idx => $altered) { + // All constraint names are removed because they must be unique. + if ($altered->options->has('CONSTRAINT')) { + $altered->field = null; + } } + + // Building back the query. + $sql_index = $statement->build() . ';'; + + // Executing it. + if ($mode == 'one_table' || $mode == 'db_copy') { + $GLOBALS['dbi']->query($sql_index); + } + + $GLOBALS['sql_indexes'] .= $sql_index; } - // Building back the query. - $GLOBALS['sql_indexes'] = $statement->build() . ';'; - - // Executing it. - if ($mode == 'one_table' || $mode == 'db_copy') { - $GLOBALS['dbi']->query($GLOBALS['sql_indexes']); - } $GLOBALS['sql_query'] .= "\n" . $GLOBALS['sql_indexes']; if ($mode == 'one_table' || $mode == 'db_copy') { unset($GLOBALS['sql_indexes']);