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.

Sign up for GitHub

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

Jump to bottom

Fix s plural noun #168

Merged
merged 6 commits into from
Jan 19, 2023
Merged

Fix s plural noun #168

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d73b78
Fixed ss in singular noun
george-gca Aug 7, 2022
f416e60
Fixed singular_noun for singulars of words that pluralize changing 'i…
george-gca Aug 7, 2022
c2b7171
Fixed plural_noun for cases where the word already ends with s
george-gca Aug 7, 2022
3c276e9
Added more tests to inflections.txt
george-gca Oct 22, 2022
a159310
Merge branch 'jaraco:main' into fix_s_plural_noun
george-gca Oct 28, 2022
5f53986
Handled compound words like co-analyses
george-gca Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions inflect/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2973,6 +2973,9 @@ def _plnoun( # noqa: C901

# OTHERWISE JUST ADD ...s

if word[-1] == "s":
return word

return f"{word}s"

@classmethod
Expand Down Expand Up @@ -3420,6 +3423,9 @@ def _sinoun( # noqa: C901
if words.lowered[-3:] == "xes":
return word[:-2]

if words.lowered[-2:] == "ss":
return False

# HANDLE ...f -> ...ves

if word in si_sb_ves_ve_case or words.last.lower() in si_sb_ves_ve:
Expand Down Expand Up @@ -3469,6 +3475,8 @@ def _sinoun( # noqa: C901

if word in si_sb_es_is:
return word[:-2] + "is"
elif word[:-2] + "es" in si_sb_es_is:
return False

# OTHERWISE JUST REMOVE ...s

Expand Down