diff options
author | Jonne Hass <mrzyx@mrzyx.de> | 2011-09-08 03:58:13 +0400 |
---|---|---|
committer | Jonne Hass <mrzyx@mrzyx.de> | 2011-09-08 04:00:46 +0400 |
commit | 2addd32274868060ba5265263d6dc0c20bf28b8c (patch) | |
tree | a9e513a6f079d670195e1cf31d81d9dd1fab53ca /config/locales | |
parent | faa44c0a91a435d80279599f4557fb238d1084a7 (diff) |
shit we violoated the LDML
close #1920
* added two to pluralizations, see
http://www.unicode.org/reports/tr35/tr35-21.html#Language_Plural_Rules
* updated pluralization rules to CLDR 2.0.1
Diffstat (limited to 'config/locales')
-rw-r--r-- | config/locales/cldr/br_plurals.rb | 1 | ||||
-rw-r--r-- | config/locales/cldr/cy_plurals.rb | 2 | ||||
-rw-r--r-- | config/locales/cldr/eo_plurals.rb | 1 | ||||
-rw-r--r-- | config/locales/cldr/ga_plurals.rb | 2 | ||||
-rw-r--r-- | config/locales/cldr/mk_plurals.rb | 2 | ||||
-rw-r--r-- | config/locales/cldr/pl_plurals.rb | 2 | ||||
-rw-r--r-- | config/locales/diaspora/en.yml | 25 | ||||
-rw-r--r-- | config/locales/javascript/javascript.en.yml | 1 |
8 files changed, 32 insertions, 4 deletions
diff --git a/config/locales/cldr/br_plurals.rb b/config/locales/cldr/br_plurals.rb new file mode 100644 index 000000000..0c566defe --- /dev/null +++ b/config/locales/cldr/br_plurals.rb @@ -0,0 +1 @@ +{ :br => { :i18n => {:plural => { :keys => [:one, :two, :few, :many, :other], :rule => lambda { |n| n % 10 == 1 && n ? :one : n % 10 == 2 && n ? :two : [3, 4].include?(n % 10) && ![10, 11, 12, 13, 14, 15, 16, 17, 18, 19].include?(n % 100) ? :few : n % 1000000 == 0 && n != 0 ? :many : :other } } } } }
\ No newline at end of file diff --git a/config/locales/cldr/cy_plurals.rb b/config/locales/cldr/cy_plurals.rb index 72ed2ac4d..b37dba436 100644 --- a/config/locales/cldr/cy_plurals.rb +++ b/config/locales/cldr/cy_plurals.rb @@ -1 +1 @@ -{ :cy => { :i18n => {:plural => { :keys => [:one, :two, :many, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : n == 8 || n == 11 ? :many : :other } } } } }
\ No newline at end of file +{ :cy => { :i18n => {:plural => { :keys => [:zero, :one, :two, :few, :many, :other], :rule => lambda { |n| n == 0 ? :zero : n == 1 ? :one : n == 2 ? :two : n == 3 ? :few : n == 6 ? :many : :other } } } } }
\ No newline at end of file diff --git a/config/locales/cldr/eo_plurals.rb b/config/locales/cldr/eo_plurals.rb new file mode 100644 index 000000000..f671f5986 --- /dev/null +++ b/config/locales/cldr/eo_plurals.rb @@ -0,0 +1 @@ +{ :eo => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file diff --git a/config/locales/cldr/ga_plurals.rb b/config/locales/cldr/ga_plurals.rb index 1301f8b3e..dae23db87 100644 --- a/config/locales/cldr/ga_plurals.rb +++ b/config/locales/cldr/ga_plurals.rb @@ -1 +1 @@ -{ :ga => { :i18n => {:plural => { :keys => [:one, :two, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } } }
\ No newline at end of file +{ :ga => { :i18n => {:plural => { :keys => [:one, :two, :few, :many, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : [3, 4, 5, 6].include?(n) ? :few : [7, 8, 9, 10].include?(n) ? :many : :other } } } } }
\ No newline at end of file diff --git a/config/locales/cldr/mk_plurals.rb b/config/locales/cldr/mk_plurals.rb index 3b2aeb73c..4095fa169 100644 --- a/config/locales/cldr/mk_plurals.rb +++ b/config/locales/cldr/mk_plurals.rb @@ -1 +1 @@ -{ :mk => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n % 10 == 1 ? :one : :other } } } } }
\ No newline at end of file +{ :mk => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n % 10 == 1 && n != 11 ? :one : :other } } } } }
\ No newline at end of file diff --git a/config/locales/cldr/pl_plurals.rb b/config/locales/cldr/pl_plurals.rb index a27d71967..56f825eb2 100644 --- a/config/locales/cldr/pl_plurals.rb +++ b/config/locales/cldr/pl_plurals.rb @@ -1 +1 @@ -{ :pl => { :i18n => {:plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n == 1 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) && ![22, 23, 24].include?(n % 100) ? :few : :other } } } } }
\ No newline at end of file +{ :pl => { :i18n => {:plural => { :keys => [:one, :few, :many, :other], :rule => lambda { |n| n == 1 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n != 1 && [0, 1].include?(n % 10) || [5, 6, 7, 8, 9].include?(n % 10) || [12, 13, 14].include?(n % 100) ? :many : :other } } } } }
\ No newline at end of file diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index a7f3d3191..35fab7a0b 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -85,6 +85,7 @@ en: aspects: zero: "no aspects" one: "1 aspect" + two: "%{count} aspects" few: "%{count} aspects" many: "%{count} aspects" other: "%{count} aspects" @@ -191,6 +192,7 @@ en: comments: zero: "no comments" one: "1 comment" + two: "%{count} comments" few: "%{count} comments" many: "%{count} comments" other: "%{count} comments" @@ -201,6 +203,7 @@ en: contacts: zero: "no contacts" one: "1 contact" + two: "%{count} contacts" few: "%{count} contacts" many: "%{count} contacts" other: "%{count} contacts" @@ -245,6 +248,7 @@ en: new_messages: zero: "No new messages" one: "1 new messages" + two: "%{count} new messages" few: "%{count} new messages" many: "%{count} new messages" other: "%{count} new messages" @@ -326,18 +330,21 @@ en: people_like_this: zero: "no likes" one: "%{count} like" + two: "%{count} likes" few: "%{count} likes" many: "%{count} likes" other: "%{count} likes" people_like_this_comment: zero: "no likes" one: "%{count} like" + two: "%{count} likes" few: "%{count} likes" many: "%{count} likes" other: "%{count} likes" people_dislike_this: zero: "no dislikes" one: "%{count} dislike" + two: "%{count} dislikes" few: "%{count} dislikes" many: "%{count} dislikes" other: "%{count} dislikes" @@ -346,42 +353,49 @@ en: started_sharing: zero: "%{actors} started sharing with you." one: "%{actors} started sharing with you." + two: "%{actors} started sharing with you." few: "%{actors} started sharing with you." many: "%{actors} started sharing with you." other: "%{actors} started sharing with you." private_message: zero: "%{actors} sent you a message." one: "%{actors} sent you a message." + two: "%{actors} sent you a message." few: "%{actors} sent you a message." many: "%{actors} sent you a message." other: "%{actors} sent you a message." comment_on_post: zero: "%{actors} commented on your %{post_link}." one: "%{actors} commented on your %{post_link}." + two: "%{actors} commented on your %{post_link}." few: "%{actors} commented on your %{post_link}." many: "%{actors} commented on your %{post_link}." other: "%{actors} commented on your %{post_link}." also_commented: zero: "%{actors} also commented on %{post_author}'s %{post_link}." one: "%{actors} also commented on %{post_author}'s %{post_link}." + two: "%{actors} also commented on %{post_author}'s %{post_link}." few: "%{actors} also commented on %{post_author}'s %{post_link}." many: "%{actors} also commented on %{post_author}'s %{post_link}." other: "%{actors} also commented on %{post_author}'s %{post_link}." mentioned: zero: "%{actors} has mentioned you in a %{post_link}." one: "%{actors} has mentioned you in a %{post_link}." + two: "%{actors} has mentioned you in a %{post_link}." few: "%{actors} has mentioned you in a %{post_link}." many: "%{actors} has mentioned you in a %{post_link}." other: "%{actors} has mentioned you in a %{post_link}." liked: zero: "%{actors} has just liked your %{post_link}." one: "%{actors} has just liked your %{post_link}." + two: "%{actors} has just liked your %{post_link}." few: "%{actors} has just liked your %{post_link}." many: "%{actors} has just liked your %{post_link}." other: "%{actors} has just liked your %{post_link}." reshared: zero: "%{actors} has reshared your %{post_link}." one: "%{actors} has reshared your %{post_link}." + two: "%{actors} has reshared your %{post_link}." few: "%{actors} has reshared your %{post_link}." many: "%{actors} has reshared your %{post_link}." other: "%{actors} has reshared your %{post_link}." @@ -389,24 +403,28 @@ en: also_commented_deleted: zero: "%{actors} commented on a deleted post." one: "%{actors} commented on a deleted post." + two: "%{actors} commented on a deleted post." few: "%{actors} commented on a deleted post." many: "%{actors} commented on a deleted post." other: "%{actors} commented on a deleted post." liked_post_deleted: zero: "%{actors} liked your deleted post." one: "%{actors} liked your deleted post." + two: "%{actors} liked your deleted post." few: "%{actors} liked your deleted post." many: "%{actors} liked your deleted post." other: "%{actors} liked your deleted post." reshared_post_deleted: zero: "%{actors} reshared your deleted post." one: "%{actors} reshared your deleted post." + two: "%{actors} reshared your deleted post." few: "%{actors} reshared your deleted post." many: "%{actors} reshared your deleted post." other: "%{actors} reshared your deleted post." mentioned_deleted: zero: "%{actors} mentioned you in a deleted post." one: "%{actors} mentioned you in a deleted post." + two: "%{actors} mentioned you in a deleted post." few: "%{actors} mentioned you in a deleted post." many: "%{actors} mentioned you in a deleted post." other: "%{actors} mentioned you in a deleted post." @@ -416,6 +434,7 @@ en: and_others: zero: "and nobody else" one: "and one more" + two: "and %{count} others" few: "and %{count} others" many: "and %{count} others" other: "and %{count} others" @@ -424,6 +443,7 @@ en: new_notifications: zero: "No new notifications" one: "1 new notifications" + two: "%{count} new notifications" few: "%{count} new notifications" many: "%{count} new notifications" other: "%{count} new notifications" @@ -461,6 +481,7 @@ en: people: zero: "no people" one: "1 person" + two: "%{count} people" few: "%{count} people" many: "%{count} people" other: "%{count} people" @@ -615,6 +636,7 @@ en: new_requests: zero: "no new requests" one: "new request!" + two: "%{count} new requests!" few: "%{count} new requests!" many: "%{count} new requests!" other: "%{count} new requests!" @@ -624,6 +646,7 @@ en: reshare: zero: "Reshare" one: "1 reshare" + two: "%{count} reshares" few: "%{count} reshares" many: "%{count} reshares" other: "%{count} reshares" @@ -666,6 +689,7 @@ en: toggle: zero: "Add to aspect" one: "In %{count} aspect" + two: "In %{count} aspects" few: "In %{count} aspects" many: "In %{count} aspects" other: "In %{count} aspects" @@ -731,6 +755,7 @@ en: too_long: zero: "please make your status messages less than %{count} characters" one: "please make your status messages less than %{count} character" + two: "please make your status messages less than %{count} characters" few: "please make your status messages less than %{count} characters" many: "please make your status messages less than %{count} characters" other: "please make your status messages less than %{count} characters" diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml index 4ba57a424..427da07de 100644 --- a/config/locales/javascript/javascript.en.yml +++ b/config/locales/javascript/javascript.en.yml @@ -41,6 +41,7 @@ en: toggle: zero: "Add to aspect" one: "In {{count}} aspect" + two: "In {{count}} aspects" few: "In {{count}} aspects" many: "In {{count}} aspects" other: "In {{count}} aspects" |