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

Fix forgotten merge

This commit is contained in:
Valentin Lorentz 2011-01-26 09:56:04 +01:00
parent 1cceeb7ad1
commit ad2ad80263
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/utils/str.py
View File

@ -287,10 +287,7 @@ def pluralize(s):
@internationalizeFunction('depluralize') @internationalizeFunction('depluralize')
def depluralize(s): def depluralize(s):
"""Returns the singular of s.""" """Returns the singular of s."""
<<<<<<< HEAD
consonants = 'bcdfghjklmnpqrstvwxz' consonants = 'bcdfghjklmnpqrstvwxz'
=======
>>>>>>> testing
_depluralizeRegex = re.compile('[%s]ies' % consonants) _depluralizeRegex = re.compile('[%s]ies' % consonants)
lowered = s.lower() lowered = s.lower()
if lowered in plurals: if lowered in plurals: