gistfile1.diff

@@ -3,7 +3,14 @@ module ActiveSupport
     inflect.plural(/$/, 's')
     inflect.plural(/s$/i, 's')
     inflect.plural(/(ax|test)is$/i, '\1es')
-    inflect.plural(/(octop|vir)us$/i, '\1i')
+   
+    # Note that 'octopuses' is equally correct
+    inflect.plural(/(octop)us$/i, '\1i')
+
+    # The correct plural of 'virus' is actually 'viruses',
+    # not 'viri' or 'virii', like one would like to be believe.
+    # See: http://en.wikipedia.org/wiki/Plural_form_of_words_ending_in_-us#Virus
+    inflect.plural(/(virus)$/i, '\1es')
     inflect.plural(/(alias|status)$/i, '\1es')
     inflect.plural(/(bu)s$/i, '\1ses')
     inflect.plural(/(buffal|tomat)o$/i, '\1oes')