From 1a03bc76598219f781da997243baadf3a42bd93b Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 21 Mar 2021 21:37:02 +0000 Subject: [PATCH 1/4] Translated using Weblate (Spanish) Currently translated at 95.2% (3218 of 3379 strings) [ci skip] Translation: phpMyAdmin/5.1 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-1/es/ Signed-off-by: William Desportes --- po/es.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/es.po b/po/es.po index d4760bbd8f..130392ffb0 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.1.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2021-03-06 15:47+0100\n" -"PO-Revision-Date: 2021-01-22 17:26+0000\n" +"PO-Revision-Date: 2021-03-21 21:40+0000\n" "Last-Translator: William Desportes \n" "Language-Team: Spanish \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 4.5-dev\n" +"X-Generator: Weblate 4.5.2-dev\n" #: libraries/advisory_rules_generic.php:9 msgid "Uptime below one day" @@ -11672,18 +11672,17 @@ msgid "" "    Example: INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), " "(7,8,9)" msgstr "" -"incluir múltiples filas en cada sentencia INSERTAR
" -"      Ejemplo: INSERTAR DENTRO nombre_tabla VALORES " -"(1,2,3), (4,5,6), (7,8,9)" +"incluir múltiples filas en cada sentencia INSERT
  " +"    Ejemplo: INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), " +"(7,8,9)" #: libraries/classes/Plugins/Export/ExportSql.php:475 msgid "" "both of the above
      Example: INSERT INTO " "tbl_name (col_A,col_B,col_C) VALUES (1,2,3), (4,5,6), (7,8,9)" msgstr "" -"ambos de los anteriores
& nbsp; & nbsp; & nbsp; Ejemplo: " -"INSERTAR DENTRO nombre_tabla(col_A, col_B, col_C) VALORES (1,2,3), (4,5,6), " -"(7,8,9) " +"ambos de los anteriores
      Ejemplo: INSERT INTO " +"tbl_name (col_A,col_B,col_C) VALUES (1,2,3), (4,5,6), (7,8,9)" #: libraries/classes/Plugins/Export/ExportSql.php:480 msgid "" From 8c74a42dd3f6f341c2b4998fe1423eb4fcbab4f2 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 21 Mar 2021 22:54:32 +0100 Subject: [PATCH 2/4] Fix #16647 - respect TabsMode on preferences form Fixes: #16647 Signed-off-by: William Desportes --- templates/preferences/header.twig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/preferences/header.twig b/templates/preferences/header.twig index 755bb5ef6a..fd07aa538d 100644 --- a/templates/preferences/header.twig +++ b/templates/preferences/header.twig @@ -15,37 +15,37 @@
  • - {{ get_icon('b_tblops', 'Features'|trans) }} + {{ get_icon('b_tblops', 'Features'|trans, false, false, 'TabsMode') }}
  • - {{ get_icon('b_sql', 'SQL queries'|trans) }} + {{ get_icon('b_sql', 'SQL queries'|trans, false, false, 'TabsMode') }}
  • - {{ get_icon('b_select', 'Navigation panel'|trans) }} + {{ get_icon('b_select', 'Navigation panel'|trans, false, false, 'TabsMode') }}
  • - {{ get_icon('b_props', 'Main panel'|trans) }} + {{ get_icon('b_props', 'Main panel'|trans, false, false, 'TabsMode') }}
  • - {{ get_icon('b_export', 'Export'|trans) }} + {{ get_icon('b_export', 'Export'|trans, false, false, 'TabsMode') }}
  • - {{ get_icon('b_import', 'Import'|trans) }} + {{ get_icon('b_import', 'Import'|trans, false, false, 'TabsMode') }}
    • From 2068d8297c057ebb638ca6f3d9394755345df88d Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 21 Mar 2021 22:56:19 +0100 Subject: [PATCH 3/4] Add a ChangeLog entry for #16647 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 5cfa4c859f..8d2c171ecc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ phpMyAdmin - ChangeLog - issue #16744 Fixed "Uncaught TypeError: XMLWriter::writeAttribute()" on Designer SVG export - issue Fixed an PHP undefined index notice on export - issue #14555 Fixed JavaScript error when auto completion is open (upgraded CodeMirror to 5.60.0) +- issue #16647 Fixed preferences form not showing texts and not respecting TabsMode config 5.1.0 (2021-02-24) - issue #15350 Change Media (MIME) type references to Media type From 54fc311a3f82083dfe120b636fae3adffcb7d9a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 22 Mar 2021 16:14:51 -0300 Subject: [PATCH 4/4] Fix escape_mysql_wildcards Twig filter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 1 + libraries/classes/Twig/UtilExtension.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8d2c171ecc..50ac19702b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ phpMyAdmin - ChangeLog - issue Fixed an PHP undefined index notice on export - issue #14555 Fixed JavaScript error when auto completion is open (upgraded CodeMirror to 5.60.0) - issue #16647 Fixed preferences form not showing texts and not respecting TabsMode config +- issue Fixed escape_mysql_wildcards Twig filter 5.1.0 (2021-02-24) - issue #15350 Change Media (MIME) type references to Media type diff --git a/libraries/classes/Twig/UtilExtension.php b/libraries/classes/Twig/UtilExtension.php index 1b3dff7719..7043ebf9ca 100644 --- a/libraries/classes/Twig/UtilExtension.php +++ b/libraries/classes/Twig/UtilExtension.php @@ -163,7 +163,7 @@ class UtilExtension extends AbstractExtension ), new TwigFilter( 'escape_mysql_wildcards', - 'PhpMyAdmin\Util::convertBitDefaultValue' + 'PhpMyAdmin\Util::escapeMysqlWildcards' ), ]; }