From 6deb9d8d558be47ec640632453fd70173ba9852e Mon Sep 17 00:00:00 2001 From: William Desportes Date: Mon, 23 Dec 2019 19:21:53 +0000 Subject: [PATCH 1/4] Translated using Weblate (French) Currently translated at 100.0% (3307 of 3307 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/fr/ Signed-off-by: William Desportes --- po/fr.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/po/fr.po b/po/fr.po index 0ec70462b8..c0753008f5 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-12-23 15:36-0300\n" -"PO-Revision-Date: 2019-12-23 14:21+0000\n" -"Last-Translator: Olivier Humbert \n" +"PO-Revision-Date: 2019-12-23 19:26+0000\n" +"Last-Translator: William Desportes \n" "Language-Team: French \n" "Language: fr\n" @@ -718,7 +718,7 @@ msgstr "Utilisateur :" #: index.php:370 msgid "Server charset:" -msgstr "Jeu de caractères du serveur : " +msgstr "Jeu de caractères du serveur :" #: index.php:388 msgid "Web server" @@ -726,11 +726,11 @@ msgstr "Serveur Web" #: index.php:399 msgid "Database client version:" -msgstr "Version du client de base de données : " +msgstr "Version du client de base de données :" #: index.php:403 msgid "PHP extension:" -msgstr "Extension PHP : " +msgstr "Extension PHP :" #: index.php:417 msgid "PHP version:" @@ -742,7 +742,7 @@ msgstr "Afficher les informations relatives à PHP" #: index.php:447 msgid "Version information:" -msgstr "Version : " +msgstr "Version :" #: index.php:456 libraries/classes/Config/FormDisplayTemplate.php:164 #: libraries/classes/Display/Export.php:350 @@ -3172,7 +3172,7 @@ msgstr "par jour" #: libraries/classes/BrowseForeigners.php:193 msgid "Search:" -msgstr "Rechercher : " +msgstr "Rechercher :" #: libraries/classes/BrowseForeigners.php:216 #: libraries/classes/BrowseForeigners.php:220 libraries/classes/Index.php:719 @@ -3195,7 +3195,7 @@ msgstr "Description" #: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php:520 #: libraries/classes/Util.php:2316 msgid "Page number:" -msgstr "Page n° : " +msgstr "Page n° :" #: libraries/classes/CentralColumns.php:227 msgid "" @@ -3308,7 +3308,7 @@ msgstr "Sélectionner une table" #: libraries/classes/CentralColumns.php:845 #: templates/table/structure/add_column.twig:4 msgid "Add column" -msgstr "Ajouter une colonne :" +msgstr "Ajouter une colonne" #: libraries/classes/CentralColumns.php:1304 msgid "Add new column" @@ -6613,7 +6613,7 @@ msgstr "" #: libraries/classes/Config/Validator.php:435 msgid "Incorrect value:" -msgstr "Valeur incorrecte : " +msgstr "Valeur incorrecte :" #: libraries/classes/Config/Validator.php:444 #, php-format @@ -7028,7 +7028,7 @@ msgstr "Relation interne retirée." #: libraries/classes/Database/Qbe.php:456 #: templates/table/search/search_and_replace.twig:6 msgid "Column:" -msgstr "Colonne : " +msgstr "Colonne :" #: libraries/classes/Database/Qbe.php:502 msgid "Alias:" From 188bda5945c0267fd6f40215abbf70cba474b749 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Mon, 23 Dec 2019 19:21:52 +0000 Subject: [PATCH 2/4] Translated using Weblate (French) Currently translated at 100.0% (3332 of 3332 strings) [CI skip] Translation: phpMyAdmin/5.0 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/fr/ Signed-off-by: William Desportes --- po/fr.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/po/fr.po b/po/fr.po index 8c87bc5a42..af8542593c 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-12-23 15:37-0300\n" -"PO-Revision-Date: 2019-12-23 14:21+0000\n" -"Last-Translator: Olivier Humbert \n" +"PO-Revision-Date: 2019-12-23 19:26+0000\n" +"Last-Translator: William Desportes \n" "Language-Team: French \n" "Language: fr\n" @@ -2760,7 +2760,7 @@ msgstr "par jour" #: libraries/classes/BrowseForeigners.php:203 msgid "Search:" -msgstr "Rechercher : " +msgstr "Rechercher :" #: libraries/classes/BrowseForeigners.php:226 #: libraries/classes/BrowseForeigners.php:230 libraries/classes/Index.php:716 @@ -2783,7 +2783,7 @@ msgstr "Description" #: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php:542 #: libraries/classes/Util.php:2404 msgid "Page number:" -msgstr "Page n° : " +msgstr "Page n° :" #: libraries/classes/CentralColumns.php:243 msgid "" @@ -6310,7 +6310,7 @@ msgstr "" #: libraries/classes/Config/Validator.php:436 msgid "Incorrect value:" -msgstr "Valeur incorrecte : " +msgstr "Valeur incorrecte :" #: libraries/classes/Config/Validator.php:445 #, php-format @@ -7626,7 +7626,7 @@ msgstr "Relation interne retirée." #: libraries/classes/Database/Qbe.php:478 #: templates/table/search/selection_form.twig:186 msgid "Column:" -msgstr "Colonne : " +msgstr "Colonne :" #: libraries/classes/Database/Qbe.php:520 msgid "Alias:" @@ -14749,7 +14749,7 @@ msgstr "Utilisateur :" #: templates/home/index.twig:121 msgid "Server charset:" -msgstr "Jeu de caractères du serveur : " +msgstr "Jeu de caractères du serveur :" #: templates/home/index.twig:132 msgid "Web server" @@ -14757,11 +14757,11 @@ msgstr "Serveur Web" #: templates/home/index.twig:139 msgid "Database client version:" -msgstr "Version du client de base de données : " +msgstr "Version du client de base de données :" #: templates/home/index.twig:143 msgid "PHP extension:" -msgstr "Extension PHP : " +msgstr "Extension PHP :" #: templates/home/index.twig:150 msgid "PHP version:" @@ -14769,7 +14769,7 @@ msgstr "Version de PHP :" #: templates/home/index.twig:165 msgid "Version information:" -msgstr "Version : " +msgstr "Version :" #: templates/home/index.twig:175 msgid "Official Homepage" @@ -14860,7 +14860,7 @@ msgstr "Suivre la vue" #: templates/table/structure/display_structure.twig:420 #: templates/database/central_columns/main.twig:194 msgid "Add column" -msgstr "Ajouter une colonne :" +msgstr "Ajouter une colonne" #: templates/table/structure/display_structure.twig:425 #, php-format From bc792b446d88dbb58c9e094db100ecfff957d35f Mon Sep 17 00:00:00 2001 From: William Desportes Date: Tue, 24 Dec 2019 15:55:59 +0100 Subject: [PATCH 3/4] Fix #15692 - js error when user has not enough privilege to view query statistics. Signed-off-by: William Desportes --- js/server_status_queries.js | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/js/server_status_queries.js b/js/server_status_queries.js index 056cffebc7..a3a7713299 100644 --- a/js/server_status_queries.js +++ b/js/server_status_queries.js @@ -6,9 +6,11 @@ * Unbind all event handlers before tearing down a page */ AJAX.registerTeardown('server_status_queries.js', function () { - var queryPieChart = $('#serverstatusquerieschart').data('queryPieChart'); - if (queryPieChart) { - queryPieChart.destroy(); + if (document.getElementById('serverstatusquerieschart') !== null) { + var queryPieChart = $('#serverstatusquerieschart').data('queryPieChart'); + if (queryPieChart) { + queryPieChart.destroy(); + } } }); @@ -16,16 +18,18 @@ AJAX.registerOnload('server_status_queries.js', function () { // Build query statistics chart var cdata = []; try { - $.each($('#serverstatusquerieschart').data('chart'), function (key, value) { - cdata.push([key, parseInt(value, 10)]); - }); - $('#serverstatusquerieschart').data( - 'queryPieChart', - PMA_createProfilingChart( - 'serverstatusquerieschart', - cdata - ) - ); + if (document.getElementById('serverstatusquerieschart') !== null) { + $.each($('#serverstatusquerieschart').data('chart'), function (key, value) { + cdata.push([key, parseInt(value, 10)]); + }); + $('#serverstatusquerieschart').data( + 'queryPieChart', + PMA_createProfilingChart( + 'serverstatusquerieschart', + cdata + ) + ); + } } catch (exception) { // Could not load chart, no big deal... } From 51b6fe76fd338dd608c219e585e4629d30ed2ac4 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Tue, 24 Dec 2019 15:56:56 +0100 Subject: [PATCH 4/4] Add ChangeLog entry for #15692 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 905d68b136..e3a6e8907a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog - issue #15641 Fix replication actions where broken (start slave, stop slave, reset, ...) - issue #15608 Fix DisableIS is broken when with controluser configured (database list broken) - issue #15614 Fix undefined offset on index page for MySQL 5.7.8 (server charset) +- issue #15692 Fix JavaScript error when user has not enough privilege to view query statistics. 4.9.2 (2019-11-21) - issue #14184 Change the cookie name from phpMyAdmin to phpMyAdmin_https for HTTPS, fixes many "Failed to set session cookie" errors