diff --git a/ChangeLog b/ChangeLog
index 0a2c5841c4..f4147aa8d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
======================
5.1.0 (not yet released)
+- issue #15350 Change Media (MIME) type references to Media type
5.0.0 (not yet released)
- issue #13896 Drop support for PHP 5.5, PHP 5.6, PHP 7.0 and HHVM
diff --git a/doc/faq.rst b/doc/faq.rst
index 7c4af57428..4fc5ece372 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 media (MIME)
+* "Add into comments" includes column comments, relations, and media
types set in the pmadb in the dump as :term:`SQL` comments
(*/\* xxx \*/*).
diff --git a/libraries/classes/Config/Descriptions.php b/libraries/classes/Config/Descriptions.php
index 22e7c1f416..52b6e198a3 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' => __('Media (MIME) type'),
+ 'Export_latex_mime_name' => __('Media 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' => __('Media (MIME) type'),
+ 'Export_odt_mime_name' => __('Media 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' => __('Media (MIME) type'),
+ 'Export_sql_mime_name' => __('Media 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/media (MIME) types, suggested: '
+ 'Leave blank for no column comments/media 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 cbf4fce65b..329c8b596a 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 .= '
'
- . __('Media (MIME) type')
+ . __('Media 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 e2153000e6..0c47b8ec35 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 media (MIME) types')
+ __('Display media types')
);
$structureOptions->addProperty($leaf);
}
diff --git a/libraries/classes/Plugins/Export/ExportOdt.php b/libraries/classes/Plugins/Export/ExportOdt.php
index 151d3c490b..0e9209ffbc 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 media (MIME) types')
+ __('Display media types')
);
$structureOptions->addProperty($leaf);
}
@@ -512,7 +512,7 @@ class ExportOdt extends ExportPlugin
}
if ($do_mime && $cfgRelation['mimework']) {
$GLOBALS['odt_buffer'] .= ''
- . '' . __('Media (MIME) type') . ''
+ . '' . __('Media 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 9c5b1a2543..bceafdc476 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 media (MIME) types')
+ __('Display media types')
);
$subgroup->addProperty($leaf);
}
@@ -1908,7 +1908,7 @@ class ExportSql extends ExportPlugin
$schema_create .= $this->_possibleCRLF()
. $this->_exportComment()
. $this->_exportComment(
- __('MEDIA (MIME) TYPES FOR TABLE') . ' '
+ __('MEDIA 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 012e80cbe4..f0ba58ca1f 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 .= '|' . __('Media (MIME) type');
+ $text_output .= '|' . __('Media 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 58f1b5ad33..d553ec3f26 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] = __('Media (MIME) type');
+ $this->colTitles[$columns_cnt] = __('Media 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 f23b2fe6fb..5bfe9eec7b 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 'Media (MIME) type' %}
+ {% trans 'Media type' %}
|
Null' .
' | Default | ' .
'Comments | ' .
- 'Media (MIME) type | ' .
+ 'Media type | ' .
'1 | Test< | ',
$result
);
diff --git a/test/classes/Plugins/Export/ExportLatexTest.php b/test/classes/Plugins/Export/ExportLatexTest.php
index 946dad4a8a..5327a32d30 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 media (MIME) types',
+ 'Display media types',
$property->getText()
);
diff --git a/test/classes/Plugins/Export/ExportOdtTest.php b/test/classes/Plugins/Export/ExportOdtTest.php
index dbffa3f747..1d136fb5e7 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 media (MIME) types',
+ 'Display media types',
$property->getText()
);
@@ -791,7 +791,7 @@ class ExportOdtTest extends PmaTestCase
);
$this->assertStringContainsString(
- 'Media (MIME) type' .
+ 'Media type' .
'',
$GLOBALS['odt_buffer']
);
diff --git a/test/classes/Plugins/Export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php
index 5f274f1311..460c1fa635 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(
- "-- MEDIA (MIME) TYPES FOR TABLE :\n" .
+ "-- MEDIA TYPES FOR TABLE :\n" .
"-- fieldname\n" .
"-- Test<",
$result