Implements "format" option to show type "trans" as it is already in t…

…he list type "trans" (#5578)
sonata-project · Jul 8, 2019 · bf2224d · bf2224d
1 parent c72a17a
commit bf2224d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/docs/reference/field_types.rst b/docs/reference/field_types.rst
@@ -15,7 +15,7 @@ date            display a formatted date. Accepts an optional ``format`` paramet
 datetime        display a formatted date and time. Accepts an optional ``format`` and ``timezone`` parameter
 text            display a text
 textarea        display a textarea
-trans           translate the value with a provided ``catalogue`` option
+trans           translate the value with a provided ``catalogue`` (translation domain) and ``format`` (sprintf format) option
 string          display a text
 number          display a number
 currency        display a number with a provided ``currency`` option

diff --git a/src/Resources/views/CRUD/list_trans.html.twig b/src/Resources/views/CRUD/list_trans.html.twig
@@ -12,8 +12,8 @@ file that was distributed with this source code.
 {% extends get_admin_template('base_list_field', admin.code) %}
 
 {% block field%}
-    {% set translationDomain = field_description.options.catalogue|default(admin.translationDomain) %}
-    {% set valueFormat = field_description.options.format|default('%s') %}
+    {% set translation_domain = field_description.options.catalogue|default(admin.translationDomain) %}
+    {% set value_format = field_description.options.format|default('%s') %}
 
-    {{valueFormat|format(value)|trans({}, translationDomain)}}
+    {{ value_format|format(value)|trans({}, translation_domain) }}
 {% endblock %}
diff --git a/src/Resources/views/CRUD/show_trans.html.twig b/src/Resources/views/CRUD/show_trans.html.twig
@@ -11,10 +11,12 @@ file that was distributed with this source code.
 {% extends '@SonataAdmin/CRUD/base_show_field.html.twig' %}
 
 {% block field%}
+    {% set value_format = field_description.options.format|default('%s') %}
+
     {% if field_description.options.catalogue is not defined %}
-        {% set value = value|trans %}
+        {% set value = value_format|format(value)|trans %}
     {% else %}
-        {% set value = value|trans({}, field_description.options.catalogue) %}
+        {% set value = value_format|format(value)|trans({}, field_description.options.catalogue|default(admin.translationDomain)) %}
     {% endif %}
 
     {% if field_description.options.safe %}

diff --git a/tests/Twig/Extension/SonataAdminExtensionTest.php b/tests/Twig/Extension/SonataAdminExtensionTest.php
@@ -1581,6 +1581,12 @@ public function getRenderViewElementTests()
                 'action_delete',
                 ['safe' => false, 'catalogue' => 'SonataAdminBundle'],
             ],
+            [
+                '<th>Data</th> <td> Delete </td>',
+                'trans',
+                'delete',
+                ['safe' => false, 'catalogue' => 'SonataAdminBundle', 'format' => 'action_%s'],
+            ],
             ['<th>Data</th> <td>Status1</td>', 'choice', 'Status1', ['safe' => false]],
             [
                 '<th>Data</th> <td>Alias1</td>',