From 24a038552d0499d504aaa19caf2e136ef86fe9d0 Mon Sep 17 00:00:00 2001 From: zz Date: Mon, 2 Mar 2015 04:29:20 +0100 Subject: [PATCH 1/4] Translated using Weblate (Chinese (China)) Currently translated at 82.8% (2469 of 2980 strings) [CI skip] --- po/zh_CN.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 8b7d639bc8..4e259973c6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-01-01 08:24-0500\n" -"PO-Revision-Date: 2015-02-27 06:18+0200\n" -"Last-Translator: Rex Lee \n" +"PO-Revision-Date: 2015-03-02 04:29+0200\n" +"Last-Translator: zz \n" "Language-Team: Chinese (China) " "\n" "Language: zh_CN\n" @@ -31,7 +31,7 @@ msgid "Click to sort." msgstr "点击以排序。" #: db_central_columns.php:125 -#, fuzzy, php-format +#, php-format #| msgid "Showing row(s) %1$s - %2$s" msgid "Showing rows %1$s - %2$s." msgstr "正在显示第 %1$s - %2$s 行" @@ -252,7 +252,7 @@ msgid "Database %1$s has been copied to %2$s." msgstr "已将数据库 %1$s 复制至 %2$s。" #: db_operations.php:266 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The phpMyAdmin configuration storage has been deactivated. To find out " #| "why click %shere%s." From 8b5f4f4a8b61b6862bf732aed830b67239950bf6 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 2 Mar 2015 12:23:03 -0500 Subject: [PATCH 2/4] 4.3.12-dev Signed-off-by: Marc Delisle --- ChangeLog | 4 +++- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 105e2d8f28..7fbb351cce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ phpMyAdmin - ChangeLog ====================== -4.3.11.0 (not yet released) +4.3.12.0 (not yet released) + +4.3.11.0 (2015-03-02) - bug #4774 SQL links are completely wrong - bug #4768 MariaDB: version mismatch - bug #4777 Some images are missing in Designer for original theme diff --git a/README b/README index aa5b760375..fe1077eacc 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.3.11-dev +Version 4.3.12-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 57f3331410..b0c8cfd870 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.3.11-dev' +version = '4.3.12-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 4b349a9721..45746e6546 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.3.11-dev'); + $this->set('PMA_VERSION', '4.3.12-dev'); /** * @deprecated */ From b661cd7c9b31f8bc564d2f9a1b8527e0eb966de8 Mon Sep 17 00:00:00 2001 From: tapanhalani Date: Fri, 27 Feb 2015 03:08:55 +0530 Subject: [PATCH 3/4] Fix bug#4746:- Right-aligned columns have left-aligned header Signed-off-by: tapanhalani Fix bug#4746: Right-aligned columns have left-aligned header Signed-off-by: tapanhalani Fix bug#4746:- Right-aligned columns have left-aligned header. Fix bug#4746- Right-aligned columns have left-aligned header Signed-off-by: tapanhalani Fix bug#4746:- Right-aligned columns have left-aligned header. Signed-off-by: tapanhalani Fix bug#4746- Right-aligned columns have left-aligned header. Signed-off-by: tapanhalani Fix bug#4746:- Right-aligned columns have left-aligned headers. Signed-off-by: Tapan Halani --- libraries/DisplayResults.class.php | 18 ++++++++++++++++-- themes/pmahomme/css/common.css.php | 4 ++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 224acd7243..f8e37a4d12 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -2257,6 +2257,20 @@ class PMA_DisplayResults } // end of the '_getSortOrderLink()' function + /** + * Check if the column contains numeric data . If yes, then set the column header's alignment right + * + * @param $fields_meta set of field properties + * + * @return string $value class that has to be added to th_class + * @see _getDraggableClassForSortableColumns() + */ + private function getClassForNumericColumnType($fields_meta,&$th_class){ + + if(preg_match('@int|decimal|float|double|real|bit|boolean|serial@i',$fields_meta->type)){ + $th_class[] = 'right'; + } + } /** * Prepare columns to draggable effect for sortable columns @@ -2283,7 +2297,7 @@ class PMA_DisplayResults $draggable_html = 'getClassForNumericColumnType($fields_meta,$th_class); if ($col_visib && !$col_visib_j) { $th_class[] = 'hide'; } @@ -2336,7 +2350,7 @@ class PMA_DisplayResults $draggable_html = 'getClassForNumericColumnType($fields_meta,$th_class); if ($col_visib && !$col_visib_j) { $th_class[] = 'hide'; } diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php index 37923990c0..f0796b0f48 100644 --- a/themes/pmahomme/css/common.css.php +++ b/themes/pmahomme/css/common.css.php @@ -2638,6 +2638,10 @@ fieldset .disabled-field td { overflow: hidden; } +.pma_table th.draggable.right span { + margin-: 0px; +} + .pma_table th.draggable span { margin-: 10px; } From 1a9015080ee0ba9694150e1aac7da5e47e77a120 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 3 Mar 2015 15:27:06 -0500 Subject: [PATCH 4/4] Changelog entry; fix coding style Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/DisplayResults.class.php | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fbb351cce..5efcebb00d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.3.12.0 (not yet released) +- bug #4746 Right-aligned columns have left-aligned header 4.3.11.0 (2015-03-02) - bug #4774 SQL links are completely wrong diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index f8e37a4d12..48035a2546 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -2258,16 +2258,22 @@ class PMA_DisplayResults } // end of the '_getSortOrderLink()' function /** - * Check if the column contains numeric data . If yes, then set the column header's alignment right + * Check if the column contains numeric data. If yes, then set the + * column header's alignment right * - * @param $fields_meta set of field properties + * @param array $fields_meta set of field properties + * @param array &$th_class array containing classes + * + * @return void * - * @return string $value class that has to be added to th_class * @see _getDraggableClassForSortableColumns() */ - private function getClassForNumericColumnType($fields_meta,&$th_class){ - - if(preg_match('@int|decimal|float|double|real|bit|boolean|serial@i',$fields_meta->type)){ + private function _getClassForNumericColumnType($fields_meta,&$th_class) + { + if (preg_match( + '@int|decimal|float|double|real|bit|boolean|serial@i', + $fields_meta->type + )) { $th_class[] = 'right'; } } @@ -2297,7 +2303,7 @@ class PMA_DisplayResults $draggable_html = 'getClassForNumericColumnType($fields_meta,$th_class); + $this->_getClassForNumericColumnType($fields_meta, $th_class); if ($col_visib && !$col_visib_j) { $th_class[] = 'hide'; } @@ -2350,7 +2356,7 @@ class PMA_DisplayResults $draggable_html = 'getClassForNumericColumnType($fields_meta,$th_class); + $this->_getClassForNumericColumnType($fields_meta, $th_class); if ($col_visib && !$col_visib_j) { $th_class[] = 'hide'; }