-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
Fix inline table collection translation domain #6401
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
src/Resources/views/CRUD/Association/edit_one_to_many_inline_table.html.twig
Outdated
Show resolved
Hide resolved
EmmanuelVella
force-pushed
the
patch-26
branch
from
September 22, 2020 09:52
041449f
to
f87c143
Compare
VincentLanglet
previously approved these changes
Sep 22, 2020
jordisala1991
previously approved these changes
Sep 22, 2020
EmmanuelVella
dismissed stale reviews from jordisala1991 and VincentLanglet
via
September 22, 2020 10:03
65466bb
EmmanuelVella
force-pushed
the
patch-26
branch
from
September 22, 2020 10:03
f87c143
to
65466bb
Compare
VincentLanglet
previously approved these changes
Sep 22, 2020
phansys
requested changes
Sep 22, 2020
src/Resources/views/CRUD/Association/edit_one_to_many_inline_table.html.twig
Outdated
Show resolved
Hide resolved
src/Resources/views/CRUD/Association/edit_one_to_many_inline_tabs.html.twig
Outdated
Show resolved
Hide resolved
src/Resources/views/CRUD/Association/edit_one_to_many_inline_table.html.twig
Show resolved
Hide resolved
EmmanuelVella
force-pushed
the
patch-26
branch
from
September 22, 2020 14:22
65466bb
to
1d84b25
Compare
VincentLanglet
approved these changes
Sep 22, 2020
jordisala1991
approved these changes
Sep 22, 2020
Please take a new look @phansys :) |
phansys
reviewed
Sep 25, 2020
{% 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) %} |
There was a problem hiding this comment.
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
phansys
approved these changes
Sep 25, 2020
Thanks ! @EmmanuelVella |
This was referenced Oct 22, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Subject
Currently, inline table / tabs collection labels will get the translation domain in this order :
I think it should be the opposite ? Check the option first, and fallback to the admin.
I am targeting this branch, because it's a bugfix.
Changelog