From 050d6d31aacaa62639a77921d47b06db0b51518c Mon Sep 17 00:00:00 2001 From: "J.M" Date: Sun, 14 Apr 2013 14:46:00 +0200 Subject: [PATCH 1/5] Fix bug #3874 [export] No preselected option when exporting table --- ChangeLog | 1 + libraries/display_export.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5f24e73694..7f21b59f07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -104,6 +104,7 @@ underscore - bug #3865 Using like operator on each backslash needs 4 backslash protection - bug #3860 Displayed git revision info is not set - bug #3871 Check referential integrity broken across databases +- bug #3874 [export] No preselected option when exporting table 3.5.9.0 (not yet released) diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index ae236dbe15..9e162a05e7 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -187,7 +187,7 @@ if (strlen($table) && ! isset($num_tables) && ! PMA_Table::isMerge($db, $table)) echo ''; echo '
  • '; echo ''; From 534fd022318e97a7340ea7f58a795ba2685b9b16 Mon Sep 17 00:00:00 2001 From: Julio Guerra Date: Sat, 13 Apr 2013 18:37:09 +0200 Subject: [PATCH 2/5] Translated using Weblate (Galician) Currently translated at 99.3% (2588 of 2605) --- po/gl.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/gl.po b/po/gl.po index e1432c0d65..b4d7dc9fdc 100644 --- a/po/gl.po +++ b/po/gl.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-04-03 10:24+0200\n" -"PO-Revision-Date: 2013-04-04 12:28+0200\n" -"Last-Translator: frandieguez \n" +"PO-Revision-Date: 2013-04-13 18:37+0200\n" +"Last-Translator: Julio Guerra \n" "Language-Team: Galician \n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -738,10 +738,9 @@ msgid "Server" msgstr "Servidor" #: index.php:240 -#, fuzzy #| msgid "Server port" msgid "Server type" -msgstr "Porto do servidor" +msgstr "Tipo do servidor" #: index.php:244 libraries/plugins/export/ExportLatex.class.php:225 #: libraries/plugins/export/ExportSql.class.php:612 From f1513b26786e5be3fbe6db96c6fda67fe60021cb Mon Sep 17 00:00:00 2001 From: "J.M" Date: Sun, 14 Apr 2013 15:32:34 +0200 Subject: [PATCH 3/5] Fix bug #3873 Can't copy table to target database if table exists there --- ChangeLog | 1 + libraries/Table.class.php | 4 ++-- libraries/operations.lib.php | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f21b59f07..39e9d01628 100644 --- a/ChangeLog +++ b/ChangeLog @@ -105,6 +105,7 @@ underscore - bug #3860 Displayed git revision info is not set - bug #3871 Check referential integrity broken across databases - bug #3874 [export] No preselected option when exporting table +- bug #3873 Can't copy table to target database if table exists there 3.5.9.0 (not yet released) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 963f2958fc..a9f2c40ba7 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -840,8 +840,8 @@ class PMA_Table $sql_structure = PMA_SQP_formatHtml($parsed_sql, 'query_only'); // If table exists, and 'add drop table' is selected: Drop it! $drop_query = ''; - if (isset($GLOBALS['drop_if_exists']) - && $GLOBALS['drop_if_exists'] == 'true' + if (isset($_REQUEST['drop_if_exists']) + && $_REQUEST['drop_if_exists'] == 'true' ) { if (PMA_Table::isView($target_db, $target_table)) { $drop_query = 'DROP VIEW'; diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index 5c45607488..737c3642ed 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -541,11 +541,11 @@ function PMA_handleTheViews($views, $move, $db) $_error = false; // temporarily force to add DROP IF EXIST to CREATE VIEW query, // to remove stand-in VIEW that was created earlier - // ( $GLOBALS['drop_if_exists'] is used in moveCopy() ) - if (isset($GLOBALS['drop_if_exists'])) { - $temp_drop_if_exists = $GLOBALS['drop_if_exists']; + // ( $_REQUEST['drop_if_exists'] is used in moveCopy() ) + if (isset($_REQUEST['drop_if_exists'])) { + $temp_drop_if_exists = $_REQUEST['drop_if_exists']; } - $GLOBALS['drop_if_exists'] = 'true'; + $_REQUEST['drop_if_exists'] = 'true'; foreach ($views as $view) { $copying_succeeded = PMA_Table::moveCopy( @@ -556,10 +556,10 @@ function PMA_handleTheViews($views, $move, $db) break; } } - unset($GLOBALS['drop_if_exists']); + unset($_REQUEST['drop_if_exists']); if (isset($temp_drop_if_exists)) { // restore previous value - $GLOBALS['drop_if_exists'] = $temp_drop_if_exists; + $_REQUEST['drop_if_exists'] = $temp_drop_if_exists; } return $_error; } From d392c6ff2632b42559a24cc42b715c8b47ad577a Mon Sep 17 00:00:00 2001 From: zz zz Date: Sun, 14 Apr 2013 15:17:59 +0200 Subject: [PATCH 4/5] Translated using Weblate (Simplified Chinese) Currently translated at 99.7% (2598 of 2605) --- po/zh_CN.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 2f92eb4732..4aded883ec 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-04-03 10:24+0200\n" -"PO-Revision-Date: 2013-04-10 04:51+0200\n" -"Last-Translator: likyh \n" +"PO-Revision-Date: 2013-04-14 15:17+0200\n" +"Last-Translator: zz zz \n" "Language-Team: Simplified Chinese " "\n" "Language: zh_CN\n" @@ -6944,7 +6944,7 @@ msgstr "简体中文" #: libraries/mysql_charsets.lib.php:257 libraries/mysql_charsets.lib.php:400 msgid "Traditional Chinese" -msgstr "正体中文" +msgstr "繁体中文" #: libraries/mysql_charsets.lib.php:261 libraries/mysql_charsets.lib.php:447 msgid "case-insensitive" @@ -7895,7 +7895,7 @@ msgstr "MediaWiki 表" #, php-format #| msgid "Invalid format of CSV input on line %d." msgid "Invalid format of mediawiki input on line:
    %s." -msgstr "第 %s 行mediawiki输入格式有错。" +msgstr "第 %s 行mediawiki输入格式有错." #: libraries/plugins/import/ImportOds.class.php:88 msgid "Import percentages as proper decimals (ex. 12.00% to .12)" @@ -7952,7 +7952,7 @@ msgstr "XML" #: libraries/plugins/import/ShapeRecord.class.php:58 #, php-format msgid "Geometry type '%s' is not supported by MySQL." -msgstr "" +msgstr "不被MySQL支持的几何类型 '%s'." #: libraries/plugins/transformations/abstract/AppendTransformationsPlugin.class.php:32 msgid "" @@ -9441,7 +9441,6 @@ msgid "Move columns" msgstr "移动字段" #: libraries/structure.lib.php:1426 -#, fuzzy msgid "Move the columns by dragging them up and down." msgstr "请通过拖拽来移动字段的位置。" @@ -9634,8 +9633,9 @@ msgid "As defined:" msgstr "定义：" #: libraries/tbl_columns_definition_form.inc.php:634 +#, fuzzy msgid "first" -msgstr "" +msgstr "第一" #: libraries/tbl_columns_definition_form.inc.php:644 #, php-format @@ -9706,7 +9706,6 @@ msgid "View in fullscreen" msgstr "全屏查看" #: pmd_general.php:90 -#, fuzzy msgid "Exit fullscreen" msgstr "退出全屏" @@ -10979,10 +10978,11 @@ msgstr "" "可能设置得太小了。缓存缺失率可以由 Key_reads/Key_read_requests 计算得出。" #: server_status_variables.php:609 +#, fuzzy msgid "" "Key cache miss calculated as rate of physical reads compared to read " "requests (calculated value)" -msgstr "" +msgstr "由物理读取数与读取请求数相比计算出的键缓存未命中率(计算值)" #: server_status_variables.php:613 msgid "The number of requests to write a key block to the cache." @@ -10995,7 +10995,7 @@ msgstr "将键块物理写入到磁盘的次数。" #: server_status_variables.php:619 msgid "" "Percentage of physical writes compared to write requests (calculated value)" -msgstr "" +msgstr "物理写入数与写入请求数的百分比比值(计算值)" #: server_status_variables.php:623 msgid "" From 1e1354faca3d8193a312cecfc5bb7d9ae250a70e Mon Sep 17 00:00:00 2001 From: "J.M" Date: Sun, 14 Apr 2013 15:41:46 +0200 Subject: [PATCH 5/5] Fix spacing in table operations, Alter table order box --- libraries/operations.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index 737c3642ed..0e331c82bc 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -625,7 +625,7 @@ function PMA_getHtmlForOrderTheTable($columns) . 'value="' . htmlspecialchars($fieldname['Field']) . '">' . htmlspecialchars($fieldname['Field']) . '' . "\n"; } - $html_output .= ' ' . __('(singly)') + $html_output .= ' ' . __('(singly)') . ' ' . '