Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove the extra argument to utils.str.pluralize. 

We previously had a second argument to utils.str.pluralize which determined
whether we truly plurazlied a word or not.  This has been removed so that
the function does what it says it does.
This commit is contained in:
James Vega 2005-01-31 13:37:47 +00:00
parent 9099a1a934
commit 47aa4c0f7c
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/utils/str.py
View File

@ -247,28 +247,25 @@ def matchCase(s1, s2):
consonants = 'bcdfghjklmnpqrstvwxz' consonants = 'bcdfghjklmnpqrstvwxz'
_pluralizeRegex = re.compile('[%s]y$' % consonants) _pluralizeRegex = re.compile('[%s]y$' % consonants)
def pluralize(s, i=2): def pluralize(s):
"""Returns the plural of s based on its number i. Put any exceptions to """Returns the plural of s. Put any exceptions to the general English
the general English rule of appending 's' in the plurals dictionary. rule of appending 's' in the plurals dictionary.
""" """
if i == 1: lowered = s.lower()
return s # Exception dictionary
if lowered in plurals:
return matchCase(s, plurals[lowered])
# Words ending with 'ch', 'sh' or 'ss' such as 'punch(es)', 'fish(es)
# and miss(es)
elif any(lowered.endswith, ['x', 'ch', 'sh', 'ss']):
return matchCase(s, s+'es')
# Words ending with a consonant followed by a 'y' such as
# 'try (tries)' or 'spy (spies)'
elif _pluralizeRegex.search(lowered):
return matchCase(s, s[:-1] + 'ies')
# In all other cases, we simply add an 's' to the base word
else: else:
lowered = s.lower() return matchCase(s, s+'s')
# Exception dictionary
if lowered in plurals:
return matchCase(s, plurals[lowered])
# Words ending with 'ch', 'sh' or 'ss' such as 'punch(es)', 'fish(es)
# and miss(es)
elif any(lowered.endswith, ['x', 'ch', 'sh', 'ss']):
return matchCase(s, s+'es')
# Words ending with a consonant followed by a 'y' such as
# 'try (tries)' or 'spy (spies)'
elif _pluralizeRegex.search(lowered):
return matchCase(s, s[:-1] + 'ies')
# In all other cases, we simply add an 's' to the base word
else:
return matchCase(s, s+'s')
_depluralizeRegex = re.compile('[%s]ies' % consonants) _depluralizeRegex = re.compile('[%s]ies' % consonants)
def depluralize(s): def depluralize(s):