From 8edb9e1041ff5dfe49eb12484f53716829de8975 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 31 Jul 2019 19:36:53 +0000 Subject: [PATCH 1/6] Translated using Weblate (French) Currently translated at 99.9% (3302 of 3303 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/fr/ Signed-off-by: Marc Delisle --- po/fr.po | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/po/fr.po b/po/fr.po index a53d6a6d36..74cc922f20 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-07-12 01:21-0300\n" -"PO-Revision-Date: 2019-06-24 14:00+0000\n" -"Last-Translator: Olivier Humbert \n" +"PO-Revision-Date: 2019-08-01 20:10+0000\n" +"Last-Translator: Marc Delisle \n" "Language-Team: French \n" "Language: fr\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 3.7.1-dev\n" +"X-Generator: Weblate 3.8-dev\n" #: ajax.php:21 ajax.php:50 export.php:196 libraries/classes/Export.php:1095 msgid "Bad type!" @@ -3575,12 +3575,9 @@ msgid "accent-sensitive" msgstr "sensible aux signes diacritiques" #: libraries/classes/Charsets.php:675 -#, fuzzy -#| msgctxt "Collation variant" -#| msgid "accent-sensitive" msgctxt "Collation variant" msgid "kana-sensitive" -msgstr "sensible aux signes diacritiques" +msgstr "sensible aux caractères japonais (Hiragana et Katakana)" #: libraries/classes/Charsets.php:679 msgctxt "Collation variant" From 28c07ebcda34d042557fb59cac2a579d92d14f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ez=C3=A9chiel=20Amen=20AGBLA?= Date: Sun, 4 Aug 2019 12:34:29 +0000 Subject: [PATCH 2/6] Translated using Weblate (French) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (3303 of 3303 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/fr/ Signed-off-by: Ezéchiel Amen AGBLA --- po/fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 74cc922f20..e33c281622 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-07-12 01:21-0300\n" -"PO-Revision-Date: 2019-08-01 20:10+0000\n" -"Last-Translator: Marc Delisle \n" +"PO-Revision-Date: 2019-08-04 12:34+0000\n" +"Last-Translator: Ezéchiel Amen AGBLA \n" "Language-Team: French \n" "Language: fr\n" @@ -3592,7 +3592,7 @@ msgstr "binaire" #: libraries/classes/Charsets.php:685 msgctxt "Collation variant" msgid "no-pad" -msgstr "" +msgstr "no-pad" #: libraries/classes/Config.php:1122 #, php-format From 536447a4ccdbae9a2b3f1783607b2a8a57c69e4d Mon Sep 17 00:00:00 2001 From: ssantos Date: Thu, 8 Aug 2019 18:00:48 +0000 Subject: [PATCH 3/6] Translated using Weblate (German) Currently translated at 100.0% (3303 of 3303 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/de/ Signed-off-by: ssantos --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 9d0127619a..f59b9e693a 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-07-12 01:21-0300\n" -"PO-Revision-Date: 2019-07-19 16:06+0000\n" +"PO-Revision-Date: 2019-08-09 18:22+0000\n" "Last-Translator: ssantos \n" "Language-Team: German \n" @@ -3603,7 +3603,7 @@ msgstr "Binär" #: libraries/classes/Charsets.php:685 msgctxt "Collation variant" msgid "no-pad" -msgstr "" +msgstr "No-pad" #: libraries/classes/Config.php:1122 #, php-format From c8478f5eadd8f514326b82e2cb4f9a2bbf3914b0 Mon Sep 17 00:00:00 2001 From: ssantos Date: Thu, 8 Aug 2019 18:01:15 +0000 Subject: [PATCH 4/6] Translated using Weblate (Portuguese) Currently translated at 100.0% (3303 of 3303 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/pt/ Signed-off-by: ssantos --- po/pt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/pt.po b/po/pt.po index 87040ead52..2b45191ac7 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.9.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-07-12 01:21-0300\n" -"PO-Revision-Date: 2019-07-19 16:06+0000\n" +"PO-Revision-Date: 2019-08-09 18:22+0000\n" "Last-Translator: ssantos \n" "Language-Team: Portuguese \n" @@ -3573,7 +3573,7 @@ msgstr "binário" #: libraries/classes/Charsets.php:685 msgctxt "Collation variant" msgid "no-pad" -msgstr "" +msgstr "no-pad" #: libraries/classes/Config.php:1122 #, php-format From 79c0c8a8f35e79ef0813a4506d97b7e810a33644 Mon Sep 17 00:00:00 2001 From: Vadim Chernyshev Date: Sun, 11 Aug 2019 06:24:06 +0300 Subject: [PATCH 5/6] Fixed configuration for FilterLanguages Signed-off-by: Vadim Chernyshev --- libraries/classes/LanguageManager.php | 4 ++-- test/classes/LanguageTest.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/classes/LanguageManager.php b/libraries/classes/LanguageManager.php index fb627c108d..81c574de87 100644 --- a/libraries/classes/LanguageManager.php +++ b/libraries/classes/LanguageManager.php @@ -726,11 +726,11 @@ class LanguageManager { if (! $this->_available_locales) { - if (empty($GLOBALS['cfg']['FilterLanguages'])) { + if (!isset($GLOBALS['PMA_Config']) || empty($GLOBALS['PMA_Config']->get('FilterLanguages'))) { $this->_available_locales = $this->listLocaleDir(); } else { $this->_available_locales = preg_grep( - '@' . $GLOBALS['cfg']['FilterLanguages'] . '@', + '@' . $GLOBALS['PMA_Config']->get('FilterLanguages') . '@', $this->listLocaleDir() ); } diff --git a/test/classes/LanguageTest.php b/test/classes/LanguageTest.php index edf952ec66..36642a8ded 100644 --- a/test/classes/LanguageTest.php +++ b/test/classes/LanguageTest.php @@ -46,13 +46,13 @@ class LanguageTest extends PmaTestCase */ public function testAvailable() { - $GLOBALS['cfg']['FilterLanguages'] = 'cs|en$'; + $GLOBALS['PMA_Config']->set('FilterLanguages', 'cs|en$'); $langs = $this->manager->availableLocales(); $this->assertCount(2, $langs); $this->assertContains('cs', $langs); - $GLOBALS['cfg']['FilterLanguages'] = ''; + $GLOBALS['PMA_Config']->set('FilterLanguages', ''); } /** @@ -62,7 +62,7 @@ class LanguageTest extends PmaTestCase */ public function testAllAvailable() { - $GLOBALS['cfg']['FilterLanguages'] = ''; + $GLOBALS['PMA_Config']->set('FilterLanguages', ''); $langs = $this->manager->availableLocales(); From 973c40609bb6442655bf5252050adeb8434e8170 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 11 Aug 2019 18:43:24 +0200 Subject: [PATCH 6/6] Add ChangeLog entry for #15427 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 3324777dd3..9ffb75fd5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog - issue Added description for the _ks (kana-sensitive) collation suffix - issue Added description for the _nopad (NO PAD) collation suffix - issue #15404 Remove array/string curly braces access +- issue #15427 Fixed "FilterLanguages" option does not work (configuration) 4.9.0.1 (2019-06-04) - issue #14478 phpMyAdmin no longer streams the export data