Merge branch 'testing'

This commit is contained in:
Valentin Lorentz 2010-11-06 08:12:39 +01:00
commit 16c9ddf6ed

View File

@ -40,7 +40,7 @@ def pluralize(s):
lowered in ['bijou', 'caillou', 'chou', 'genou', 'hibou', 'joujou',
'pou']:
return s + 'x'
elif lowered.endwith('al') and \
elif lowered.endswith('al') and \
lowered not in ['bal', 'carnaval', 'chacal', 'festival', 'récital',
'régal', 'cal', 'étal', 'aval', 'caracal', 'val', 'choral',
'corral', 'galgal', 'gayal']:
@ -53,7 +53,7 @@ def pluralize(s):
return s + 'x'
elif lowered == 'pare-feu':
return s
elif lowered.endwith('eu') and \
elif lowered.endswith('eu') and \
lowered not in ['bleu', 'pneu', 'émeu', 'enfeu']:
# Note: when 'lieu' is a fish, it has a 's' ; else, it has a 'x'
return s + 'x'