[8.x] Don't pluralise string if string ends with none alphanumeric character #36137
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
…aracter. Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
driesvints
approved these changes
Feb 4, 2021
GrahamCampbell
changed the title
spekulatius
approved these changes
Feb 4, 2021
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
|
Can we see how much this |
crishoj
reviewed
Feb 10, 2021
| @@ -69,7 +69,7 @@ class Pluralizer | |||
| */ | |||
| public static function plural($value, $count = 2) | |||
| { | |||
| if ((int) abs($count) === 1 || static::uncountable($value)) { | |||
| if ((int) abs($count) === 1 || static::uncountable($value) || preg_match('/^(.*)[A-Za-z0-9\x{0080}-\x{FFFF}]$/u', $value) == 0) { | |||
There was a problem hiding this comment.
Was this thoroughly reviewed?
- Initial anchor and pattern
^(.*)is superfluous - Simpler pattern is
/\p{Letter}$/uis more readable - The check could be done in
uncountable()
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.
Avoid scenarios such as below.
Right now we still enable adding
sfor string ending with numeric to avoid breaking change forModelto table name naming convention.Signed-off-by: Mior Muhammad Zaki crynobone@gmail.com