From 9fd401c8c95b640be05104b2b266de22afae47c1 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 16 Nov 2022 11:25:55 +0100 Subject: [PATCH 1/6] Add a ChangeLog entry for #17606 Ref: #17899 [ci skip] Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 9fd4f34785..e4f6602cfb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ phpMyAdmin - ChangeLog - issue #17777 Fix Uncaught TypeError: Cannot read properties of null (reading 'inline') on datepickers when re-opened - issue Fix Original theme buttons style and login form width - issue #17892 Fix closing index edit modal and reopening causes it to fire twice +- issue #17606 Fix preview SQL modal not working inside "Add Index" modal 5.2.0 (2022-05-10) - issue #16521 Upgrade Bootstrap to version 5 From 027171169e936be0a8904679dbe75ef7b4a373ae Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 16 Nov 2022 14:39:07 +0100 Subject: [PATCH 2/6] Fix PHP error on adding new column on create table form ``` Internal error in ./templates/columns_definitions/column_attributes.twig#218 Twig\Error\RuntimeError: An exception has been thrown during the rendering of a template ("preg_match(): Passing null to parameter #2 ($subject) of type string is deprecated"). ``` Signed-off-by: William Desportes --- templates/columns_definitions/column_attributes.twig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/columns_definitions/column_attributes.twig b/templates/columns_definitions/column_attributes.twig index 170fb71f1a..8efc7550da 100644 --- a/templates/columns_definitions/column_attributes.twig +++ b/templates/columns_definitions/column_attributes.twig @@ -215,7 +215,9 @@ {% for mimekey, transform in available_mime['transformation'] %} {% set parts = transform|split(':') %} From 974b716eb4209bb028861f27c330c11e54fc4c4f Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 16 Nov 2022 14:40:15 +0100 Subject: [PATCH 3/6] Add a ChangeLog entry for df42048cad Ref: df42048cad605547bbd86a56905e8638abf0af4b Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index e4f6602cfb..1dd06f1ffc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ phpMyAdmin - ChangeLog - issue Fix Original theme buttons style and login form width - issue #17892 Fix closing index edit modal and reopening causes it to fire twice - issue #17606 Fix preview SQL modal not working inside "Add Index" modal +- issue Fix PHP error on adding new column on create table form 5.2.0 (2022-05-10) - issue #16521 Upgrade Bootstrap to version 5 From 9a8452735c653ac0c35059ab8c93d5b90561fd8c Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 17 Nov 2022 13:22:06 +0100 Subject: [PATCH 4/6] Switch to sql-parser dev-master version before it is released Signed-off-by: William Desportes --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e295f8c96b..13973eb1cb 100644 --- a/composer.json +++ b/composer.json @@ -61,7 +61,7 @@ "paragonie/sodium_compat": "^1.17", "phpmyadmin/motranslator": "^5.0", "phpmyadmin/shapefile": "^3.0.1", - "phpmyadmin/sql-parser": "^5.5", + "phpmyadmin/sql-parser": "dev-master#a9cd167be77829ec2dd4496ce1010ed6abde92f8", "phpmyadmin/twig-i18n-extension": "^4.0", "psr/http-factory": "^1.0", "psr/http-message": "^1.0", From aaee049e595e5782edcdcbe77e237bd70c4f15ef Mon Sep 17 00:00:00 2001 From: Kristijan Fremen Velkovski Date: Wed, 16 Nov 2022 05:33:02 +0000 Subject: [PATCH 5/6] Translated using Weblate (Macedonian) Currently translated at 21.2% (726 of 3418 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/ Signed-off-by: Kristijan Fremen Velkovski --- po/mk.po | 77 ++++++++++++++++++-------------------------------------- 1 file changed, 24 insertions(+), 53 deletions(-) diff --git a/po/mk.po b/po/mk.po index 3da13b87e9..8478c24cc4 100644 --- a/po/mk.po +++ b/po/mk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2022-09-29 00:17-0300\n" -"PO-Revision-Date: 2022-11-14 11:47+0000\n" +"PO-Revision-Date: 2022-11-18 03:47+0000\n" "Last-Translator: Kristijan Fremen Velkovski \n" "Language-Team: Macedonian \n" @@ -3034,10 +3034,8 @@ msgstr "Полињата се раздвоени со" #: libraries/classes/Config/Descriptions.php:795 #: libraries/classes/Config/Descriptions.php:801 #: libraries/classes/Plugins/Import/ImportCsv.php:677 -#, fuzzy -#| msgid "Fields escaped by" msgid "Columns escaped with" -msgstr "Escape карактер      " +msgstr "Колоните се избегнати со" #: libraries/classes/Config/Descriptions.php:663 #: libraries/classes/Config/Descriptions.php:669 @@ -4993,10 +4991,8 @@ msgstr "Пристапот не е допуштен!" #: libraries/classes/Controllers/Table/Maintenance/ChecksumController.php:54 #: libraries/classes/Controllers/Table/Maintenance/OptimizeController.php:54 #: libraries/classes/Controllers/Table/Maintenance/RepairController.php:54 -#, fuzzy -#| msgid "No tables selected." msgid "No table selected." -msgstr "Не е избрана ниту една табела." +msgstr "Не е избрана табела." #: libraries/classes/Controllers/Database/Structure/CentralColumns/AddController.php:53 #: libraries/classes/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php:53 @@ -5350,10 +5346,8 @@ msgid "You are about to TRUNCATE a complete table!" msgstr "Со ова ја БРИШЕТЕ комплетната база на податоци!" #: libraries/classes/Controllers/JavaScriptMessagesController.php:47 -#, fuzzy -#| msgid "You are about to DESTROY a complete database!" msgid "You are about to DELETE all the rows of the table!" -msgstr "Со ова ја БРИШЕТЕ комплетната база на податоци!" +msgstr "Со ова ги БРИШЕТЕ(DELETE) сите редови на табелата!" #: libraries/classes/Controllers/JavaScriptMessagesController.php:48 #, fuzzy @@ -5696,17 +5690,13 @@ msgstr "" #: libraries/classes/Controllers/JavaScriptMessagesController.php:140 #: templates/server/privileges/users_overview.twig:100 -#, fuzzy -#| msgid "Remove database" msgid "Lock this account." -msgstr "Избриши ја базата на податоци." +msgstr "Заклучи го овој корисник." #: libraries/classes/Controllers/JavaScriptMessagesController.php:141 #: templates/server/privileges/users_overview.twig:100 -#, fuzzy -#| msgid "User" msgid "Unlock this account." -msgstr "Корисник" +msgstr "Вклучи го овој корисник." #: libraries/classes/Controllers/JavaScriptMessagesController.php:144 #, fuzzy @@ -5959,10 +5949,8 @@ msgstr "нема" #. l10n: SQL Query on modal to show exported query #: libraries/classes/Controllers/JavaScriptMessagesController.php:210 -#, fuzzy -#| msgid "SQL query" msgid "SQL Query" -msgstr "SQL упит" +msgstr "SQL Барање" #: libraries/classes/Controllers/JavaScriptMessagesController.php:211 msgid "Resume monitor" @@ -7567,16 +7555,14 @@ msgstr[0] "%1$d база на податоци беше успешно избр msgstr[1] "%1$d бази на податоци беа успешно избришани." #: libraries/classes/Controllers/Server/Privileges/AccountLockController.php:47 -#, fuzzy, php-format -#| msgid "The selected users have been deleted successfully." +#, php-format msgid "The account %s@%s has been successfully locked." -msgstr "Изабраните корисници успешно се избришани." +msgstr "Корисникот %s@%s беше успешно заклучен." #: libraries/classes/Controllers/Server/Privileges/AccountUnlockController.php:47 -#, fuzzy, php-format -#| msgid "The selected users have been deleted successfully." +#, php-format msgid "The account %s@%s has been successfully unlocked." -msgstr "Изабраните корисници успешно се избришани." +msgstr "Корисникот %s@%s беше успешно отклучен." #: libraries/classes/Controllers/Server/PrivilegesController.php:152 #: libraries/classes/Controllers/Server/UserGroupsController.php:53 @@ -8211,10 +8197,8 @@ msgid "Missing parameter:" msgstr "Недостига параметар:" #: libraries/classes/Controllers/Server/UserGroupsFormController.php:60 -#, fuzzy -#| msgid "The server is not responding" msgid "User groups management is not enabled." -msgstr "Серверот не одговара" +msgstr "Менаџментот за кориснички групи не е уклучен." #: libraries/classes/Controllers/Server/Variables/SetVariableController.php:93 msgid "Setting variable failed" @@ -12462,31 +12446,19 @@ msgid "" msgstr "" #: libraries/classes/Server/Privileges.php:3016 -#, fuzzy, php-format -#| msgid "" -#| "Note: phpMyAdmin gets the users' privileges directly from MySQL's " -#| "privilege tables. The content of these tables may differ from the " -#| "privileges the server uses, if they have been changed manually. In this " -#| "case, you should %sreload the privileges%s before you continue." +#, php-format msgid "" "Note: phpMyAdmin gets the users’ privileges directly from MySQL’s privilege " "tables. The content of these tables may differ from the privileges the " "server uses, if they have been changed manually. In this case, you should " "%sreload the privileges%s before you continue." msgstr "" -"Напомена: phpMyAdmin ги зема привилегиите на корисникот директно од MySQL " -"табелата на привилегии. Содржината на оваа табела табела може да се " -"разликува од привилегиите кои серверот ги користи ако се вршени мануелни " -"измени. Во тој случај %sповторно вчитајте ги привилегиите%s пред да " -"продолжите со работа." +"Белешка: phpMyAdmin ги зема привилегиите на корисникот директно од табелата " +"на привилегии на MySQL. Содржината на оваа табела може да се разликува од " +"привилегиите кои серверот ги користи ако се рачно изменети. Во тој случај " +"%sповторно вчитајте ги привилегиите%s пред да продолжите." #: libraries/classes/Server/Privileges.php:3032 -#, fuzzy -#| msgid "" -#| "Note: phpMyAdmin gets the users' privileges directly from MySQL's " -#| "privilege tables. The content of these tables may differ from the " -#| "privileges the server uses, if they have been changed manually. In this " -#| "case, you should %sreload the privileges%s before you continue." msgid "" "Note: phpMyAdmin gets the users’ privileges directly from MySQL’s privilege " "tables. The content of these tables may differ from the privileges the " @@ -12494,11 +12466,11 @@ msgid "" "privileges have to be reloaded but currently, you don't have the RELOAD " "privilege." msgstr "" -"Напомена: phpMyAdmin ги зема привилегиите на корисникот директно од MySQL " -"табелата на привилегии. Содржината на оваа табела табела може да се " -"разликува од привилегиите кои серверот ги користи ако се вршени мануелни " -"измени. Во тој случај %sповторно вчитајте ги привилегиите%s пред да " -"продолжите со работа." +"Белешка: phpMyAdmin ги зема привилегиите на корисникот директно од табелата " +"на привилегии на MySQL. Содржината на оваа табела може да се разликува од " +"привилегиите кои серверот ги користи ако се рачно изменети. Во тој случај, " +"привилегиите треба да се вчитаат повторно, но вие ja немате RELOAD " +"привилегијата." #: libraries/classes/Server/Privileges.php:3346 msgid "You have added a new user." @@ -19524,10 +19496,9 @@ msgid "at beginning of table" msgstr "на почетокот од табелата" #: templates/table/structure/display_structure.twig:552 -#, fuzzy, php-format -#| msgid "Create an index on %s columns" +#, php-format msgid "Create an index on %s columns" -msgstr "Направи клуч на %s колони" +msgstr "Направи индекс на %s колони" #: templates/table/structure/display_table_stats.twig:14 msgid "Space usage" From 39e52ea6fc062576bef70f2fe3c55460b98c8571 Mon Sep 17 00:00:00 2001 From: Kristijan Fremen Velkovski Date: Fri, 18 Nov 2022 05:48:51 +0000 Subject: [PATCH 6/6] Translated using Weblate (Macedonian) Currently translated at 21.5% (736 of 3418 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/ Signed-off-by: Kristijan Fremen Velkovski --- po/mk.po | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/po/mk.po b/po/mk.po index 8478c24cc4..99e01df4de 100644 --- a/po/mk.po +++ b/po/mk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2022-09-29 00:17-0300\n" -"PO-Revision-Date: 2022-11-18 03:47+0000\n" +"PO-Revision-Date: 2022-11-18 12:59+0000\n" "Last-Translator: Kristijan Fremen Velkovski \n" "Language-Team: Macedonian \n" @@ -1799,10 +1799,8 @@ msgid "" msgstr "" #: libraries/classes/Config/Descriptions.php:139 -#, fuzzy -#| msgid "Enclose table and field names with backquotes" msgid "Autocomplete of the table and column names in the SQL queries." -msgstr "Името на полето стави го во '" +msgstr "Автоматското дополнување на табели и имиња на колони во SQL барања." #: libraries/classes/Config/Descriptions.php:142 #: libraries/classes/Config/Descriptions.php:146 @@ -1874,10 +1872,8 @@ msgid "" msgstr "" #: libraries/classes/Config/Descriptions.php:209 -#, fuzzy -#| msgid "Automatic recovery mode" msgid "Customize browse mode." -msgstr "Режим на автоматско опоравување" +msgstr "Подеси мод на прегледување." #: libraries/classes/Config/Descriptions.php:210 #: libraries/classes/Config/Descriptions.php:211 @@ -1885,56 +1881,48 @@ msgstr "Режим на автоматско опоравување" #: libraries/classes/Config/Descriptions.php:224 #: libraries/classes/Config/Descriptions.php:225 #: libraries/classes/Config/Descriptions.php:230 -#, fuzzy msgid "Customize default options." -msgstr "Опции за извоз на бази на податоци" +msgstr "Подеси стандардни опции." #: libraries/classes/Config/Descriptions.php:212 msgid "Settings for phpMyAdmin developers." msgstr "" #: libraries/classes/Config/Descriptions.php:213 -#, fuzzy msgid "Customize edit mode." -msgstr "Опции за извоз на бази на податоци" +msgstr "Подесувања на модови за уредување." #: libraries/classes/Config/Descriptions.php:214 -#, fuzzy msgid "Customize default export options." -msgstr "Опции за извоз на бази на податоци" +msgstr "Подесување на стандардни опции за извоз." #: libraries/classes/Config/Descriptions.php:215 msgid "Set some commonly used options." msgstr "" #: libraries/classes/Config/Descriptions.php:216 -#, fuzzy msgid "Customize default common import options." -msgstr "Опции за извоз на бази на податоци" +msgstr "Подесување на стандардни опции за увоз." #: libraries/classes/Config/Descriptions.php:217 msgid "Set import and export directories and compression options." msgstr "" #: libraries/classes/Config/Descriptions.php:219 -#, fuzzy msgid "Databases display options." -msgstr "Опции за извоз на бази на податоци" +msgstr "Опции за приказ на бази на податоци." #: libraries/classes/Config/Descriptions.php:220 -#, fuzzy msgid "Customize appearance of the navigation panel." -msgstr "Опции за извоз на бази на податоци" +msgstr "Подесување на изгледот на панелот за навигација." #: libraries/classes/Config/Descriptions.php:221 -#, fuzzy msgid "Customize the navigation tree." -msgstr "Опции за извоз на бази на податоци" +msgstr "Подесување на дрво за навигација." #: libraries/classes/Config/Descriptions.php:222 -#, fuzzy msgid "Servers display options." -msgstr "Опции за извоз на бази на податоци" +msgstr "Опции за приказ на сервери." #: libraries/classes/Config/Descriptions.php:223 #, fuzzy