accounted for a few more test cases provided by Bas Jansen on my blog

srkirkland · Mar 18, 2011 · e7c2d44 · e7c2d44
1 parent 748a758
commit e7c2d44
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/Inflector.Tests/PluralizeTests.cs b/Inflector.Tests/PluralizeTests.cs
@@ -119,6 +119,17 @@ public PluralizeTests()
             TestData.Add("horse", "horses");
             TestData.Add("prize", "prizes");
             TestData.Add("edge", "edges");
+
+            /* Tests added by Bas Jansen */
+            TestData.Add("goose", "geese");
+            TestData.Add("deer", "deer");
+            TestData.Add("sheep", "sheep");
+            TestData.Add("wolf", "wolves");
+            TestData.Add("volcano", "volcanoes");
+            TestData.Add("aircraft", "aircraft");
+            TestData.Add("alumna", "alumnae");
+            TestData.Add("alumnus", "alumni");
+            TestData.Add("fungus", "fungi");
         }
     }
 }
diff --git a/Inflector/Inflector.cs b/Inflector/Inflector.cs
@@ -12,10 +12,10 @@ static Inflector()
             AddPlural("$", "s");
             AddPlural("s$", "s");
             AddPlural("(ax|test)is$", "$1es");
-            AddPlural("(octop|vir)us$", "$1i");
+            AddPlural("(octop|vir|alumn|fung)us$", "$1i");
             AddPlural("(alias|status)$", "$1es");
             AddPlural("(bu)s$", "$1ses");
-            AddPlural("(buffal|tomat)o$", "$1oes");
+            AddPlural("(buffal|tomat|volcan)o$", "$1oes");
             AddPlural("([ti])um$", "$1a");
             AddPlural("sis$", "ses");
             AddPlural("(?:([^f])fe|([lr])f)$", "$1$2ves");
@@ -45,7 +45,7 @@ static Inflector()
             AddSingular("(o)es$", "$1");
             AddSingular("(shoe)s$", "$1");
             AddSingular("(cris|ax|test)es$", "$1is");
-            AddSingular("(octop|vir)i$", "$1us");
+            AddSingular("(octop|vir|alumn|fung)i$", "$1us");
             AddSingular("(alias|status)es$", "$1");
             AddSingular("^(ox)en", "$1");
             AddSingular("(vert|ind)ices$", "$1ex");
@@ -57,6 +57,8 @@ static Inflector()
             AddIrregular("child", "children");
             AddIrregular("sex", "sexes");
             AddIrregular("move", "moves");
+            AddIrregular("goose", "geese");
+            AddIrregular("alumna", "alumnae");
 
             AddUncountable("equipment");
             AddUncountable("information");
@@ -66,6 +68,8 @@ static Inflector()
             AddUncountable("series");
             AddUncountable("fish");
             AddUncountable("sheep");
+            AddUncountable("deer");
+            AddUncountable("aircraft");
         }
 
         #endregion