Fixed singular of committee #18909
Fixed singular of committee #18909
Conversation
|
Fabbot should be ignored in this case... |
|
Can you indeed also provide a PR for 2.3? |
|
Just provided #18911 |
| // Convert teeth to tooth, feet to foot | ||
| if (false !== ($pos = strpos($plural, 'ee')) && strlen($plural) > 3 && 'feedback' !== $plural) { | ||
| if (false !== ($pos = strpos($plural, 'ee')) && strlen($plural) > 3 && !in_array(strtolower($plural), $irregularNouns)) { |
There was a problem hiding this comment.
Please, preserve the strict comparison at in_array().
| @@ -218,8 +227,14 @@ public static function singularize($plural) | |||
| } | |||
| } | |||
|
|
|||
| $irregularNouns = array( | |||
There was a problem hiding this comment.
This doesn't seem to be in use?
|
@teohhanhui I was thinking about the whitelist approach as well but I see the problem that with the whitelist approach it will be hard to match all the relevent cases and the risk is high to introduce BC breaks whereas the blacklist approach should not break existing applications. |
|
@peterrehm I don't totally agree with you as I currently have a |
|
I was wondering: what if I have an attribute named |
|
@TakTaki It would have needed an explicit list. After some research I only found the 3 added nouns affected, I did not find more. So I switched to the whitelist approach which should be easier. The question is if this is a BC break or not? /cc @nicolas-grekas |
| * | ||
| * @var array | ||
| */ | ||
| private static $irregularNouns = array( |
|
Can you synchonize the PR targetting the older branch too ? |
|
@stof It was, missed some changes it is already updated. |
|
@stof The other PR is already updated as well. What do you think about the changed? I could not think of any better solution. |
| @@ -26,7 +26,6 @@ | |||
| * @var array | |||
| * | |||
| * @see http://english-zone.com/spelling/plurals.html | |||
| * @see http://www.scribd.com/doc/3271143/List-of-100-Irregular-Plural-Nouns-in-English | |||
There was a problem hiding this comment.
Perhaps we can link to: http://grammar.about.com/od/words/a/A-List-Of-Irregular-Plural-Nouns-In-English.htm
This PR was submitted for the 2.3 branch but it was merged into the 2.7 branch instead (closes #18911). Discussion ---------- Fixed singular of committee | Q | A | ------------- | --- | Branch? | 2.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #18872, #18748 | License | MIT | Doc PR | - In addition to PR #18909. Commits ------- 5661d52 Fixed singular of committee
|
Thank you @peterrehm. |
This PR was squashed before being merged into the 3.1 branch (closes #18909). Discussion ---------- Fixed singular of committee | Q | A | ------------- | --- | Branch? | 3.1? | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #18872, #18748 | License | MIT | Doc PR | - As in SF 3.1 the StringUtil has been moved to a new Component, I am proposing this for 3.1. I can easily provide the same in an additional PR against the 2.3? branch. Commits ------- b5e1f24 Fixed singular of committee
As in SF 3.1 the StringUtil has been moved to a new Component, I am proposing this for 3.1.
I can easily provide the same in an additional PR against the 2.3? branch.