From 4db8ce8cf01c6ff28ca015cadc2080f066f46180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 24 Jun 2019 15:02:47 -0300 Subject: [PATCH 1/5] Change MIME type references to Media (MIME) type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- doc/faq.rst | 2 +- doc/glossary.rst | 6 ++++++ libraries/classes/Config/Descriptions.php | 8 ++++---- libraries/classes/Plugins/Export/ExportHtmlword.php | 2 +- libraries/classes/Plugins/Export/ExportLatex.php | 2 +- libraries/classes/Plugins/Export/ExportOdt.php | 4 ++-- libraries/classes/Plugins/Export/ExportSql.php | 4 ++-- libraries/classes/Plugins/Export/ExportTexytext.php | 2 +- libraries/classes/Plugins/Export/Helpers/Pdf.php | 2 +- .../columns_definitions/table_fields_definitions.twig | 2 +- templates/database/data_dictionary/index.twig | 2 +- templates/table/structure/display_structure.twig | 2 +- templates/transformation_overview.twig | 6 +++--- .../Controllers/TransformationOverviewControllerTest.php | 2 +- test/classes/Plugins/Export/ExportHtmlwordTest.php | 2 +- test/classes/Plugins/Export/ExportLatexTest.php | 2 +- test/classes/Plugins/Export/ExportOdtTest.php | 4 ++-- test/classes/Plugins/Export/ExportSqlTest.php | 2 +- 18 files changed, 31 insertions(+), 25 deletions(-) diff --git a/doc/faq.rst b/doc/faq.rst index d2995a878f..5263c545d0 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -1623,7 +1623,7 @@ It means "average". any) will be included in backup. * "Enclose table and column names with backquotes" ensures that column and table names formed with special characters are protected. -* "Add into comments" includes column comments, relations, and MIME +* "Add into comments" includes column comments, relations, and media (MIME) types set in the pmadb in the dump as :term:`SQL` comments (*/\* xxx \*/*). diff --git a/doc/glossary.rst b/doc/glossary.rst index cdad7ac01b..220dfeca0a 100644 --- a/doc/glossary.rst +++ b/doc/glossary.rst @@ -220,6 +220,12 @@ From Wikipedia, the free encyclopedia .. seealso:: + Media type + A media type (formerly known as MIME type) is a two-part identifier + for file formats and format contents transmitted on the Internet. + + .. seealso:: + MIME Multipurpose Internet Mail Extensions is an Internet Standard for the format of e-mail. diff --git a/libraries/classes/Config/Descriptions.php b/libraries/classes/Config/Descriptions.php index 3502a85e62..22e7c1f416 100644 --- a/libraries/classes/Config/Descriptions.php +++ b/libraries/classes/Config/Descriptions.php @@ -214,7 +214,7 @@ class Descriptions 'Export_latex_data_caption_name' => __('Table caption'), 'Export_latex_data_continued_caption_name' => __('Continued table caption'), 'Export_latex_data_label_name' => __('Label key'), - 'Export_latex_mime_name' => __('MIME type'), + 'Export_latex_mime_name' => __('Media (MIME) type'), 'Export_latex_null_name' => __('Replace NULL with'), 'Export_latex_relation_name' => __('Relationships'), 'Export_latex_structure_caption_name' => __('Table caption'), @@ -226,7 +226,7 @@ class Descriptions 'Export_ods_null_name' => __('Replace NULL with'), 'Export_odt_columns_name' => __('Put columns names in the first row'), 'Export_odt_comments_name' => __('Comments'), - 'Export_odt_mime_name' => __('MIME type'), + 'Export_odt_mime_name' => __('Media (MIME) type'), 'Export_odt_null_name' => __('Replace NULL with'), 'Export_odt_relation_name' => __('Relationships'), 'Export_odt_structure_or_data_name' => __('Dump table'), @@ -264,7 +264,7 @@ class Descriptions 'Export_sql_include_comments_name' => __('Comments'), 'Export_sql_insert_syntax_name' => __('Syntax to use when inserting data'), 'Export_sql_max_query_size_name' => __('Maximal length of created query'), - 'Export_sql_mime_name' => __('MIME type'), + 'Export_sql_mime_name' => __('Media (MIME) type'), 'Export_sql_procedure_function_name' => sprintf(__('Add %s'), 'CREATE PROCEDURE / FUNCTION / EVENT'), 'Export_sql_relation_name' => __('Relationships'), 'Export_sql_structure_or_data_name' => __('Dump table'), @@ -613,7 +613,7 @@ class Descriptions ), 'Servers_bookmarktable_name' => __('Bookmark table'), 'Servers_column_info_desc' => __( - 'Leave blank for no column comments/mime types, suggested: ' + 'Leave blank for no column comments/media (MIME) types, suggested: ' . '[kbd]pma__column_info[/kbd].' ), 'Servers_column_info_name' => __('Column information table'), diff --git a/libraries/classes/Plugins/Export/ExportHtmlword.php b/libraries/classes/Plugins/Export/ExportHtmlword.php index 7a8c95e35b..cbf4fce65b 100644 --- a/libraries/classes/Plugins/Export/ExportHtmlword.php +++ b/libraries/classes/Plugins/Export/ExportHtmlword.php @@ -412,7 +412,7 @@ class ExportHtmlword extends ExportPlugin } if ($do_mime && $cfgRelation['mimework']) { $schema_insert .= '' - . htmlspecialchars('MIME') + . __('Media (MIME) type') . ''; $mime_map = $this->transformations->getMime($db, $table, true); } diff --git a/libraries/classes/Plugins/Export/ExportLatex.php b/libraries/classes/Plugins/Export/ExportLatex.php index 02d62b2d7b..e2153000e6 100644 --- a/libraries/classes/Plugins/Export/ExportLatex.php +++ b/libraries/classes/Plugins/Export/ExportLatex.php @@ -153,7 +153,7 @@ class ExportLatex extends ExportPlugin if (! empty($GLOBALS['cfgRelation']['mimework'])) { $leaf = new BoolPropertyItem( "mime", - __('Display MIME types') + __('Display media (MIME) types') ); $structureOptions->addProperty($leaf); } diff --git a/libraries/classes/Plugins/Export/ExportOdt.php b/libraries/classes/Plugins/Export/ExportOdt.php index c5a0a52284..151d3c490b 100644 --- a/libraries/classes/Plugins/Export/ExportOdt.php +++ b/libraries/classes/Plugins/Export/ExportOdt.php @@ -113,7 +113,7 @@ class ExportOdt extends ExportPlugin if (! empty($GLOBALS['cfgRelation']['mimework'])) { $leaf = new BoolPropertyItem( "mime", - __('Display MIME types') + __('Display media (MIME) types') ); $structureOptions->addProperty($leaf); } @@ -512,7 +512,7 @@ class ExportOdt extends ExportPlugin } if ($do_mime && $cfgRelation['mimework']) { $GLOBALS['odt_buffer'] .= '' - . '' . __('MIME type') . '' + . '' . __('Media (MIME) type') . '' . ''; $mime_map = $this->transformations->getMime($db, $table, true); } diff --git a/libraries/classes/Plugins/Export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php index d07758f9ec..7a8deacaa1 100644 --- a/libraries/classes/Plugins/Export/ExportSql.php +++ b/libraries/classes/Plugins/Export/ExportSql.php @@ -129,7 +129,7 @@ class ExportSql extends ExportPlugin if (! empty($GLOBALS['cfgRelation']['mimework'])) { $leaf = new BoolPropertyItem( 'mime', - __('Display MIME types') + __('Display media (MIME) types') ); $subgroup->addProperty($leaf); } @@ -1908,7 +1908,7 @@ class ExportSql extends ExportPlugin $schema_create .= $this->_possibleCRLF() . $this->_exportComment() . $this->_exportComment( - __('MIME TYPES FOR TABLE') . ' ' + __('MEDIA (MIME) TYPES FOR TABLE') . ' ' . Util::backquote($table, $sql_backquotes) . ':' ); foreach ($mime_map as $mime_field => $mime) { diff --git a/libraries/classes/Plugins/Export/ExportTexytext.php b/libraries/classes/Plugins/Export/ExportTexytext.php index 9ab6ac06de..012e80cbe4 100644 --- a/libraries/classes/Plugins/Export/ExportTexytext.php +++ b/libraries/classes/Plugins/Export/ExportTexytext.php @@ -392,7 +392,7 @@ class ExportTexytext extends ExportPlugin $comments = $this->relation->getComments($db, $table); } if ($do_mime && $cfgRelation['mimework']) { - $text_output .= '|' . htmlspecialchars('MIME'); + $text_output .= '|' . __('Media (MIME) type'); $mime_map = $this->transformations->getMime($db, $table, true); } $text_output .= "\n|------\n"; diff --git a/libraries/classes/Plugins/Export/Helpers/Pdf.php b/libraries/classes/Plugins/Export/Helpers/Pdf.php index ad5486f9df..58f1b5ad33 100644 --- a/libraries/classes/Plugins/Export/Helpers/Pdf.php +++ b/libraries/classes/Plugins/Export/Helpers/Pdf.php @@ -554,7 +554,7 @@ class Pdf extends PdfLib $columns_cnt++; } if ($do_mime && $cfgRelation['mimework']) { - $this->colTitles[$columns_cnt] = __('MIME'); + $this->colTitles[$columns_cnt] = __('Media (MIME) type'); $this->display_column[$columns_cnt] = true; $this->colAlign[$columns_cnt] = 'L'; $this->tablewidths[$columns_cnt] = 120; diff --git a/templates/columns_definitions/table_fields_definitions.twig b/templates/columns_definitions/table_fields_definitions.twig index 0bddacaece..6f92bcae68 100644 --- a/templates/columns_definitions/table_fields_definitions.twig +++ b/templates/columns_definitions/table_fields_definitions.twig @@ -68,7 +68,7 @@ {% if mimework and browse_mime %} - {% trans 'MIME type' %} + {% trans 'Media (MIME) type' %} Null' . 'Default' . 'Comments' . - 'MIME' . + 'Media (MIME) type' . '1Test<', $result ); diff --git a/test/classes/Plugins/Export/ExportLatexTest.php b/test/classes/Plugins/Export/ExportLatexTest.php index 6579c89af8..946dad4a8a 100644 --- a/test/classes/Plugins/Export/ExportLatexTest.php +++ b/test/classes/Plugins/Export/ExportLatexTest.php @@ -324,7 +324,7 @@ class ExportLatexTest extends PmaTestCase ); $this->assertEquals( - 'Display MIME types', + 'Display media (MIME) types', $property->getText() ); diff --git a/test/classes/Plugins/Export/ExportOdtTest.php b/test/classes/Plugins/Export/ExportOdtTest.php index 13d29dcf31..dbffa3f747 100644 --- a/test/classes/Plugins/Export/ExportOdtTest.php +++ b/test/classes/Plugins/Export/ExportOdtTest.php @@ -230,7 +230,7 @@ class ExportOdtTest extends PmaTestCase ); $this->assertEquals( - 'Display MIME types', + 'Display media (MIME) types', $property->getText() ); @@ -791,7 +791,7 @@ class ExportOdtTest extends PmaTestCase ); $this->assertStringContainsString( - 'MIME type' . + 'Media (MIME) type' . '', $GLOBALS['odt_buffer'] ); diff --git a/test/classes/Plugins/Export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php index cb924e31e4..5f274f1311 100644 --- a/test/classes/Plugins/Export/ExportSqlTest.php +++ b/test/classes/Plugins/Export/ExportSqlTest.php @@ -1284,7 +1284,7 @@ class ExportSqlTest extends PmaTestCase ); $this->assertStringContainsString( - "-- MIME TYPES FOR TABLE :\n" . + "-- MEDIA (MIME) TYPES FOR TABLE :\n" . "-- fieldname\n" . "-- Test<", $result From 846b48678a97631797d888d1c346cffb2df0b135 Mon Sep 17 00:00:00 2001 From: Kongfa Warorot Date: Tue, 9 Jul 2019 08:25:47 +0000 Subject: [PATCH 2/5] Translated using Weblate (Thai) Currently translated at 29.6% (976 of 3301 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/th/ Signed-off-by: Kongfa Warorot --- po/th.po | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/po/th.po b/po/th.po index 25b0f930a3..39091b0330 100644 --- a/po/th.po +++ b/po/th.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.9.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-06-29 15:30-0300\n" -"PO-Revision-Date: 2018-08-17 10:42+0000\n" -"Last-Translator: Anusuk Sangubon \n" -"Language-Team: Thai \n" +"PO-Revision-Date: 2019-07-10 09:00+0000\n" +"Last-Translator: Kongfa Warorot \n" +"Language-Team: Thai " +"\n" "Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 3.2-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!" @@ -334,12 +334,11 @@ msgstr "จำเป็นต้องเลือกแสดงอย่าง #, fuzzy #| msgid "Simulate query" msgid "Multi-table query" -msgstr "จำลองการทำงาน" +msgstr "เรียกใช้หลายตาราง" #: db_qbe.php:149 templates/database/multi_table_query/form.twig:3 -#, fuzzy msgid "Query by example" -msgstr "ชนิดคำค้น" +msgstr "เรียกใช้โดยตัวอย่าง" #: db_qbe.php:168 #, php-format @@ -420,10 +419,8 @@ msgid "Geometry %d:" msgstr "เรขาคณิต %d:" #: gis_data_editor.php:221 -#, fuzzy -#| msgid "Point" msgid "Point:" -msgstr "จุด" +msgstr "จุด:" #: gis_data_editor.php:222 gis_data_editor.php:249 gis_data_editor.php:305 #: gis_data_editor.php:378 js/messages.php:521 From 7cd1ec797a58caabfa925007c3ad36b20215dcf2 Mon Sep 17 00:00:00 2001 From: Stefano Martinelli Date: Mon, 8 Jul 2019 13:22:36 +0000 Subject: [PATCH 3/5] Translated using Weblate (Italian) Currently translated at 100.0% (3301 of 3301 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/it/ Signed-off-by: Stefano Martinelli --- po/it.po | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/po/it.po b/po/it.po index 22639f2d28..2c80322064 100644 --- a/po/it.po +++ b/po/it.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.9.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-06-29 15:30-0300\n" -"PO-Revision-Date: 2019-06-22 09:58+0000\n" -"Last-Translator: Filippo Tessarotto \n" +"PO-Revision-Date: 2019-07-10 09:00+0000\n" +"Last-Translator: Stefano Martinelli \n" "Language-Team: Italian \n" "Language: it\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\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!" @@ -538,16 +538,12 @@ msgid "Output" msgstr "Output" #: gis_data_editor.php:423 -#, fuzzy -#| msgid "" -#| "Choose \"GeomFromText\" from the \"Function\" column and paste the string " -#| "below into the \"Value\" field." msgid "" "Choose \"ST_GeomFromText\" from the \"Function\" column and paste the string " "below into the \"Value\" field." msgstr "" -"Seleziona \"GeomFromText\" nella colonna \"Funzione\" ed incolla la stringa " -"sottostante nel campo \"Valore\"." +"Seleziona \"ST_GeomFromText\" nella colonna \"Funzione\" ed incolla la " +"stringa nel campo \"Valore\"." #: import.php:73 msgid "Succeeded" @@ -5922,7 +5918,7 @@ msgstr "" #: libraries/classes/Config/Descriptions.php:1319 #: libraries/classes/SqlQueryForm.php:356 msgid "Retain query box" -msgstr "Mantieni riquadro query SQL" +msgstr "Conserva il riquadro della query" #: libraries/classes/Config/Descriptions.php:1321 msgid "Allow to display database and table statistics (eg. space usage)." @@ -14143,7 +14139,7 @@ msgstr "nessuno dei precedenti" #: libraries/db_common.inc.php:151 tbl_operations.php:224 msgid "No collation provided." -msgstr "" +msgstr "Nessuna collazione disponibile." #: libraries/mult_submits.inc.php:337 msgid "Success!" From d10456fb0a349bc86d61bafbfc83950f2025e08c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Tue, 9 Jul 2019 21:50:21 -0300 Subject: [PATCH 4/5] Fix Windows test build on Travis MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Choco now installs MariaDb 10.4 Signed-off-by: Maurício Meneghini Fauth (cherry picked from commit 0371f104a9e2ee8b29b4e8b69dc1a7c723e2fa6d) Signed-off-by: Maurício Meneghini Fauth --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index af2573d8ab..ad76696ab8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,7 +128,7 @@ jobs: - YARN_GPG=no before_install: - choco install php composer mariadb - - export PATH=/c/tools/php73:/c/ProgramData/ComposerSetup/bin:/c/"Program Files"/"MariaDB 10.3"/bin:$PATH + - export PATH=/c/tools/php73:/c/ProgramData/ComposerSetup/bin:/c/"Program Files"/"MariaDB 10.4"/bin:$PATH - PHP_EXTENSIONS="mysqli curl bz2 gd2 pdo_mysql" - for php_ext in $PHP_EXTENSIONS ; do sed -i -e "s/^;extension=${php_ext}/extension=${php_ext}/" /c/tools/php73/php.ini ; done - sed -i -e 's/^memory_limit = .*/memory_limit = -1/' /c/tools/php73/php.ini From b77a095e3801e011e658b045a79b6ef34bca5132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Thu, 11 Jul 2019 22:43:09 -0300 Subject: [PATCH 5/5] Add ChangeLog entry for #15350 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 4fb6a3e179..aa7567d2ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ phpMyAdmin - ChangeLog - issue #15072 Add 'Close' button to the Monitor Instructions modal - issue #15174 Improved filter method in server variables page - issue #15266 Add an external dependency injection system +- issue #15350 Change MIME type references to Media (MIME) type 4.9.1 (not yet released) - issue #15313 Added support for Twig 2