Navigation

Changeset 7092

Timestamp:

06/23/07 16:47:47 (1 year ago)

Author:

david

Message:

Added support for pluralization with a different starting letter than the singular version (cow/kine) (closes #4929) [norri_b/hasmanyjosh]

Files:

r7086	r7092
1	1	SVN
	2
	3	* Added support for pluralization with a different starting letter than the singular version (cow/kine) #4929 [norri_b/hasmanyjosh]
2	4
3	5	* Demote Hash#to_xml to use XmlSimple#xml_in_string so it can't read files or stdin. #8453 [candlerb, Jeremy Kemper]

r6886	r7092
48	48	inflect.irregular('sex', 'sexes')
49	49	inflect.irregular('move', 'moves')
	50	inflect.irregular('cow', 'kine')
50	51
51	52	inflect.uncountable(%w(equipment information rice money species series fish sheep))

r6075	r7092
48	48	# irregular 'person', 'people'
49	49	def irregular(singular, plural)
50		plural(Regexp.new("(#{singular[0,1]})#{singular[1..-1]}$", "i"), '\1' + plural[1..-1])
51		singular(Regexp.new("(#{plural[0,1]})#{plural[1..-1]}$", "i"), '\1' + singular[1..-1])
	50	if singular[0,1].upcase == plural[0,1].upcase
	51	plural(Regexp.new("(#{singular[0,1]})#{singular[1..-1]}$", "i"), '\1' + plural[1..-1])
	52	singular(Regexp.new("(#{plural[0,1]})#{plural[1..-1]}$", "i"), '\1' + singular[1..-1])
	53	else
	54	plural(Regexp.new("#{singular[0,1].upcase}(?i)#{singular[1..-1]}$"), plural[0,1].upcase + plural[1..-1])
	55	plural(Regexp.new("#{singular[0,1].downcase}(?i)#{singular[1..-1]}$"), plural[0,1].downcase + plural[1..-1])
	56	singular(Regexp.new("#{plural[0,1].upcase}(?i)#{plural[1..-1]}$"), singular[0,1].upcase + singular[1..-1])
	57	singular(Regexp.new("#{plural[0,1].downcase}(?i)#{plural[1..-1]}$"), singular[0,1].downcase + singular[1..-1])
	58	end
52	59	end
53	60