From 1d84b2523ece8efd05ff522d5bb4c58ac5db6965 Mon Sep 17 00:00:00 2001 From: Emmanuel Vella Date: Mon, 21 Sep 2020 17:29:05 +0200 Subject: [PATCH] Fix inline table / tabs collection translation domain --- .../Association/edit_one_to_many_inline_table.html.twig | 9 ++++++--- .../Association/edit_one_to_many_inline_tabs.html.twig | 9 +++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/Resources/views/CRUD/Association/edit_one_to_many_inline_table.html.twig b/src/Resources/views/CRUD/Association/edit_one_to_many_inline_table.html.twig index 1d1f00a253..a2b1537526 100644 --- a/src/Resources/views/CRUD/Association/edit_one_to_many_inline_table.html.twig +++ b/src/Resources/views/CRUD/Association/edit_one_to_many_inline_table.html.twig @@ -23,9 +23,12 @@ file that was distributed with this source code. style="display:none;" {% endif %} > - {{ nested_field.vars.label|trans({}, nested_field.vars['sonata_admin'].admin.translationDomain - |default(nested_field.vars.translation_domain) - ) }} + {% if nested_field.vars.translation_domain is same as(false) %} + {{ nested_field.vars.label }} + {% else %} + {% set translationDomain = nested_field.vars.translation_domain|default(nested_field.vars['sonata_admin'].admin.translationDomain) %} + {{ nested_field.vars.label|trans({}, translationDomain) }} + {% endif %} {% endif %} {% endfor %} diff --git a/src/Resources/views/CRUD/Association/edit_one_to_many_inline_tabs.html.twig b/src/Resources/views/CRUD/Association/edit_one_to_many_inline_tabs.html.twig index b4145b1ce3..dc85aea9a1 100644 --- a/src/Resources/views/CRUD/Association/edit_one_to_many_inline_tabs.html.twig +++ b/src/Resources/views/CRUD/Association/edit_one_to_many_inline_tabs.html.twig @@ -13,14 +13,19 @@ file that was distributed with this source code.