Permalink
Browse files

fix yaml parse errors and singleton include

  • Loading branch information...
1 parent 6e9daf3 commit 83845bf8bfbdb34334d2e05d82cbc37527d48fb8 @sanderhahn sanderhahn committed Nov 21, 2011
Showing with 29 additions and 18 deletions.
  1. +1 −1 lib/rich/pluralization/core/string/inflections.rb
  2. +6 −6 locales/es.yml
  3. +22 −11 locales/nl.yml
@@ -30,7 +30,7 @@ def cp_case!(s)
def pl(count = nil)
Rich::Pluralization::Inflector.pluralize self, count
end
-
+
end
end
end
View
@@ -6,22 +6,22 @@ es:
- rule: z$
replacement: ces
- - rule: | á([sn])$
+ - rule: á([sn])$
replacement: a\1es
- - rule: | í([sn])$
+ - rule: í([sn])$
replacement: i\1es
- - rule: | ó([sn])$
+ - rule: ó([sn])$
replacement: o\1es
- - rule: | ú([sn])$
+ - rule: ú([sn])$
replacement: u\1es
- - rule: | ([aeiou]s)$
+ - rule: ([aeiou]s)$
replacement: \1
- - rule: | ([^aeioué])$
+ - rule: ([^aeioué])$
replacement: \1es
- rule: $
View
@@ -15,8 +15,8 @@ nl:
- rule: (c|m|n|t)us$
replacement: \1i
- exceptions: | abortus, anus
-
+ exceptions: abortus, anus
+
- rule: (c|d|e|i|t|tr|v)um$
replacement: \1a
exceptions: (anthu|aqua)rium
@@ -43,7 +43,8 @@ nl:
- rule: stad$
replacement: steden
- - rule: | abc, acme, acne, (a|ë|i|o|u|y)$
+ - rule: abc, acme, acne, (a|ë|i|o|u|y)$
+
replacement: \1's
exceptions: (ai|eau|ei|li|lieu|ooi|ou|shampoo|spray|vlo)$
@@ -67,10 +68,12 @@ nl:
- rule: (abort|act|acquisit|advis|amat|inspect)(eur)$
replacement: \1\2s
- - rule: | (gevoel)$
+ - rule: (gevoel)$
+
replacement: \1ens
- - rule: | (accent|agent)([-\s])(\w+)
+ - rule: (accent|agent)([-\s])(\w+)
+
replacement: \1s\2\3s
- rule: advocaat-(\w+)
@@ -79,12 +82,15 @@ nl:
- rule: (bike|borstel|distel|kabel|prikkel|winkel)$
replacement: \1s
- - rule: | abraham, account, act, addict, adoptiefzoon, ah, ai, air, airstrip, alligator, amant, ampersand, analysator, animator, anklet, antiquair, arbeidspool,
+ - rule: |
+ abraham, account, act, addict, adoptiefzoon, ah, ai, air, airstrip, alligator, amant, ampersand, analysator, animator, anklet, antiquair, arbeidspool,
(aar|aard|age|ah|bag|beignet|bike|chef|chon|club|e|é|eau|eër|el|em|en|eon|er|erd|festival|filet|film)$,
(foon|ie|ier|iër|kon|lation|lieu|lotion|marshal|nal|oir|oor|ose|ou|our|ount|pon|poo|prop|rak|rant|rn|sar|sion|sit|show|sor|spray)$,
(sun|tank|tant|test|um|view)$
+
replacement: \1s
- exceptions: | a-attest, aar, aardster, aarlenaar, acceptant, adoptant, afgifte, albe, alge, allofoon, amandel, amarant, ante, antifoon, antipode, aquarel, arelaar,
+ exceptions: |
+ a-attest, aar, aardster, aarlenaar, acceptant, adoptant, afgifte, albe, alge, allofoon, amandel, amarant, ante, antifoon, antipode, aquarel, arelaar,
((aan|ge|ver|voor).*de|afe|ate|bel|bier|cel|contractant|denkende|deur|dier|dienaar|dode|eem|een|eel|eer|einde)$,
(ene|engel|gezwel|gier|iel|iem|isme|ïsme|jaar|ke|kel|krant|lem|lier|maatregel|migrant)$,
(model|officier|oïde|oor|oen|oer|eose|penaar|rivale|schel|schijnsel|sien|spier|ste|stel|stem|taar|tenaar|tier|tride|uaar|vaar|valide|verwante|vrage|zijde)$
@@ -99,14 +105,18 @@ nl:
- rule: (ver|cijn)s$
replacement: \1zen
- - rule: | (a|e|o|u)\1([^aeiou])$
+ - rule: (a|e|o|u)\1([^aeiou])$
+
replacement: \1\2en
- - rule: | (aï|alia)(s),
+ - rule: |
+ (aï|alia)(s),
([^aeiou][aeiou])([^aeioux])$,
^([aeiou])([^aeioux])$
+
replacement: \1\2\2en
- exceptions: alcohol, amandel, apostel, dal, pad, slot, vat,
+ exceptions: |
+ alcohol, amandel, apostel, dal, pad, slot, vat,
(blad|dag|dak|engel|gat|god|hertog|ij|kel|oorlog|proton|regel|schijnsel|schot|slag|tor|weg)$
- rule: (de|ene)$
@@ -116,7 +126,8 @@ nl:
replacement: ven
exceptions: morf$
- - rule: | ([aeiou]|aar|eur|ij)s$
+ - rule: ([aeiou]|aar|eur|ij)s$
+
replacement: \1zen
exceptions: (kaars|kruis)$

0 comments on commit 83845bf

Please sign in to comment.