Skip to content

Commit

Permalink
fix yaml parse errors and singleton include
Browse files Browse the repository at this point in the history
  • Loading branch information
sanderhahn committed Nov 21, 2011
1 parent 6e9daf3 commit 83845bf
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 18 deletions.
2 changes: 1 addition & 1 deletion lib/rich/pluralization/core/string/inflections.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def cp_case!(s)
def pl(count = nil) def pl(count = nil)
Rich::Pluralization::Inflector.pluralize self, count Rich::Pluralization::Inflector.pluralize self, count
end end

end end
end end
end end
Expand Down
12 changes: 6 additions & 6 deletions locales/es.yml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ es:
- rule: z$ - rule: z$
replacement: ces replacement: ces


- rule: | á([sn])$ - rule: á([sn])$
replacement: a\1es replacement: a\1es


- rule: | í([sn])$ - rule: í([sn])$
replacement: i\1es replacement: i\1es


- rule: | ó([sn])$ - rule: ó([sn])$
replacement: o\1es replacement: o\1es


- rule: | ú([sn])$ - rule: ú([sn])$
replacement: u\1es replacement: u\1es


- rule: | ([aeiou]s)$ - rule: ([aeiou]s)$
replacement: \1 replacement: \1


- rule: | ([^aeioué])$ - rule: ([^aeioué])$
replacement: \1es replacement: \1es


- rule: $ - rule: $
Expand Down
33 changes: 22 additions & 11 deletions locales/nl.yml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ nl:


- rule: (c|m|n|t)us$ - rule: (c|m|n|t)us$
replacement: \1i replacement: \1i
exceptions: | abortus, anus exceptions: abortus, anus

- rule: (c|d|e|i|t|tr|v)um$ - rule: (c|d|e|i|t|tr|v)um$
replacement: \1a replacement: \1a
exceptions: (anthu|aqua)rium exceptions: (anthu|aqua)rium
Expand All @@ -43,7 +43,8 @@ nl:
- rule: stad$ - rule: stad$
replacement: steden replacement: steden


- rule: | abc, acme, acne, (a|ë|i|o|u|y)$ - rule: abc, acme, acne, (a|ë|i|o|u|y)$

replacement: \1's replacement: \1's
exceptions: (ai|eau|ei|li|lieu|ooi|ou|shampoo|spray|vlo)$ exceptions: (ai|eau|ei|li|lieu|ooi|ou|shampoo|spray|vlo)$


Expand All @@ -67,10 +68,12 @@ nl:
- rule: (abort|act|acquisit|advis|amat|inspect)(eur)$ - rule: (abort|act|acquisit|advis|amat|inspect)(eur)$
replacement: \1\2s replacement: \1\2s


- rule: | (gevoel)$ - rule: (gevoel)$

replacement: \1ens replacement: \1ens


- rule: | (accent|agent)([-\s])(\w+) - rule: (accent|agent)([-\s])(\w+)

replacement: \1s\2\3s replacement: \1s\2\3s


- rule: advocaat-(\w+) - rule: advocaat-(\w+)
Expand All @@ -79,12 +82,15 @@ nl:
- rule: (bike|borstel|distel|kabel|prikkel|winkel)$ - rule: (bike|borstel|distel|kabel|prikkel|winkel)$
replacement: \1s 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)$, (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)$, (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)$ (sun|tank|tant|test|um|view)$
replacement: \1s 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)$, ((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)$, (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)$ (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)$
Expand All @@ -99,14 +105,18 @@ nl:
- rule: (ver|cijn)s$ - rule: (ver|cijn)s$
replacement: \1zen replacement: \1zen


- rule: | (a|e|o|u)\1([^aeiou])$ - rule: (a|e|o|u)\1([^aeiou])$

replacement: \1\2en replacement: \1\2en


- rule: | (aï|alia)(s), - rule: |
(aï|alia)(s),
([^aeiou][aeiou])([^aeioux])$, ([^aeiou][aeiou])([^aeioux])$,
^([aeiou])([^aeioux])$ ^([aeiou])([^aeioux])$
replacement: \1\2\2en 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)$ (blad|dag|dak|engel|gat|god|hertog|ij|kel|oorlog|proton|regel|schijnsel|schot|slag|tor|weg)$
- rule: (de|ene)$ - rule: (de|ene)$
Expand All @@ -116,7 +126,8 @@ nl:
replacement: ven replacement: ven
exceptions: morf$ exceptions: morf$


- rule: | ([aeiou]|aar|eur|ij)s$ - rule: ([aeiou]|aar|eur|ij)s$

replacement: \1zen replacement: \1zen
exceptions: (kaars|kruis)$ exceptions: (kaars|kruis)$


Expand Down

0 comments on commit 83845bf

Please sign in to comment.