[FrameworkBundle] Register an identity translator as fallback #28523
Conversation
This file contains hidden or 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
| @@ -39,6 +43,10 @@ public function trans($id, array $parameters = array(), $domain = 'messages', $l | |||
| */ | |||
| public function transChoice($id, $number, array $parameters = array(), $domain = 'messages', $locale = null) | |||
| { | |||
| if (null === $this->translator) { | |||
| return strtr($id, $parameters); | |||
There was a problem hiding this comment.
The plural rules should still be resolved here, the trait provided in contracts should be used for that purpose.
There was a problem hiding this comment.
OR remove strtr entirely as in #24358 !
There was a problem hiding this comment.
In fact, TwigBridge also needs the fix to handle plural, see #24514
ae03f59 to
43d20b1
Compare
|
Hi @yceruto, FYI, I pushed in your branch what I was talking in my comment a few hours ago. |
The Form component can be used without the Translation component. However, to be able to use the default form themes provided by the FrameworkBundle you need to have the `translator` helper to be available. This change ensure that there will always be a `translator` helper which as a fallback will just return the message key if no translator is present.
43d20b1 to
5330f2d
Compare
|
Wow! thanks @nicolas-grekas, look very good to me. |
nicolas-grekas
approved these changes
Sep 20, 2018
xabbuh
approved these changes
Sep 20, 2018
javiereguiluz
approved these changes
Sep 20, 2018
|
Thank you @yceruto. |
nicolas-grekas
added a commit
that referenced
this pull request
Sep 21, 2018
…allback (yceruto) This PR was merged into the 4.2-dev branch. Discussion ---------- [FrameworkBundle] Register an identity translator as fallback | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #27589 | License | MIT | Doc PR | - The same approach as #24358, suggested by @xabbuh here #27589 (comment) **Templating Engine Context** The Form component can be used without the Translation component. However, to be able to use the default form themes provided by the `FrameworkBundle` you need to have the `translator` helper to be available. This change ensure that there will always be a `translator` helper which as a fallback will just return the message key if no translator is present. Commits ------- 5330f2d [FrameworkBundle] Register an identity translator as fallback
Nyholm
added a commit
to Nyholm/symfony
that referenced
this pull request
Sep 22, 2018
This was referenced Nov 3, 2018
Closed
Merged
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.
The same approach as #24358, suggested by @xabbuh here #27589 (comment)
Templating Engine Context
The Form component can be used without the Translation component.
However, to be able to use the default form themes provided by the
FrameworkBundleyou need to have thetranslatorhelper to be available.This change ensure that there will always be a
translatorhelper whichas a fallback will just return the message key if no translator is present.