Permalink
Browse files

Rename charsets Twig extensions

Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
  • Loading branch information...
laps15 committed Jul 27, 2018
1 parent bfc4dab commit 8333a994b7ce8f9ce2a6da21500c69ec38ed1294
@@ -28,16 +28,16 @@ public function getFunctions()
{
return [
new TwigFunction(
'Charsets_getCollationDescr',
'get_collation_descr',
'PhpMyAdmin\Charsets::getCollationDescr'
),
new TwigFunction(
'Charsets_getCharsetDropdownBox',
'get_charset_dropdown_box',
'PhpMyAdmin\Charsets::getCharsetDropdownBox',
['is_safe' => ['html']]
),
new TwigFunction(
'Charsets_getCollationDropdownBox',
'get_collation_dropdown_box',
'PhpMyAdmin\Charsets::getCollationDropdownBox',
['is_safe' => ['html']]
),
@@ -54,7 +54,7 @@
</td>
<td class="center">
{# column collation #}
{{ Charsets_getCollationDropdownBox(
{{ get_collation_dropdown_box(
dbi,
disable_is,
'field_collation[' ~ column_number ~ ']',
@@ -94,7 +94,7 @@
</td>
<td width="25">&nbsp;</td>
<td>
{{ Charsets_getCollationDropdownBox(
{{ get_collation_dropdown_box(
dbi,
disable_is,
'tbl_collation',
@@ -91,7 +91,7 @@
} only %}
</td>
<td name="collation" class="nowrap">
{{ Charsets_getCollationDropdownBox(
{{ get_collation_dropdown_box(
dbi,
disableIs,
'field_collation[0]',
@@ -338,7 +338,7 @@
</td>
<td name="collation" class="nowrap">
<span>{{ row['col_collation'] | raw }}</span>
{{ Charsets_getCollationDropdownBox(
{{ get_collation_dropdown_box(
dbi,
disableIs,
'field_collation[' ~ row_num ~ ']',
@@ -51,7 +51,7 @@
</th>
<th>
{% if db_collation is not empty %}
<dfn title="{{ Charsets_getCollationDescr(db_collation) }} ({% trans 'Default' %})">
<dfn title="{{ get_collation_descr(db_collation) }} ({% trans 'Default' %})">
{{ db_collation }}
</dfn>
{% endif %}
@@ -108,7 +108,7 @@
{% endfor %}
</select>
{% else %}
{{ Charsets_getCharsetDropdownBox(
{{ get_charset_dropdown_box(
dbi,
disable_is,
'charset_of_file',
@@ -18,7 +18,7 @@
{% for current_collation in mysql_collations[current_charset] %}
<tr class="{{ mysql_dft_collations[current_charset] == current_collation ? ' marked' }}">
<td>{{ current_collation }}</td>
<td>{{ Charsets_getCollationDescr(current_collation) }}</td>
<td>{{ get_collation_descr(current_collation) }}</td>
</tr>
{% endfor %}
{% endfor %}
@@ -11,7 +11,7 @@
{% for stat_name, stat in column_order if stat_name in first_database|keys %}
<th class="value">
{% if stat['description_function'] is defined %}
<dfn title="{{ Charsets_getCollationDescr(stat['footer']) }}">
<dfn title="{{ get_collation_descr(stat['footer']) }}">
{{ values[stat_name] }}
</dfn>
{% else %}
@@ -26,7 +26,7 @@
<input type="text" name="new_db" value="{{ db_to_create }}"
maxlength="64" class="textfield" id="text_create_db" required
placeholder="{% trans 'Database name' %}" />
{{ Charsets_getCollationDropdownBox(
{{ get_collation_dropdown_box(
dbi,
disable_is,
'db_collation',
@@ -17,7 +17,7 @@
{% for stat_name, stat in column_order if stat_name in current|keys %}
<td class="value">
{% if stat['description_function'] is defined %}
<dfn title="{{ Charsets_getCollationDescr(current[stat_name]) }}">
<dfn title="{{ get_collation_descr(current[stat_name]) }}">
{{ values[stat_name] }}
</dfn>
{% else %}
@@ -73,7 +73,7 @@
</td>
<td>
{% if row['Collation'] is not empty %}
<dfn title="{{ Charsets_getCollationDescr(row['Collation']) }}">{{ row['Collation'] }}</dfn>
<dfn title="{{ get_collation_descr(row['Collation']) }}">{{ row['Collation'] }}</dfn>
{% endif %}
</td>
<td class="column_attribute nowrap">{{ attributes[rownum] }}</td>
@@ -100,7 +100,7 @@
<tr>
<th class="name">{% trans 'Collation' %}</th>
<td class="value">
<dfn title="{{ Charsets_getCollationDescr(tbl_collation) }}">
<dfn title="{{ get_collation_descr(tbl_collation) }}">
{{ tbl_collation }}
</dfn>
</td>

0 comments on commit 8333a99

Please sign in to comment.