Data macros: support translation IDs in data keys.

DarvinStudio · Feb 16, 2021 · 00c750e · 00c750e
1 parent 4ff91d8
commit 00c750e
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Resources/views/macros.html.twig b/Resources/views/macros.html.twig
@@ -53,7 +53,7 @@
             {% if name %}
                 <span class="details-list__property-name"
                       style="font-family: Arial, sans-serif; font-size: 15px; line-height: 23px; color: #7e7e7e;">
-                    {% if value is iterable %}
+                    {% if value is iterable and '.' not in title %}
                         {{ (title ~ '.title')|trans }}
                     {% else %}
                         {{ title|trans }}
@@ -75,7 +75,7 @@
                     {% else %}
                         <ul>
                             {% for item_name, item_value in value %}
-                                <li>{{ that.div_property(item_name, title ~ '.item.' ~ item_name, item_value, trans_domain) }}</li>
+                                <li>{{ that.div_property(item_name, '.' in item_name ? item_name : (title ~ '.item.' ~ item_name), item_value, trans_domain) }}</li>
                             {% endfor %}
                         </ul>
                     {% endif %}
@@ -118,7 +118,7 @@
 
         {%- if name -%}
 
-            {%- if value is iterable -%}
+            {%- if value is iterable and '.' not in title -%}
                 {{- (title ~ '.title')|trans -}}
             {%- else -%}
                 {{- title|trans -}}
@@ -148,7 +148,7 @@
 
                 {%- for item_name, item_value in value -%}
 
-                    {{- that.plain_property(item_name, title ~ '.item.' ~ item_name, item_value, trans_domain) -}}
+                    {{- that.plain_property(item_name, '.' in item_name ? item_name : (title ~ '.item.' ~ item_name), item_value, trans_domain) -}}
 
                     {%- if not loop.last -%}
                         {{- ', ' -}}
@@ -182,7 +182,7 @@
         <tr>
             {% if name %}
                 <th>
-                    {% if value is iterable %}
+                    {% if value is iterable and '.' not in title %}
                         {{ (title ~ '.title')|trans }}
                     {% else %}
                         {{ title|trans }}
@@ -201,7 +201,7 @@
                             {% endfor %}
                         {% else %}
                             {% for item_name, item_value in value %}
-                                {{ that.table_property(item_name, title ~ '.item.' ~ item_name, item_value, trans_domain) }}
+                                {{ that.table_property(item_name, '.' in item_name ? item_name : (title ~ '.item.' ~ item_name), item_value, trans_domain) }}
                             {% endfor %}
                         {% endif %}
                     </table>