rails-i18n 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caf7ca85a58443cc7b215c0f9be710496bfae822
-  data.tar.gz: 6af15fca368eebee2c5a64b4f1efb02ae6f8d9a3
+  metadata.gz: b61e760abe85cc4279efbaa6439a3d2281c1b646
+  data.tar.gz: 18971bd69e304770bb238cd1d7964c7bd789884a
 SHA512:
-  metadata.gz: 8233c1b84fbe1bd2a9edcc21880a5f633decf36e1c5a654a91d3072357ff051d82dd662d4020030514bc2ca623416c574c24746d5dd63bda9a11905a24a79cc8
-  data.tar.gz: 00ae026a2c6e6e58e94cfcb474a917920f46a873b61cd3e3be75a38cc0e5c2b738dada783c42773f75b4ad70064606c5a30815dc0376642a9bdf3879aae9dca9
+  metadata.gz: 9dec3ac307def0bbc29ca70b0a3fd659dcd6edcded26a38d9c1cf632c20f80d8b4f47ac9edb82e60ae16f0c3cfcdda307682c5f65b6df32f05283f630a8ea60b
+  data.tar.gz: 25257c2508e5aeead543584096ce8f562db9e5c340f51cd87660e4c819b0f8435a9c0d25544419035853b41ee21c95f89d7452d715656cafa86e188c01248fae

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 5.1.1 (2018-02-26)
+- Fix #767 (New Chinese pluralization rules break stuff)
+
 ## 5.1.0 (2018-02-14)
 - Add following locales:
   - Spanish (Nicaragua) (es-NI)

data/README.md

@@ -10,18 +10,18 @@ Central point to collect locale data for use in Ruby on Rails.
 
 Add to your Gemfile:
 
-    gem 'rails-i18n', '~> 5.0.0' # For 5.0.x and 5.1.x
-    gem 'rails-i18n', '~> 4.0.0' # For 4.0.x
-    gem 'rails-i18n', '~> 3.0.0' # For 3.x
+    gem 'rails-i18n', '~> 5.1' # For 5.0.x, 5.1.x and 5.2.x
+    gem 'rails-i18n', '~> 4.0' # For 4.0.x
+    gem 'rails-i18n', '~> 3.0' # For 3.x
     gem 'rails-i18n', github: 'svenfuchs/rails-i18n', branch: 'master' # For 5.x
     gem 'rails-i18n', github: 'svenfuchs/rails-i18n', branch: 'rails-4-x' # For 4.x
     gem 'rails-i18n', github: 'svenfuchs/rails-i18n', branch: 'rails-3-x' # For 3.x
 
 or run this command:
 
-    gem install rails-i18n -v '~> 5.0.0' # For 5.0.x and 5.1.x
-    gem install rails-i18n -v '~> 4.0.0' # For 4.0.x
-    gem install rails-i18n -v '~> 3.0.0' # For 3.x
+    gem install rails-i18n -v '~> 5.1' # For  For 5.0.x, 5.1.x and 5.2.x
+    gem install rails-i18n -v '~> 4.0' # For 4.0.x
+    gem install rails-i18n -v '~> 3.0' # For 3.x
 
 Note that your rails version must be 3.0 or higher if you want to install `rails-i18n` as a gem. For rails 2.x, install it manually as described below.
 
@@ -157,6 +157,7 @@ We will do the formality check and publish it as quick as we can.
 
 * [devise-i18n](https://github.com/tigrish/devise-i18n)
 * [will-paginate-i18n](https://github.com/tigrish/will-paginate-i18n)
+* [kaminari-i18n](https://github.com/tigrish/kaminari-i18n)
 * [i18n-country-translation](https://github.com/onomojo/i18n-country-translations) for translations of country names
 * [i18n-spec](https://github.com/tigrish/i18n-spec) for RSpec matchers to test your locale files
 * [iso](https://github.com/tigrish/iso) for the list of valid language/region codes and their translations

data/rails/locale/zh-CN.yml

@@ -62,43 +62,19 @@ zh-CN:
     - :day
   datetime:
     distance_in_words:
-      about_x_hours:
-        one: 大约一小时
-        other: 大约 %{count} 小时
-      about_x_months:
-        one: 大约一个月
-        other: 大约 %{count} 个月
-      about_x_years:
-        one: 大约一年
-        other: 大约 %{count} 年
-      almost_x_years:
-        one: 接近一年
-        other: 接近 %{count} 年
+      about_x_hours: 大约 %{count} 小时
+      about_x_months: 大约 %{count} 个月
+      about_x_years: 大约 %{count} 年
+      almost_x_years: 接近 %{count} 年
       half_a_minute: 半分钟
-      less_than_x_minutes:
-        one: 不到一分钟
-        other: 不到 %{count} 分钟
-      less_than_x_seconds:
-        one: 不到一秒
-        other: 不到 %{count} 秒
-      over_x_years:
-        one: 一年多
-        other: "%{count} 年多"
-      x_days:
-        one: 一天
-        other: "%{count} 天"
-      x_minutes:
-        one: 一分钟
-        other: "%{count} 分钟"
-      x_months:
-        one: 一个月
-        other: "%{count} 个月"
-      x_years:
-        one: 一年
-        other: "%{count} 年"
-      x_seconds:
-        one: 一秒
-        other: "%{count} 秒"
+      less_than_x_minutes: 不到 %{count} 分钟
+      less_than_x_seconds: 不到 %{count} 秒
+      over_x_years: "%{count} 年多"
+      x_days: "%{count} 天"
+      x_minutes: "%{count} 分钟"
+      x_months: "%{count} 个月"
+      x_years: "%{count} 年"
+      x_seconds: "%{count} 秒"
     prompts:
       day: 日
       hour: 时
@@ -129,21 +105,13 @@ zh-CN:
       odd: 必须为单数
       required: 必须存在
       taken: 已经被使用
-      too_long:
-        one: 过长（最长为一个字符）
-        other: 过长（最长为 %{count} 个字符）
-      too_short:
-        one: 过短（最短为一个字符）
-        other: 过短（最短为 %{count} 个字符）
-      wrong_length:
-        one: 长度非法（必须为一个字符）
-        other: 长度非法（必须为 %{count} 个字符）
+      too_long: 过长（最长为 %{count} 个字符）
+      too_short: 过短（最短为 %{count} 个字符）
+      wrong_length: 长度非法（必须为 %{count} 个字符）
       other_than: 长度非法（不可为 %{count} 个字符
     template:
       body: 如下字段出现错误：
-      header:
-        one: 有 1 个错误发生导致“%{model}”无法被保存。
-        other: 有 %{count} 个错误发生导致“%{model}”无法被保存。
+      header: 有 %{count} 个错误发生导致“%{model}”无法被保存。
   helpers:
     select:
       prompt: 请选择
@@ -185,9 +153,7 @@ zh-CN:
       storage_units:
         format: "%n %u"
         units:
-          byte:
-            one: Byte
-            other: Bytes
+          byte: 字节
           gb: GB
           kb: KB
           mb: MB

data/rails/pluralization/zh-CN.rb

@@ -1,3 +1,3 @@
-require 'rails_i18n/common_pluralizations/one_other'
+require 'rails_i18n/common_pluralizations/other'
 
-::RailsI18n::Pluralization::OneOther.with_locale(:'zh-CN')
+::RailsI18n::Pluralization::Other.with_locale(:'zh-CN')

data/rails/pluralization/zh-HK.rb

@@ -1,3 +1,3 @@
-require 'rails_i18n/common_pluralizations/one_other'
+require 'rails_i18n/common_pluralizations/other'
 
-::RailsI18n::Pluralization::OneOther.with_locale(:'zh-HK')
+::RailsI18n::Pluralization::Other.with_locale(:'zh-HK')

data/rails/pluralization/zh-TW.rb

@@ -1,3 +1,3 @@
-require 'rails_i18n/common_pluralizations/one_other'
+require 'rails_i18n/common_pluralizations/other'
 
-::RailsI18n::Pluralization::OneOther.with_locale(:'zh-TW')
+::RailsI18n::Pluralization::Other.with_locale(:'zh-TW')

data/rails/pluralization/zh-YUE.rb

@@ -1,3 +1,3 @@
-require 'rails_i18n/common_pluralizations/one_other'
+require 'rails_i18n/common_pluralizations/other'
 
-::RailsI18n::Pluralization::OneOther.with_locale(:'zh-YUE')
+::RailsI18n::Pluralization::Other.with_locale(:'zh-YUE')

data/rails/pluralization/zh.rb

@@ -1,3 +1,3 @@
-require 'rails_i18n/common_pluralizations/one_other'
+require 'rails_i18n/common_pluralizations/other'
 
-::RailsI18n::Pluralization::OneOther.with_locale(:zh)
+::RailsI18n::Pluralization::Other.with_locale(:zh)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-i18n
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Rails I18n Group
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n