Fix plural messages not falling back to key. #10911
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
Plural messages without a translated value did not correctly fallback to the message key as singular messages do. This caused undesirable behavior when working with plural messages. I've shifted the plural form resolution into the Translator. Now that we have a custom translator class this logic is better suited here instead of having duplicate logic in each message formatter. Interestingly our formatters had divergent logic for handling plurals which could cause some tedious to fix issues for app developers. I've not unset the `_singular` key in the Translator as userland formatters could be relying on those keys being passed in. Refs #10900
Codecov Report
@@ Coverage Diff @@
## master #10911 +/- ##
============================================
- Coverage 94.94% 94.63% -0.31%
+ Complexity 12138 12130 -8
============================================
Files 422 422
Lines 30170 31107 +937
============================================
+ Hits 28645 29439 +794
- Misses 1525 1668 +143
Continue to review full report at Codecov.
|
lorenzo
reviewed
Jul 15, 2017
src/I18n/Translator.php
Outdated
| return $key; | ||
| } | ||
| if (is_string($message['_context'][$context]) && | ||
| strlen($message['_context'][$context]) === 0 |
There was a problem hiding this comment.
This can be written as
if ($message['_context'][$context] === '')
3 tasks
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.
Plural messages without a translated value did not correctly fallback to the message key as singular messages do. This caused undesirable behavior when working with plural messages.
I've shifted the plural form resolution into the Translator. Now that we have a custom translator class this logic is better suited here instead of having duplicate logic in each message formatter. Interestingly our formatters had divergent logic for handling plurals which could cause some tedious to fix issues for app developers.
I've not unset the
_singularkey in the Translator as userland formatters could be relying on those keys being passed in.Refs #10900