Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Ticket #8004: series_singularization_patch.diff

File series_singularization_patch.diff, 1.2 kB (added by daveverwer, 1 year ago)

Patch diff

  • test/inflector_test.rb

    old new  
    2525    "ability"     => "abilities", 
    2626    "agency"      => "agencies", 
    2727    "movie"       => "movies", 
     28    "nursery"     => "nurseries", 
     29    "misery"      => "miseries", 
    2830 
    2931    "archive"     => "archives", 
    3032 
     
    6466    "news"        => "news", 
    6567 
    6668    "series"      => "series", 
     69    "mini-series" => "mini-series", 
    6770    "species"     => "species", 
    6871 
    6972    "quiz"        => "quizzes", 
  • lib/active_support/inflections.rb

    old new  
    2727  inflect.singular(/(tive)s$/i, '\1') 
    2828  inflect.singular(/([lr])ves$/i, '\1f') 
    2929  inflect.singular(/([^aeiouy]|qu)ies$/i, '\1y') 
    30   inflect.singular(/(s)eries$/i, '\1eries') 
     30  inflect.singular(/^([a-z]+-)?(series)$/i, '\1\2') 
    3131  inflect.singular(/(m)ovies$/i, '\1ovie') 
    3232  inflect.singular(/(x|ch|ss|sh)es$/i, '\1') 
    3333  inflect.singular(/([m|l])ice$/i, '\1ouse')