From ff55eac7cd4043c256ad972b17e04e5d72683f6b Mon Sep 17 00:00:00 2001 From: San Date: Mon, 2 Nov 2015 02:33:50 +0100 Subject: [PATCH 1/4] Translated using Weblate (Chinese (China)) Currently translated at 88.5% (2859 of 3228 strings) [CI skip] --- po/zh_CN.po | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 72fb0a855e..ddbf963e8c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-26 20:01-0400\n" -"PO-Revision-Date: 2015-10-30 08:36+0200\n" -"Last-Translator: disorderman \n" +"PO-Revision-Date: 2015-11-02 02:33+0200\n" +"Last-Translator: San \n" "Language-Team: Chinese (China) " "\n" "Language: zh_CN\n" @@ -7269,7 +7269,6 @@ msgid "Show field types" msgstr "显示字段类型" #: libraries/config/messages.inc.php:868 -#, fuzzy #| msgid "Display the function fields in edit/insert mode" msgid "Display the function fields in edit/insert mode." msgstr "在编辑/插入模式中显示函数列." @@ -7488,9 +7487,8 @@ msgid "Proxy username" msgstr "代理用户名" #: libraries/config/messages.inc.php:973 -#, fuzzy msgid "The password for authenticating with the proxy." -msgstr "代理密码。" +msgstr "代理服务的密码." #: libraries/config/messages.inc.php:974 msgid "Proxy password" @@ -16466,7 +16464,6 @@ msgid "Too many connections are aborted." msgstr "太多连接已中止。" #: libraries/advisory_rules.txt:396 libraries/advisory_rules.txt:403 -#, fuzzy #| msgid "" #| "Connections are usually aborted when they cannot be authorized. This article might help you track down the source." msgstr "" -"连接通常因为无法被授权而中止。这篇文章对您追踪来源可能有所帮助。" +"连接通常因为无法被授权而中止。这篇文章对您追踪来源可能有所帮助。" #: libraries/advisory_rules.txt:397 #, php-format From 9fb38a7a94aa82f0c7b54fa66cb04753785679fe Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 2 Nov 2015 08:42:57 -0500 Subject: [PATCH 2/4] Remove the side effect of a method Signed-off-by: Marc Delisle --- libraries/DisplayResults.php | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/libraries/DisplayResults.php b/libraries/DisplayResults.php index 890e7f6528..087d14b8ff 100644 --- a/libraries/DisplayResults.php +++ b/libraries/DisplayResults.php @@ -577,23 +577,24 @@ class DisplayResults /** * Defines the parts to display for the results of a SQL query + * and the total number of rows * * @param array $displayParts the parts to display (see a few * lines above for explanations) - * @param integer &$the_total the total number of rows returned by the SQL - * query without any programmatically appended - * LIMIT clause - * (just a copy of $unlim_num_rows if it exists, - * elsecomputed inside this function) * - * @return array an array with explicit indexes for all the display - * elements + * @return array the first element is an array with explicit indexes + * for all the display elements + * the second element is the total number of rows returned + * by the SQL query without any programmatically appended + * LIMIT clause (just a copy of $unlim_num_rows if it exists, + * else computed inside this function) + * * * @access private * * @see getTable() */ - private function _setDisplayParts($displayParts, &$the_total) + private function _setDisplayPartsAndTotal($displayParts) { // 1. Following variables are needed for use in isset/empty or // use with array indexes or safe use in foreach @@ -653,9 +654,9 @@ class DisplayResults } } // end if (3) - return $displayParts; + return array($displayParts, $the_total); - } // end of the 'setDisplayParts()' function + } // end of the 'setDisplayPartsAndTotal()' function /** @@ -4254,8 +4255,11 @@ class DisplayResults // 1.1 Gets the information about which functionalities should be // displayed - $total = ''; - $displayParts = $this->_setDisplayParts($displayParts, $total); + + list( + $displayParts, + $total + ) = $this->_setDisplayPartsAndTotal($displayParts); // 1.2 Defines offsets for the next and previous pages if ($displayParts['nav_bar'] == '1') { From db6992a5a962977f795b01d5b2ac27d8fdd98649 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 2 Nov 2015 09:03:08 -0500 Subject: [PATCH 3/4] Fix coding style and missing initialization Signed-off-by: Marc Delisle --- libraries/DisplayResults.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/DisplayResults.php b/libraries/DisplayResults.php index 087d14b8ff..9fb00bb621 100644 --- a/libraries/DisplayResults.php +++ b/libraries/DisplayResults.php @@ -579,8 +579,8 @@ class DisplayResults * Defines the parts to display for the results of a SQL query * and the total number of rows * - * @param array $displayParts the parts to display (see a few - * lines above for explanations) + * @param array $displayParts the parts to display (see a few + * lines above for explanations) * * @return array the first element is an array with explicit indexes * for all the display elements @@ -596,6 +596,8 @@ class DisplayResults */ private function _setDisplayPartsAndTotal($displayParts) { + $the_total = 0; + // 1. Following variables are needed for use in isset/empty or // use with array indexes or safe use in foreach $db = $this->__get('db'); From b875d551b76ad25367c8f7f3260efb5ea3b542c7 Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Mon, 2 Nov 2015 15:02:59 +0100 Subject: [PATCH 4/4] Translated using Weblate (Interlingua) Currently translated at 70.6% (2281 of 3228 strings) [CI skip] --- po/ia.po | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/po/ia.po b/po/ia.po index 77bd2872d4..96a8435196 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-26 20:01-0400\n" -"PO-Revision-Date: 2015-10-23 17:02+0200\n" +"PO-Revision-Date: 2015-11-02 15:02+0200\n" "Last-Translator: Giovanni Sora \n" -"Language-Team: Interlingua \n" +"Language-Team: Interlingua " +"\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -9111,14 +9111,13 @@ msgid "Edit next row" msgstr "Modifica nove rango" #: libraries/insert_edit.lib.php:1541 -#, fuzzy #| msgid "" #| "Use TAB key to move from value to value, or CTRL+arrows to move anywhere" msgid "" "Use TAB key to move from value to value, or CTRL+arrows to move anywhere." msgstr "" "Usa le clave TAB pro mover de valor a valor, o CTRL+flechas pro mover lo " -"ubique" +"ubique." #: libraries/insert_edit.lib.php:1578 libraries/replication_gui.lib.php:546 #: libraries/rte/rte_routines.lib.php:1585 @@ -9467,10 +9466,10 @@ msgid "Invalid class name \"%1$s\", using default of \"Node\"" msgstr "Invalide nomine de classe \"%1$s\", on usa le predefinite per \"Node\"" #: libraries/navigation/NodeFactory.php:63 -#, fuzzy, php-format +#, php-format #| msgid "Could not add columns!" msgid "Could not load class \"%1$s\"" -msgstr "Il non pote adder columnas!" +msgstr "Il non pote adder classe \"%1$s\"" #: libraries/navigation/nodes/Node.php:803 msgid "Expand/Collapse" @@ -9588,7 +9587,6 @@ msgstr "" "Monstra a me le lista central de columnas que non es preste in iste tabella" #: libraries/normalization.lib.php:151 -#, fuzzy #| msgid "" #| "Select a column which can be split into more than one. (on select of 'no " #| "such column', it'll move to next step)" @@ -9596,8 +9594,8 @@ msgid "" "Select a column which can be split into more than one (on select of 'no such " "column', it'll move to next step)." msgstr "" -"Selige un columna que pote esser dividite in plus que un. (si on selige " -"'necun tal columna', on movera al proxime passo)" +"Selige un columna que pote esser dividite in plus que un (si on selige " +"'necun tal columna', on movera al proxime passo)." #: libraries/normalization.lib.php:158 normalization.php:17 msgid "Select one…"