Allow negative numbers being passed to transChoice #85
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
| @@ -143,7 +143,7 @@ public function translate($message, $count = NULL, $parameters = array(), $domai | |||
| $parameters = $tmp; | |||
|
|
|||
| if ($count !== NULL && is_scalar($count)) { | |||
| return $this->transChoice($message, preg_replace('~[^0-9,.]~', '', $count), $parameters + array('%count%' => $count), $domain, $locale); | |||
| return $this->transChoice($message, preg_replace('~[^0-9,.\-]~', '', $count), $parameters + array('%count%' => $count), $domain, $locale); | |||
There was a problem hiding this comment.
Wouldn't it be better to allow the - only on the beginning?
There was a problem hiding this comment.
I'm not sure why is this needed anyway. The only next usage is here, casting value to integer and thanks to previous line in this file we can be sure that typecasting will never fail.
To be honest, this was only hotfix so I could continue in work, so I did not think about this very much :)
So:
- if this is not needed, should I update PR with preg_replace removed?
- if this is needed, would you please point me why & how to update PR to make this OK?
Thank you for your time!
There was a problem hiding this comment.
I see! I overlooked that. I don't really remember why was the preg_replace needed. It can probably be removed.
|
Thank you! |
|
Thank You for merge! |
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.
No description provided.