Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add some more non-countable English nouns #52526

Merged
merged 1 commit into from Nov 18, 2023

Conversation

paullallier
Copy link
Contributor

@paullallier paullallier commented Nov 9, 2023

Q A
Branch? 5.4
Bug fix? yes
New feature? no
Deprecations? no
Issues N/A
License MIT

@acirulis spotted that equipment was missing here: api-platform/core#5957

I've added that and a few more non-countable nouns that I think are reasonably likely to be used by someone. Arguably, time and work could also be here since they are normally non-countable, but there cases where times and works would be correct too.

And I corrected vocal to vowel, which is the correct English term

I'm not sure if this needs extra tests - happy to add if needed.

@carsonbot
Copy link

Hey!

I see that this is your first PR. That is great! Welcome!

Symfony has a contribution guide which I suggest you to read.

In short:

  • Always add tests
  • Keep backward compatibility (see https://symfony.com/bc).
  • Bug fixes must be submitted against the lowest maintained branch where they apply (see https://symfony.com/releases)
  • Features and deprecations must be submitted against the 6.4 branch.

Review the GitHub status checks of your pull request and try to solve the reported issues. If some tests are failing, try to see if they are failing because of this change.

When two Symfony core team members approve this change, it will be merged and you will become an official Symfony contributor!
If this PR is merged in a lower version branch, it will be merged up to all maintained branches within a few days.

I am going to sit back now and wait for the reviews.

Cheers!

Carsonbot

@paullallier
Copy link
Contributor Author

paullallier commented Nov 9, 2023

There's a coding standards failure in code I didn't really change - at least not in a way that changes the style. I'm happy to add the changes anyway, if appropriate?

(The coding standard patch seems to use the str_contains function, which I think was new in PHP 8, so I assume we don't really want that in Symfony 5.4?)

@paullallier paullallier changed the title Add some more non-countable English nouns [String] Add some more non-countable English nouns Nov 10, 2023
@paullallier
Copy link
Contributor Author

Looking at this again, history -> histories is probably valid (though there are situations where history is also a valid plural).

Health is trickier. There are a few places that suggest things like this:
Screenshot 2023-11-10 at 21 21 12
But, as a native (British) English speaker I can't think of a case where I'd use healths rather than health for the plural. doctrine/inflector 2.0.8 does also offer healths though...

So possibly we just conclude that English is an inconsistent mess.

@stof
Copy link
Member

stof commented Nov 10, 2023

regarding health, maybe we should offer both plural candidates

@paullallier
Copy link
Contributor Author

regarding health, maybe we should offer both plural candidates

Perhaps yes, but I think it's mostly going to sounds strange with the s. In fact, I think there's an argument to be made that nouns ending "LTH" are almost always uncountable. Though I haven't even heard of some of these...
https://word.tips/words-end-in/lth/

@carsonbot carsonbot changed the title [String] Add some more non-countable English nouns Add some more non-countable English nouns Nov 14, 2023
@fabpot
Copy link
Member

fabpot commented Nov 18, 2023

Thank you @paullallier.

@fabpot fabpot merged commit abff175 into symfony:5.4 Nov 18, 2023
8 of 11 checks passed
@paullallier paullallier deleted the fix-english-inflector branch November 18, 2023 23:02
@acirulis
Copy link

Oh, now I got plural "settingss" out of "settings" - should I open new issue?

@xabbuh
Copy link
Member

xabbuh commented Nov 29, 2023

@acirulis please do

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants