diff --git a/ChangeLog b/ChangeLog index 3448a75259..0a2c5841c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,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 diff --git a/doc/faq.rst b/doc/faq.rst index 36b12a22b0..7c4af57428 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 f00e61f03d..9c5b1a2543 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 1068a3cf3e..f23b2fe6fb 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