gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_5_0'

Browse Source
This commit is contained in:
Maurício Meneghini Fauth 2019-07-11 22:44:42 -03:00
commit 845091b8ef
19 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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

2
doc/faq.rst
View File

@ -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 \*/*).

6
doc/glossary.rst
View File

@ -220,6 +220,12 @@ From Wikipedia, the free encyclopedia
.. seealso:: <https://secure.php.net/mcrypt>
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:: <https://en.wikipedia.org/wiki/Media_type>
MIME
Multipurpose Internet Mail Extensions is
an Internet Standard for the format of e-mail.

8
libraries/classes/Config/Descriptions.php
View File

@ -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'),

2
libraries/classes/Plugins/Export/ExportHtmlword.php
View File

@ -412,7 +412,7 @@ class ExportHtmlword extends ExportPlugin
}
if ($do_mime && $cfgRelation['mimework']) {
$schema_insert .= '<td class="print"><strong>'
. htmlspecialchars('MIME')
. __('Media (MIME) type')
. '</strong></td>';
$mime_map = $this->transformations->getMime($db, $table, true);
}

2
libraries/classes/Plugins/Export/ExportLatex.php
View File

@ -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);
}

4
libraries/classes/Plugins/Export/ExportOdt.php
View File

@ -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'] .= '<table:table-cell office:value-type="string">'
. '<text:p>' . __('MIME type') . '</text:p>'
. '<text:p>' . __('Media (MIME) type') . '</text:p>'
. '</table:table-cell>';
$mime_map = $this->transformations->getMime($db, $table, true);
}

4
libraries/classes/Plugins/Export/ExportSql.php
View File

@ -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) {

2
libraries/classes/Plugins/Export/ExportTexytext.php
View File

@ -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";

2
libraries/classes/Plugins/Export/Helpers/Pdf.php
View File

@ -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;

2
templates/columns_definitions/table_fields_definitions.twig
View File

@ -68,7 +68,7 @@
{% if mimework and browse_mime %}
<th>
{% trans 'MIME type' %}
{% trans 'Media (MIME) type' %}
</th>
<th>
<a href="transformation_overview.php

2
templates/database/data_dictionary/index.twig
View File

@ -22,7 +22,7 @@
{% endif %}
<th>{% trans 'Comments' %}</th>
{% if table.has_mime %}
<th>MIME</th>
<th>{% trans 'Media (MIME) type' %}</th>
{% endif %}
</tr>
{% for column in table.columns %}

2
templates/table/structure/display_structure.twig
View File

@ -67,7 +67,7 @@
{{ extracted_columnspec['displayed_type']|raw }}
{% if relation_commwork and relation_mimework and browse_mime
and mime_map[row['Field']]['mimetype'] is defined %}
<br>MIME: {{ mime_map[row['Field']]['mimetype']|replace({'_': '/'})|lower }}
<br>{% trans 'Media (MIME) type:' %} {{ mime_map[row['Field']]['mimetype']|replace({'_': '/'})|lower }}
{% endif %}
</bdo>
</td>

6
templates/transformation_overview.twig
View File

@ -1,4 +1,4 @@
<h2>{% trans 'Available MIME types' %}</h2>
<h2>{% trans 'Available media (MIME) types' %}</h2>
<ul>
{% for mime_type in mime_types %}
@ -16,7 +16,7 @@
<thead>
<tr>
<th>{% trans 'Browser display transformation' %}</th>
<th>{% trans %}Description{% context %}for MIME transformation{% endtrans %}</th>
<th>{% trans %}Description{% context %}for media (MIME) type transformation{% endtrans %}</th>
</tr>
</thead>
<tbody>
@ -35,7 +35,7 @@
<thead>
<tr>
<th>{% trans 'Input transformation' %}</th>
<th>{% trans %}Description{% context %}for MIME transformation{% endtrans %}</th>
<th>{% trans %}Description{% context %}for media (MIME) type transformation{% endtrans %}</th>
</tr>
</thead>
<tbody>

2
test/classes/Controllers/TransformationOverviewControllerTest.php
View File

@ -54,7 +54,7 @@ class TransformationOverviewControllerTest extends TestCase
$actual = $controller->indexAction();
$this->assertStringContainsString(
__('Available MIME types'),
__('Available media (MIME) types'),
$actual
);
$this->assertStringContainsString(

2
test/classes/Plugins/Export/ExportHtmlwordTest.php
View File

@ -565,7 +565,7 @@ class ExportHtmlwordTest extends PmaTestCase
'<td class="print"><strong>Null</strong></td>' .
'<td class="print"><strong>Default</strong></td>' .
'<td class="print"><strong>Comments</strong></td>' .
'<td class="print"><strong>MIME</strong></td></tr>' .
'<td class="print"><strong>Media (MIME) type</strong></td></tr>' .
'1<td class="print"></td><td class="print">Test&lt;</td></tr></table>',
$result
);

2
test/classes/Plugins/Export/ExportLatexTest.php
View File

@ -324,7 +324,7 @@ class ExportLatexTest extends PmaTestCase
);
$this->assertEquals(
'Display MIME types',
'Display media (MIME) types',
$property->getText()
);

4
test/classes/Plugins/Export/ExportOdtTest.php
View File

@ -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(
'<table:table-cell office:value-type="string"><text:p>MIME type' .
'<table:table-cell office:value-type="string"><text:p>Media (MIME) type' .
'</text:p></table:table-cell>',
$GLOBALS['odt_buffer']
);

2
test/classes/Plugins/Export/ExportSqlTest.php
View File

@ -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