From 741f230051b2b8c4a4a2deaaa7cf3d9b73046eb4 Mon Sep 17 00:00:00 2001 From: yagoub fadel Date: Mon, 2 Mar 2020 07:38:37 +0000 Subject: [PATCH 1/7] Translated using Weblate (Arabic) Currently translated at 47.5% (1583 of 3332 strings) [CI skip] Translation: phpMyAdmin/5.0 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/ar/ Signed-off-by: yagoub fadel --- po/ar.po | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/po/ar.po b/po/ar.po index c7083a5bde..118ce528c9 100644 --- a/po/ar.po +++ b/po/ar.po @@ -4,17 +4,17 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.0.0-rc1\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-12-23 15:37-0300\n" -"PO-Revision-Date: 2018-04-16 18:34+0000\n" -"Last-Translator: Yaron Shahrabani \n" -"Language-Team: Arabic \n" +"PO-Revision-Date: 2020-03-03 08:32+0000\n" +"Last-Translator: yagoub fadel \n" +"Language-Team: Arabic \n" "Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: Weblate 3.0-dev\n" +"X-Generator: Weblate 4.0-dev\n" #: ajax.php:35 ajax.php:73 export.php:214 libraries/classes/Export.php:1219 msgid "Bad type!" @@ -119,16 +119,12 @@ msgid "You have to choose at least one column to display!" msgstr "عليك اختيار عمود واحد على الأقل للعرض!" #: db_qbe.php:159 templates/database/multi_table_query/form.twig:3 -#, fuzzy -#| msgid "Simulate query" msgid "Multi-table query" -msgstr "محاكاة الإستعلام" +msgstr "استعلام جداول متعددة" #: db_qbe.php:163 templates/database/multi_table_query/form.twig:3 -#, fuzzy -#| msgid "Query type" msgid "Query by example" -msgstr "نوع الاستعلام" +msgstr "مثال للاستعلام" #: db_qbe.php:182 #, php-format @@ -359,6 +355,8 @@ msgid "" "You are trying to reduce the number of rows, but have already entered data " "in those rows which will be lost. Do you wish to continue?" msgstr "" +"انت تحاول تخفيض عدد الصفوف , لكن هذه الصفوف تحتوي علي بيانات مدرجة فيها " +"وبتخفيض الصفوف ستواجة باحتمال خسارة هذه البيانات . هل تريد المتابعه ؟" #: js/messages.php:78 msgid "Do you really want to revoke the selected user(s) ?" @@ -514,10 +512,8 @@ msgid "Y values" msgstr "كل قيم Y" #: js/messages.php:146 -#, fuzzy -#| msgid "Please enter the same value again" msgid "Please enter the SQL query first." -msgstr "من فظلك ادخل نفس القيمة مرة أخرى" +msgstr "من فظلك ادخل استعلام SQL اولا." #: js/messages.php:149 msgid "The host name is empty!" @@ -1082,16 +1078,12 @@ msgid "Please select the file you want to import." msgstr "الرجاء تحديد الملف الذي تريد استيراده ." #: js/messages.php:339 -#, fuzzy -#| msgid "Please enter a valid page name" msgid "Please enter a valid table name." -msgstr "الرجاء إدخال اسم صفحة صالح" +msgstr "الرجاء إدخال اسم جدول صالح." #: js/messages.php:341 -#, fuzzy -#| msgid "Please enter a valid page name" msgid "Please enter a valid database name." -msgstr "الرجاء إدخال اسم صفحة صالح" +msgstr "الرجاء إدخال اسم قاعدة بيانات صالح ." #: js/messages.php:342 msgid "No files available on server for import!" @@ -1253,10 +1245,8 @@ msgid "No databases selected." msgstr "لا قواعد بيانات محددة." #: js/messages.php:382 -#, fuzzy -#| msgid "No column selected." msgid "No accounts selected." -msgstr "لايوجد صفوف مختارة" +msgstr "لم يتم اختيار حسابات." #: js/messages.php:383 msgid "Dropping column" From ba512491c1af65ebd468f29d68656b067c530b23 Mon Sep 17 00:00:00 2001 From: yagoub fadel Date: Tue, 3 Mar 2020 22:47:05 +0000 Subject: [PATCH 2/7] Translated using Weblate (Arabic) Currently translated at 48.0% (1601 of 3332 strings) [CI skip] Translation: phpMyAdmin/5.0 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/ar/ Signed-off-by: yagoub fadel --- po/ar.po | 100 ++++++++++++++++++------------------------------------- 1 file changed, 33 insertions(+), 67 deletions(-) diff --git a/po/ar.po b/po/ar.po index 118ce528c9..9761826d29 100644 --- a/po/ar.po +++ b/po/ar.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.0.0-rc1\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-12-23 15:37-0300\n" -"PO-Revision-Date: 2020-03-03 08:32+0000\n" +"PO-Revision-Date: 2020-03-05 05:32+0000\n" "Last-Translator: yagoub fadel \n" "Language-Team: Arabic \n" @@ -236,12 +236,12 @@ msgstr "تم إنشاء العلامة المرجعية %s." #, php-format msgid "Import has been successfully finished, %d query executed." msgid_plural "Import has been successfully finished, %d queries executed." -msgstr[0] "انتهى الإستيراد بنجاح، %d استعلام تم تنفيذه." +msgstr[0] "انتهى الإستيراد بنجاح، %d استعلام تم تنفيذه ." msgstr[1] "انتهى الإستيراد بنجاح، %d استعلام تم تنفيذه." -msgstr[2] "انتهى الإستيراد بنجاح، %d استعلام تم تنفيذه." -msgstr[3] "انتهى الإستيراد بنجاح، %d استعلام تم تنفيذه." -msgstr[4] "انتهى الإستيراد بنجاح، %d استعلام تم تنفيذه." -msgstr[5] "انتهى الإستيراد بنجاح، %d استعلام تم تنفيذه." +msgstr[2] "انتهى الإستيراد بنجاح، %d الاستعلامان تم تنفيذهم ." +msgstr[3] "انتهى الإستيراد بنجاح، %d الاستعلامات تم تنفيذها ." +msgstr[4] "انتهى الإستيراد بنجاح، %d تم تنفيذ الاستعلامات." +msgstr[5] "انتهى الإستيراد بنجاح، %d تم تنفيذ الاستعلامات ." #: import.php:646 #, php-format @@ -513,7 +513,7 @@ msgstr "كل قيم Y" #: js/messages.php:146 msgid "Please enter the SQL query first." -msgstr "من فظلك ادخل استعلام SQL اولا." +msgstr "من فضلك ادخل استعلام SQL اولا ." #: js/messages.php:149 msgid "The host name is empty!" @@ -1079,11 +1079,11 @@ msgstr "الرجاء تحديد الملف الذي تريد استيراده #: js/messages.php:339 msgid "Please enter a valid table name." -msgstr "الرجاء إدخال اسم جدول صالح." +msgstr "الرجاء إدخال اسم جدول صالح ." #: js/messages.php:341 msgid "Please enter a valid database name." -msgstr "الرجاء إدخال اسم قاعدة بيانات صالح ." +msgstr "الرجاء إدخال اسم جيد لقاعد البيانات." #: js/messages.php:342 msgid "No files available on server for import!" @@ -1246,7 +1246,7 @@ msgstr "لا قواعد بيانات محددة." #: js/messages.php:382 msgid "No accounts selected." -msgstr "لم يتم اختيار حسابات." +msgstr "لم يتم اختيار حسابات ." #: js/messages.php:383 msgid "Dropping column" @@ -1491,15 +1491,11 @@ msgid "Are you sure?" msgstr "هل أنت متأكد؟" #: js/messages.php:449 -#, fuzzy -#| msgid "" -#| "This action may change some of the columns definition.
Are you sure " -#| "you want to continue?" msgid "" "This action may change some of the columns definition.
Are you sure you " "want to continue?" msgstr "" -"هذا الإجراء قي يغيير بعض معرفات الأعمدة .
هل انت متاكد انك تريد " +"هذا الإجراء قد يغيير بعض معرفات الأعمدة .
هل انت متاكد انك تريد " "المتابعة؟" #: js/messages.php:452 @@ -1855,10 +1851,8 @@ msgstr "" #: js/messages.php:574 templates/database/designer/main.twig:42 #: templates/database/designer/main.twig:45 -#, fuzzy -#| msgid "No tables found in database." msgid "Add tables from other databases" -msgstr "لم يعثر على جداول في قاعدة البيانات." +msgstr "اضافة جداول من قواعد بيانات اخري" #: js/messages.php:575 msgid "Page name" @@ -1917,8 +1911,6 @@ msgid "%d object(s) created." msgstr "%d تم انشاء كائن / كائنات." #: js/messages.php:591 -#, fuzzy -#| msgid "Column names" msgid "Column name" msgstr "اسم العمود" @@ -1966,10 +1958,8 @@ msgid "Double-click to copy column name." msgstr "أنقر مرتين لنسخ اسم العمود ." #: js/messages.php:610 -#, fuzzy -#| msgid "Click the drop-down arrow
to toggle column's visibility." msgid "Click the drop-down arrow
to toggle column's visibility." -msgstr "انقر على السهم المنسدل
0 لتبديل مستوى رؤية العمود." +msgstr "انقر على السهم المنسدل
0 لتبديل مستوى رؤية العمود ." #: js/messages.php:612 libraries/classes/BrowseForeigners.php:355 #: templates/table/browse_foreigners/show_all.twig:4 @@ -2035,11 +2025,8 @@ msgid "Print" msgstr "طباعة" #: js/messages.php:642 -#, fuzzy -#| msgid "" -#| "You can also edit most values
by double-clicking directly on them." msgid "You can also edit most values
by double-clicking directly on them." -msgstr "يمكنك أيضا تعديل معظم القيم
بالنقر المزدوج عليها مباشرة." +msgstr "يمكنك أيضا تعديل معظم القيم
بالنقر المزدوج عليها مباشرة." #: js/messages.php:647 #, fuzzy @@ -2183,16 +2170,12 @@ msgid "" msgstr "وفقا للإعدادات الخاصة بك، يتم تقديمها حاليا، يرجى التحلي بالصبر." #: js/messages.php:732 -#, fuzzy -#| msgid "Successfully deleted the page" msgid "Successfully copied!" -msgstr "تم حذف الصفحة بنجاح" +msgstr "تم النقل بنجاح !" #: js/messages.php:733 -#, fuzzy -#| msgid "Copying database" msgid "Copying failed!" -msgstr "نسخ قاعدة البيانات" +msgstr "النقل فاشل !" #: js/messages.php:736 msgid "Execute this query again?" @@ -2280,20 +2263,19 @@ msgstr "قوي" #: js/messages.php:762 msgid "Timed out waiting for security key activation." -msgstr "" +msgstr "انتهت مهلة انتظار تفعيل مفتاح الأمان ." #: js/messages.php:763 #, php-format msgid "Failed security key activation (%s)." -msgstr "" +msgstr "فشل تنشيط مفتاح الأمان (%s) ." #: js/messages.php:766 -#, fuzzy, php-format -#| msgid "The user %s already exists!" +#, php-format msgctxt "" "The table already exists in the designer and can not be added once more." msgid "Table %s already exists!" -msgstr "اسم المستخدم %s موجود مسبقاً!" +msgstr "الجدول %s موجود مسبقاً !" #: js/messages.php:767 libraries/classes/InsertEdit.php:304 #: libraries/classes/Navigation/Nodes/NodeDatabaseChild.php:56 @@ -3148,8 +3130,6 @@ msgid "Vietnamese" msgstr "الفيتنامية" #: libraries/classes/Charsets/Collation.php:512 -#, fuzzy -#| msgid "case-insensitive" msgctxt "Collation variant" msgid "case-insensitive" msgstr "غير حساس لحالة الأحرف" @@ -3169,11 +3149,9 @@ msgid "accent-insensitive" msgstr "غير حساس لحالة الأحرف" #: libraries/classes/Charsets/Collation.php:521 -#, fuzzy -#| msgid "case-sensitive" msgctxt "Collation variant" msgid "accent-sensitive" -msgstr "حساس لحالة الأحرف" +msgstr "لهجة حساسة لحالة الأحرف" #: libraries/classes/Charsets/Collation.php:524 #, fuzzy @@ -3337,10 +3315,8 @@ msgid "" msgstr "" #: libraries/classes/Config/Descriptions.php:114 -#, fuzzy -#| msgid "Enable %s" msgid "Enable linter" -msgstr "تفعيل %s" +msgstr "تفعيل linter" #: libraries/classes/Config/Descriptions.php:116 msgid "" @@ -3363,10 +3339,8 @@ msgid "Maximum size for input field" msgstr "أقصى حجم لحقل الإدخال" #: libraries/classes/Config/Descriptions.php:125 -#, fuzzy -#| msgid "Number of columns for CHAR/VARCHAR textareas" msgid "Number of columns for CHAR/VARCHAR textareas." -msgstr "عدد أعمدة مربع النص لـCHAR/VARCHAR" +msgstr "عدد أعمدة مربع النص CHAR/VARCHAR مناطق النص" #: libraries/classes/Config/Descriptions.php:126 msgid "CHAR textarea columns" @@ -3437,20 +3411,16 @@ msgid "Default server tab" msgstr "تبويب الخادم الإفتراضي" #: libraries/classes/Config/Descriptions.php:146 -#, fuzzy -#| msgid "Tab that is displayed when entering a table" msgid "Tab that is displayed when entering a table." -msgstr "التبويب الذي يعرض عند الدخول إلى الجدول" +msgstr "التبويب الذي يعرض عند الدخول إلى الجدول ." #: libraries/classes/Config/Descriptions.php:147 msgid "Default table tab" msgstr "تبويب الجدول الإفتراضي" #: libraries/classes/Config/Descriptions.php:148 -#, fuzzy -#| msgid "Enclose table and column names with backquotes" msgid "Autocomplete of the table and column names in the SQL queries." -msgstr "محاصرة أسماء الجداول و العواميد ب \"`\"" +msgstr "اكمال تلقائي للجدول و اسماء اللاعمدة في استعلامات SQL ." #: libraries/classes/Config/Descriptions.php:149 msgid "Enable autocomplete for table and column names" @@ -3473,10 +3443,8 @@ msgid "Hide table structure actions" msgstr "إخفاء إجراءات بنية الجدول" #: libraries/classes/Config/Descriptions.php:154 -#, fuzzy -#| msgid "Default sorting order" msgid "Default transformations for Hex" -msgstr "الترتيب الإفتراضي" +msgstr "تحولات افتراضية من Hex" #: libraries/classes/Config/Descriptions.php:155 #: libraries/classes/Config/Descriptions.php:157 @@ -3493,10 +3461,8 @@ msgid "" msgstr "" #: libraries/classes/Config/Descriptions.php:156 -#, fuzzy -#| msgid "Transformation options" msgid "Default transformations for Substring" -msgstr "خيارات التحويل" +msgstr "التحولات الافتراضية من السلاسل الفرعية" #: libraries/classes/Config/Descriptions.php:158 #, fuzzy @@ -16491,12 +16457,12 @@ msgstr "" #, php-format msgid "%s table" msgid_plural "%s tables" -msgstr[0] "%s جدول (جداول)" -msgstr[1] "%s جدول (جداول)" -msgstr[2] "%s جدول (جداول)" -msgstr[3] "%s جدول (جداول)" -msgstr[4] "%s جدول (جداول)" -msgstr[5] "%s جدول (جداول)" +msgstr[0] "%s جدول" +msgstr[1] "%s جدول" +msgstr[2] "%s جدول" +msgstr[3] "%s جداول" +msgstr[4] "%s جداول" +msgstr[5] "%s جدول" #: templates/database/structure/body_for_table_summary.twig:17 msgid "Sum" From 9977c8c7ea0221d781f8b373676f1776e33d4cbe Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 5 Mar 2020 20:01:08 +0100 Subject: [PATCH 3/7] Update ChangeLog entry for #16009 Signed-off-by: William Desportes --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 102c27a80f..bb4cae1003 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog - issue Fixed deprecation warning "implode(): Passing glue string after array is deprecated." function on export page - issue #15767 Fixed can not copy user account since 5.0 - "error #1133" - issue #15772 Fixed error code 500 during pagination of the tables in a database -- issue Fix php error "Trying to access array offset on value of type null" on column distinct values feature +- issue #16009 Fix php error "Trying to access array offset on value of type null" on column distinct values feature - issue #15741 Fix fatal javascript error on clicking "Pick from Central Columns" - issue #15773 Fixed a view named "views" adds an expand button - issue #15432 Fixed names of the pages in the designer should be unique From 3b3fbaefdbc2163f81116296ab30ace9abe8bda6 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 5 Mar 2020 21:11:34 +0100 Subject: [PATCH 4/7] Remove json logging removed in phpunit 6.0 (version that we no longer support) Ref: https://github.com/sebastianbergmann/phpunit/blob/6.0.0/ChangeLog-6.0.md#removed "Removed the --log-json commandline option (deprecated in PHPUnit 5.7)" This commit is done for phpunit 9.0 to not complain about it Signed-off-by: William Desportes --- phpunit.xml.dist | 1 - 1 file changed, 1 deletion(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index dd127cd7b7..3a39ef4452 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -22,7 +22,6 @@ - From 40945551f0d1bf7eb581a4bc5abfe0eeac61b45e Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 5 Mar 2020 21:13:00 +0100 Subject: [PATCH 5/7] Support phpunit 9.0 Signed-off-by: William Desportes --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2307496a2a..bfe696862b 100644 --- a/composer.json +++ b/composer.json @@ -85,7 +85,7 @@ "php-webdriver/webdriver": "^1.7.1", "phpmyadmin/coding-standard": "^1.0", "phpstan/phpstan": "^0.11.5", - "phpunit/phpunit": "^7.5 || ^8.0", + "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0", "pragmarx/google2fa-qrcode": "^1.0.1", "samyoul/u2f-php-server": "^1.1", "squizlabs/php_codesniffer": "^3.0", From 0f0b10cba6371cf8d915269500fbd18a0d71a998 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 5 Mar 2020 21:14:59 +0100 Subject: [PATCH 6/7] Add ChangeLog entry for 40945551f0 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index bb4cae1003..f3c9f91d9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ phpMyAdmin - ChangeLog - issue #15282 Fixed MySQL 8.0 password syntax error when creating a replication user - issue #15986 Fixed php fatal error "Uncaught TypeError: array_flip() expects parameter 1 to be array, null given" - issue Fixed php fatal error "Uncaught TypeError: htmlspecialchars() expects parameter 1 to be string, int given" +- issue Support phpunit 9.0 5.0.1 (2020-01-07) - issue #15719 Fixed error 500 when browsing a table when $cfg['LimitChars'] used a string and not an int value From ce85e5ee1308c7a88a44ddd2483b6b2e4beaa7b3 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 5 Mar 2020 21:16:14 +0100 Subject: [PATCH 7/7] Remove json logging for nocoverage phpunit xml file and remove useless file Ref: 3b3fbaefdbc2163f81116296ab30ace9abe8bda6 Signed-off-by: William Desportes --- .travis.yml | 1 - phpunit.xml.nocoverage | 1 - scripts/phpunit-top-tests | 26 -------------------------- 3 files changed, 28 deletions(-) delete mode 100755 scripts/phpunit-top-tests diff --git a/.travis.yml b/.travis.yml index c674fe96cb..5b47b4ea15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,6 @@ after_script: - if [ -f vendor/bin/codacycoverage ] ; then php vendor/bin/codacycoverage clover || true ; fi - if [ -f php.log ] ; then cat php.log ; fi - if [ -f nginx-error.log ] ; then cat nginx-error.log ; fi - - if [ -f build/logs/phpunit.json ] ; then ./scripts/phpunit-top-tests build/logs/phpunit.json ; fi - if [ -f config.inc.php ] ; then rm -rf config.inc.php; fi - if [ "$CI_MODE" = "selenium" ] ; then ~/browserstack/BrowserStackLocal --daemon stop; fi diff --git a/phpunit.xml.nocoverage b/phpunit.xml.nocoverage index 18313e032e..c1ede1ea88 100644 --- a/phpunit.xml.nocoverage +++ b/phpunit.xml.nocoverage @@ -21,6 +21,5 @@ - diff --git a/scripts/phpunit-top-tests b/scripts/phpunit-top-tests deleted file mode 100755 index 975fc11c6c..0000000000 --- a/scripts/phpunit-top-tests +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -""" -Prints 10 longest lasting tests from JSON PHPUnit log -""" - -from __future__ import print_function - -import json -import sys - -def main(filename): - with open(filename) as handle: - content = handle.read() - data = json.loads( - '[' + content.replace('}{', '},{') + ']' - ) - printed = ['test', 'status', 'time'] - tests = [item for item in data if item['event'] == 'test'] - for test in sorted(tests, key=lambda item: -item['time'])[:10]: - for item in printed: - print('{0:10s}: {1}'.format(item, test[item])) - print() - - -if __name__ == '__main__': - main(*sys.argv[1:])