Skip to content

Fix inline table collection translation domain #6401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VincentLanglet merged 1 commit into from
Sep 27, 2020
+13 −5
Merged

Fix inline table collection translation domain #6401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/Resources/views/CRUD/Association/edit_one_to_many_inline_table.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) %}
Copy link
Copy Markdown
Member

@phansys phansys Sep 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At first sight, there is no other variable using camel case in this file, excepting this property:

sonata_admin.field_description.associationadmin.formfielddescriptions[field_name].translationDomain

{{ nested_field.vars.label|trans({}, translationDomain) }}
{% endif %}
</th>
{% endif %}
{% endfor %}
Expand Down
9 changes: 7 additions & 2 deletions src/Resources/views/CRUD/Association/edit_one_to_many_inline_tabs.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,19 @@ file that was distributed with this source code.
<div>
<div class="nav-tabs-custom">
<ul class="nav nav-tabs">
{% for name, form_group in associationAdmin.formgroups %}
{% for form_group in associationAdmin.formgroups %}
<li class="{% if loop.first %}active{% endif %}">
<a
href="#{{ id }}_{{ loop.parent.loop.index }}_{{ loop.index }}"
data-toggle="tab"
>
<i class="icon-exclamation-sign has-errors hide"></i>
{{ form_group.label|trans({}, form_group.translation_domain|default(associationAdmin.translationDomain)) }}
{% if form_group.translation_domain is same as(false) %}
{{ form_group.label }}
{% else %}
{% set translationDomain = form_group.translation_domain|default(associationAdmin.translationDomain) %}
{{ form_group.label|trans({}, translationDomain) }}
{% endif %}
</a>
</li>
{% endfor %}
Expand Down