rails-i18n 6.0.0 → 7.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee19c3e12af2df667aee302cd2ceb258b0fac9f63d81595ebc6b9fdc0faaebc3
-  data.tar.gz: 8eb2bc8d881c9d03d42872498d4c84e84417dedab91e638e76519ef88a013ab7
+  metadata.gz: 4f2372c8dc0085d63c3ad30eb3750006e7c0abb57c4055723ab538d9c18904ba
+  data.tar.gz: 4f423f6f72839024985293a1575d057bee2b1ece64ba19b86d6662645e04ca69
 SHA512:
-  metadata.gz: bece6a3c544315a02a4466bfc68d8e1466e3f1810c99ecdfc60cf542f460b43878f4560d4bcb99d136c31b843e4063b25801497bc5c42e410f5ed710ab538509
-  data.tar.gz: a429e15a78bbe0490319f5bb63576a2471affbda7e978231db67b5cce9147c6b456d192cf79dff46bf91861ac22ab9993d1d42eacdfe003bfd311ce0edb08373
+  metadata.gz: b4e22bfeb4e222a7d95daa19c8a0f8d8fbb844a9a0c2ef425cf1fa8e0b06a84ca7aea71b07df74363fccfeb87dbaff80c473c3625264e0709918474b8a736616
+  data.tar.gz: 2f19acdb1b35a82e8c225dcf58c7ae113b6617791a91ce357c01f5e3c742611e8b5ca074e905dfd82f1a2e97d7a088d6733e97df3c68c8f6c991db9f58c3e0d1

data/CHANGELOG.md

@@ -1,4 +1,162 @@
-## 6.0.0
+## unreleased
+
+
+## 7.0.8 (2022-08-15)
+
+- Update following locales:
+  - Bengali (bn): Add missing keys (`almost_x_years`) #1094
+  - English (en-US): Normalize and add missing keys (`in` and `round_mode`) #1095
+  - Korean (ko): Add missing keys (`in` and `round_mode`) #1097
+  - Norwegian (nb): Fix extra `%{count}` interpolation in `has_one` key #1082
+  - Portuguese (pt pt-BR): Add missing keys (`round_mode) #1100
+  - Spanish (es-419 es-AR es-CL es-CO es-CR es-EC es-MX es-NI es-PA es-PE es-US es-VE): Fix typo in word _carácter_ #1090
+  - Spanish (es-419 es-AR es-CL es-CO es-CR es-EC es-ES es-MX es-NI es-PA es-PE es-US es-VE): Normalize and add missing keys (`in`) #1089
+  - Ukranian: Use hryvnia symbol as a currency unit #1093
+
+## 7.0.7 (2022-05-12)
+
+- Non-numerics counts are considered as `other` in all pluralizations #1067
+- Update following locales:
+  - Afrikaan (af): ZAR currency format #1066
+  - English (en-ZA): ZAR currency format #1066
+  - German (de, de-DE, de-AT, de-CH): Use abbreviated months in the short time format #1062
+  - Japanese (ja): Add `in` and `round_mode` keys #1059
+  - Korean (ko): Fix typo in `equal_to` keys #1061
+  - Portuguese (pt, pt-BR): add translation for `errors.messages.in` #1071
+  - Scottish Gaelic (gd): Add locale
+  - Russian (ru): fix some errors in 'datetime' section, add `errors.messages.in` and `number.format.round_mode` keys #1077
+  - Spanish (es): add translation for `errors.messages.in` #1071
+  - French (fr, fr-CA, fr-CH, fr-FR): fix typo on 'almost_x_years: one' #1074
+  - Indonesian (id): Remove duplicate spaces in `id.datetime.distance_in_words.less_than_x_minutes.other` #1079
+  - Romanian (ro): Correction of Saturday in Romanian #1078
+  - Croatian (hr): use lowercase for month and weekday names #1081
+- Add ordinalization for German (de, de-AT, de-CH, de-DE)
+- Remove keys that are present twice from Latvian (lv), Albanian (sq) #1080
+
+## 7.0.6 (2022-11-08)
+
+- Add option to choose which modules (locales, pluralization, transliteration,
+  ordinals) are enabled #1019
+- Add following locales:
+  - Dzongkha (dz) #1052
+  - Sardinian (sc) #1030
+  - Swedish (sv-FI): Finland’s native Swedish-speakers #1055
+- Update following locales:
+  - Bengali (bn): Fix date and spelling issues #1031
+  - Chinese (zh-HK, zh-TW, zh-YUE, zh-CN):
+    - Simplify pluralization #1032 #1033 #1036
+    - Standardize punctuation #997
+  - English (en, en-CY, en-IE, en-TT, en-US, en-ZA):
+    - Add pluralization #1021
+    - Add `in` and `round_mode` keys #1042
+  - French (fr, fr-CA, fr-CH, fr-CA):
+    - Change an abreviation for March month in abbr_month_names #1002
+    - Add `in` and `round_mode` keys #1046
+  - Galician (gl): Add missing accent on `incluído` #961
+  - German (de-AT, de-CH, de-DE, de):
+    - Add transliteration rule for `ẞ` #1025
+    - Add `eb` and `pb` storage units #1043
+    - Add `round_mode` key #1044
+  - Greek (el-CY): Add pluralization #1022
+  - Japanese (ja): Simplify pluralization #1038
+  - Korean (ko):
+    - Language improvements #989
+    - Simplify pluralization #1037
+  - Latvian (lv): Add multiple missing translations #966
+  - Spanish (es, es-419, es-AR, es-CL, es-CO, es-CR, es-ES, es-MX, es-NI, es-PA,
+    es-PE, es-US, es-VE): Add `round_mode` key #1045
+  - Swedish (sv-SE): Adjust precision and add some missing keys #1047
+  - Vietnamese (vi):
+    - Update translation for taken #1009
+    - Simplify pluralization #1035
+- Removed pluralizations rules that do not have locale files: ak, am, bh, bm,
+  bo, br, by, cy, dz, ff, ga, gd, guw, gv, ig, ii, iu, jv, kab, kde, kea, ksh,
+  kw, lag, ln, mo, mt, my, naq, nso, root, sah, se, ses, sg, sh, shi, sma, smi,
+  smj, smn, sms, ti, to, tzm, wa, yo, zh #1017
+- Change instances of the `one` pluralization key to use `%{count}` interpolation #993
+
+## 7.0.5 (2022-07-03)
+
+- No changes.
+
+## 7.0.4 (2022-07-03)
+
+- Add following locales:
+  - Western Frisian (fy) #985
+  - Kazakh (kk) #945
+- Update following locales:
+  - Slovak (sk): Fixed missing message #994
+  - French (fr): Revert remainder of NBSP characters #996
+  - French (fr): Use no-padded date format #991
+  - Arabic (ar): fix errors.messages.greater_than typo #998
+  - South slavic pluralizers #987
+- Update update.rb to fetch active_model locale #1000
+- Remove eager loading of translations during boot phase (this is now done by Rails). #983
+
+## 7.0.3 (2022-03-01)
+
+- Revert long date formats on default "en" locale #980
+
+## 7.0.2 (2022-02-12)
+
+- Fix long date format for many locales #939 #943
+- Update following locales:
+  - Chinese (zh-TW) #941
+  - Croatian (hr) #940
+  - Danish (da) #802 #946 #947 #948
+  - Finnish (fi) #949
+  - French (fr) #968
+  - Galician (gl) #961
+  - Papiamento (pap-AW, pap-CW) #974 #975
+  - Serbian (sr) #972
+  - Spanish (es, es-CL, es-ES) #936
+  - Swedish (sv) #935
+  - Tamil (ta) #953
+- Fix require statement in `rails/pluralization/tr` #964
+- Add rails/ordinals to s.files in Gemspec #969
+- Update i18n-tasks to be ActiveSupport 7+ ready #970
+
+## 7.0.1 (2021-12-24)
+
+- Fix ordinals loading.
+
+## 7.0.0 (2021-12-23)
+
+- Support Rails 7
+- Drop support for Ruby 1.8
+- Eager load translations during boot phase if possible.
+- Translate ordinals (fr, fr-FR, fr-CA, fr-BE)
+- Update following locales:
+  - Albanian (sq)
+  - Catalan (ca)
+  - Chinese (zh-CN, zh-TW)
+  - Croatian (hr)
+  - Danish (da)
+  - Finnish (fi)
+  - French (fr, fr-FR, fr-CA, fr-BE)
+  - Georgian (ka)
+  - German (de)
+  - Greek (el, el-CY)
+  - Italian (it, it-CH)
+  - Latvian (lv)
+  - Lithuanian (lt)
+  - Norwegian (nb)
+  - Polish (pl)
+  - Portuguese (pt-BR)
+  - Romanian (ro)
+  - Serbian (sr)
+  - Spanish (es-CO, es-AR)
+  - Swedish (sv)
+  - Turkish (tr)
+  - Ukrainian (uk)
+  - Vietnamese (vi)
+- Add following locales:
+  - English Trinidad & Tobago (en-TT)
+  - Papiamento (pap-AW, pap-CW)
+  - Sesotho (st)
+
+## 6.0.0 (2019-08-17)
+
 - Update rails-i18n.gemspec to use Railties 6.0.0
 - Add Malagasy (mg) locale
 - Update following locales:

data/README.md

@@ -2,7 +2,7 @@ Rails Locale Data Repository
 ============================
 
 [![Gem Version](https://badge.fury.io/rb/rails-i18n.svg)](http://badge.fury.io/rb/rails-i18n)
-[![Build Status](https://secure.travis-ci.org/svenfuchs/rails-i18n.svg)](http://travis-ci.org/svenfuchs/rails-i18n)
+[![CI](https://github.com/svenfuchs/rails-i18n/actions/workflows/ci.yml/badge.svg)](https://github.com/svenfuchs/rails-i18n/actions/workflows/ci.yml)
 
 Centralization of locale data collection for Ruby on Rails.
 
@@ -11,7 +11,8 @@ Centralization of locale data collection for Ruby on Rails.
 Include the gem to your Gemfile:
 
 ``` ruby
-gem 'rails-i18n', '~> 6.0.0.beta1' # For 6.0.0.beta1 or higher
+gem 'rails-i18n', '~> 7.0.0' # For 7.0.0
+gem 'rails-i18n', '~> 6.0' # For 6.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
@@ -23,7 +24,8 @@ gem 'rails-i18n', github: 'svenfuchs/rails-i18n', branch: 'rails-3-x' # For 3.x
 Alternatively, execute the following command:
 
 ``` shell
-gem install rails-i18n -v '~> 6.0.0.beta1' # For 6.0.0.beta1 or higher
+gem install rails-i18n -v '~> 7.0.0' # For 7.0.0
+gem install rails-i18n -v '~> 6.0' # For 6.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
@@ -33,6 +35,31 @@ Note that your Ruby on Rails version must be 3.0 or higher in order to install t
 
 ## Configuration
 
+### Enabled modules
+
+By default, all `rails-i18n` modules (locales, pluralization, transliteration, ordinals) are enabled.
+
+If you would like to only enable specific modules, you can do so in your Rails configuration:
+
+```ruby
+# to enable only pluralization rules, but disable all other features
+config.rails_i18n.enabled_modules = [:pluralization]
+
+# to enable pluralization and ordinals
+config.rails_i18n.enabled_modules = [:pluralization, :ordinals]
+```
+
+The possible module names:
+
+* `:locale`
+* `:ordinals`
+* `:pluralization`
+* `:transliteration`
+
+Setting `enabled_modules` will restrict the gem's loaded features to only the specific types.
+
+### Available locales
+
 `rails-i18n` gem initially loads all available locale files, pluralization and transliteration rules. This default behaviour can be changed. If you specify in `config/environments/*` the locales which have to be loaded via `I18n.available_locales` option:
 
 ``` ruby
@@ -59,27 +86,41 @@ Locale data whose structure is compatible with Rails 2.3 are available on the se
 
 ## Available Locales
 
-Available locales:
+**Available locales:**
+
+af, ar, az, be, bg, bn, bs, ca, cs, csb, da, de, de-AT, de-CH, de-DE, dsb, dz, el, el-CY, en, en-AU, en-CA, en-CY, en-GB, en-IE, en-IN, en-NZ, en-TT, en-US, en-ZA, eo, es, es-419, es-AR, es-CL, es-CO, es-CR, es-EC, es-ES, es-MX, es-NI, es-PA, es-PE, es-US, es-VE, et, eu, fa, fi, fr, fr-CA, fr-CH, fr-FR, fur, fy, gl, gsw-CH, he, hi, hi-IN, hr, hsb, hu, id, is, it, it-CH, ja, ka, kk, km, kn, ko, lb, lo, lt, lv, mg, mk, ml, mn, mr-IN, ms, nb, ne, nl, nn, oc, or, pa, pap-AW, pap-CW, pl, pt, pt-BR, rm, ro, ru, sc, scr, sk, sl, sq, sr, st, sv, sv-FI, sv-SE, sw, ta, te, th, tl, tr, tt, ug, uk, ur, uz, vi, wo, zh-CN, zh-HK, zh-TW, zh-YUE
 
-> af, ar, az, be, bg, bn, bs, ca, cs, cy, da, de, de-AT, de-CH, de-DE, el, el-CY,
-> en, en-AU, en-CA, en-GB, en-IE, en-IN, en-NZ, en-US, en-ZA, en-CY,eo, es,
-> es-419, es-AR, es-CL, es-CO, es-CR, es-EC, es-ES, es-MX, es-NI, es-PA, es-PE, es-US, es-VE,
-> et, eu, fa, fi, fr, fr-CA, fr-CH, fr-FR, gl, he, hi, hi-IN, hr, hu, id, is, it,
-> it-CH, ja, ka, km, kn, ko, lb, lo, lt, lv, mk, ml, mn, mr-IN, ms, nb, ne, nl, nn, oc, or,
-> pa, pl, pt, pt-BR, rm, ro, ru, sk, sl, sq, sr, sw, ta, te, th, tl, tr, tt, ug,
-> ur, uz, vi, wo, zh-CN, zh-HK, zh-TW, zh-YUE
+**Complete locales:**
 
-Complete locales:
+en, en-US, es, es-419, es-AR, es-CL, es-CO, es-CR, es-EC, es-ES, es-MX, es-NI, es-PA, es-PE, es-US, es-VE, fr, fr-CA, fr-CH, fr-FR, gd, ja, pt, pt-BR, ru, sc
+
+**Locales with missing pluralization rules**
+
+af, csb, dsb, fur, gsw-CH, lb, rm, scr, sq, te, tt, ug, uz
+
+**Removed locales:**
+
+cy
+
+The cy locale was removed in commit 84f6c6b9b7a3e50df2b1fb1ccf7add329f7eab4f since unfortunately we could not find a Welsh speaker to support it.
+We would welcome contributions to add it back to the project.
+The locale is mostly complete for the missing translations please refer to [#1006](https://github.com/svenfuchs/rails-i18n/issues/1006)
+
+**Removed pluralizations:**
+
+ak, am, bh, bm, bo, br, by, cy, dz, ff, ga, gd, guw, gv, ig, ii, iu, jv, kab, kde, kea, ksh, kw, lag, ln, mo, mt, my, naq, nso, root, sah, se, ses, sg, sh, shi, sma, smi, smj, smn, sms, ti, to, tzm, wa, yo, zh
+
+The above pluralization rules were removed because they did not have corresponding locale files.
 
-> af, da, de, de-AT, de-CH, de-DE, en-US, es, es-419, es-AR, es-CL, es-CO, es-CR, es-EC,
-> es-ES, es-MX, es-NI, es-PA, es-PE, es-US, es-VE, et, fa, fr, fr-CA, fr-CH, fr-FR, id, ja, ka, ml, nb,
-> nl, nn, pt, pt-BR, sv, sv-SE, tr, zh-CN, zh-HK, zh-TW, zh-YUE, uk
 
 Currently, most locales are incomplete. Typically they lack the following keys:
 
 - `activerecord.errors.messages.record_invalid`
 - `activerecord.errors.messages.restrict_dependent_destroy.has_one`
 - `activerecord.errors.messages.restrict_dependent_destroy.has_many`
+
+The following keys should NOT be included:
+
 - `errors.messages.model_invalid`
 - `errors.messages.required`
 
@@ -113,7 +154,7 @@ If you are familiar with GitHub operations, then follow the procedures described
 
 If not,
 
-* Save your locale data on the [Gist](http://gist.github.com).
+* Save your locale data in a [Gist](http://gist.github.com).
 * Open an issue with reference to the Gist you created.
 
 ### Fetching the `rails-i18n` Repository
@@ -130,6 +171,7 @@ If not,
 ### Testing your Locale File
 
 Before committing and pushing your changes, test the integrity of your locale file.
+(You can also run the tests using Docker, see below)
 
 ``` shell
 bundle exec rake spec
@@ -176,6 +218,45 @@ If you are ready, push the repository into the Github and send us a pull request
 
 We will do the formality check and publish it as quick as we can.
 
+### Add an informative title to your pull request or issue
+
+If your pull request or issue concerns a specific locale - please indicate the relevant locale
+in the issue or pull request title in order to facilitate triage.
+
+**Best:**
+
+*Danish: change da.errors.messages.required to "skal udfyldes"*
+
+**Good:**
+
+*Human precision in Swedish locale file is set to 1*
+
+*Update es-PE.yml, the currency unit is incorrect*
+
+**Bad:**
+
+*Changing some string about validation*
+
+### Docker
+
+Build the image:
+
+```
+docker build --tag=railsi18n .
+```
+
+Run the tests:
+
+```
+docker run railsi18n
+```
+
+To run the other commands described above:
+
+```
+docker run railsi18n bundle exec rake i18n-spec:completeness rails/locale/en.yml rails/locale/YOUR_NEW_LOCALE.yml
+```
+
 ## See also
 
 * [devise-i18n](https://github.com/tigrish/devise-i18n)

data/lib/rails_i18n/common_pluralizations/east_slavic.rb

@@ -1,12 +1,11 @@
 # Originally was implemented by Yaroslav Markin in "russian" gem
 # (http://github.com/yaroslav/russian)
 #
-# Used for Belarusian, Bosnian, Croatian, Russian, Serbian, Serbo-Croatian, Ukrainian.
+# Used for Belarusian, Russian, Ukrainian.
 
 module RailsI18n
   module Pluralization
     module EastSlavic
-
       FROM_2_TO_4   = (2..4).to_a.freeze
       FROM_5_TO_9   = (5..9).to_a.freeze
       FROM_11_TO_14 = (11..14).to_a.freeze
@@ -14,7 +13,8 @@ module RailsI18n
 
       def self.rule
         lambda do |n|
-          n ||= 0
+          return :other unless n.is_a?(Numeric)
+
           mod10 = n % 10
           mod100 = n % 100
 

data/lib/rails_i18n/common_pluralizations/one_few_other.rb

@@ -0,0 +1,39 @@
+module RailsI18n
+  module Pluralization
+    module OneFewOther
+      FROM_2_TO_4   = (2..4).to_a.freeze
+      FROM_12_TO_14 = (12..14).to_a.freeze
+
+      def self.rule
+        lambda do |n|
+          return :other unless n.is_a?(Numeric)
+
+          frac = (n.to_d % 1)
+
+          if frac.nonzero?
+            n = frac.to_s.split('.').last.to_i
+          end
+
+          mod10 = n % 10
+          mod100 = n % 100
+
+          if mod10 == 1 && mod100 != 11
+            :one
+          elsif FROM_2_TO_4.include?(mod10) && !FROM_12_TO_14.include?(mod100)
+            :few
+          else
+            :other
+          end
+        end
+      end
+
+      def self.with_locale(locale)
+          { locale => {
+              :i18n => {
+                :plural => {
+                  :keys => [:one, :few, :other],
+                  :rule => rule }}}}
+      end
+    end
+  end
+end

data/lib/rails_i18n/common_pluralizations/one_other.rb

@@ -16,4 +16,4 @@ module RailsI18n
       end
     end
   end
-end
+end

data/lib/rails_i18n/common_pluralizations/one_two_other.rb

@@ -6,12 +6,10 @@ module RailsI18n
     module OneTwoOther
       def self.rule
         lambda do |n|
-          if n == 1
-            :one
-          elsif n == 2
-            :two
-          else
-            :other
+          case n
+          when 1 then :one
+          when 2 then :two
+          else :other
           end
         end
       end
@@ -25,4 +23,4 @@ module RailsI18n
       end
     end
   end
-end
+end

data/lib/rails_i18n/common_pluralizations/one_upto_two_other.rb

@@ -4,7 +4,9 @@ module RailsI18n
   module Pluralization
     module OneUptoTwoOther
       def self.rule
-        lambda { |n| n && n >= 0 && n < 2 ? :one : :other }
+        lambda do |n|
+          n.is_a?(Numeric) && n >= 0 && n < 2 ? :one : :other
+        end
       end
 
       def self.with_locale(locale)
@@ -16,4 +18,4 @@ module RailsI18n
       end
     end
   end
-end
+end

data/lib/rails_i18n/common_pluralizations/one_with_zero_other.rb

@@ -5,7 +5,12 @@ module RailsI18n
   module Pluralization
     module OneWithZeroOther
       def self.rule
-        lambda { |n| n == 0 || n == 1 ? :one : :other }
+        lambda do |n|
+          case n
+          when 0, 1 then :one
+          else :other
+          end
+        end
       end
 
       def self.with_locale(locale)

data/lib/rails_i18n/common_pluralizations/romanian.rb

@@ -3,12 +3,15 @@
 module RailsI18n
   module Pluralization
     module Romanian
+      FROM_1_TO_19 = (1..19).to_a.freeze
+
       def self.rule
         lambda do |n|
-          n ||= 0
+          return :other unless n.is_a?(Numeric)
+
           if n == 1
             :one
-          elsif n == 0 || (1..19).to_a.include?(n % 100)
+          elsif n == 0 || FROM_1_TO_19.include?(n % 100)
             :few
           else
             :other

data/lib/rails_i18n/common_pluralizations/west_slavic.rb

@@ -5,12 +5,10 @@ module RailsI18n
     module WestSlavic
       def self.rule
         lambda do |n|
-          if n == 1
-            :one
-          elsif [2, 3, 4].include?(n)
-            :few
-          else
-            :other
+          case n
+          when 1 then :one
+          when 2, 3, 4 then :few
+          else :other
           end
         end
       end

data/lib/rails_i18n/railtie.rb

@@ -2,13 +2,19 @@ require 'rails'
 
 module RailsI18n
   class Railtie < ::Rails::Railtie #:nodoc:
+    config.rails_i18n = RailsI18n
+
     initializer 'rails-i18n' do |app|
       RailsI18n::Railtie.instance_eval do
         pattern = pattern_from app.config.i18n.available_locales
 
-        add("rails/locale/#{pattern}.yml")
-        add("rails/pluralization/#{pattern}.rb")
-        add("rails/transliteration/#{pattern}.{rb,yml}")
+        if app.config.rails_i18n.enabled_modules.empty?
+          RailsI18n.enabled_modules = Set.new([:locale, :pluralization, :ordinals, :transliteration])
+        end
+
+        RailsI18n.enabled_modules.each do |feature|
+          add("rails/#{feature}/#{pattern}.{rb,yml}")
+        end
 
         init_pluralization_module
       end

data/lib/rails_i18n.rb

@@ -1,2 +1,11 @@
-require 'rails_i18n/unicode'
+module RailsI18n
+  def self.enabled_modules
+    @enabled_modules ||= Set.new
+  end
+
+  def self.enabled_modules=(other)
+    @enabled_modules = Set.new(other)
+  end
+end
+
 require 'rails_i18n/railtie'

data/rails/locale/af.yml

@@ -40,8 +40,8 @@ af:
     - Saterdag
     formats:
       default: "%Y-%m-%d"
-      long: "%B %d, %Y"
-      short: "%b %d"
+      long: "%d %B %Y"
+      short: "%d %b"
     month_names:
     - 
     - Januarie
@@ -63,41 +63,41 @@ af:
   datetime:
     distance_in_words:
       about_x_hours:
-        one: ongeveer 1 uur
+        one: ongeveer %{count} uur
         other: ongeveer %{count} ure
       about_x_months:
-        one: ongeveer 1 maand
+        one: ongeveer %{count} maand
         other: ongeveer %{count} maande
       about_x_years:
-        one: ongeveer 1 jaar
+        one: ongeveer %{count} jaar
         other: ongeveer %{count} jaar
       almost_x_years:
-        one: sowat 1 jaar
+        one: sowat %{count} jaar
         other: sowat %{count} jaar
       half_a_minute: halfminuut
       less_than_x_seconds:
-        one: minder as 1 sekonde
+        one: minder as %{count} sekonde
         other: minder as %{count} sekondes
       less_than_x_minutes:
-        one: minder as 1 minuut
+        one: minder as %{count} minuut
         other: minder as %{count} minute
       over_x_years:
-        one: meer as 1 jaar
+        one: meer as %{count} jaar
         other: meer as %{count} jaar
       x_seconds:
-        one: 1 sekonde
+        one: "%{count} sekonde"
         other: "%{count} sekondes"
       x_minutes:
-        one: 1 minuut
+        one: "%{count} minuut"
         other: "%{count} minute"
       x_days:
-        one: 1 dag
+        one: "%{count} dag"
         other: "%{count} days"
       x_months:
-        one: 1 maand
+        one: "%{count} maand"
         other: "%{count} maande"
       x_years:
-        one: 1 jaar
+        one: "%{count} jaar"
         other: "%{count} jare"
     prompts:
       second: Sekondes
@@ -131,18 +131,18 @@ af:
       required: moet bestaan
       taken: is reeds geneem
       too_long:
-        one: is te lank (maksimum is 1 karakter)
+        one: is te lank (maksimum is %{count} karakter)
         other: is te lank (maksimum is %{count} karakters)
       too_short:
-        one: is te kort (minimum is 1 karakter)
+        one: is te kort (minimum is %{count} karakter)
         other: is te kort (minimum is %{count} karakters)
       wrong_length:
-        one: is die verkeerde lengte (moet 1 karakter wees)
+        one: is die verkeerde lengte (moet %{count} karakter wees)
         other: is die verkeerde lengte (moet %{count} karakters wees)
     template:
       body: 'There were problems with the following fields:'
       header:
-        one: 1 fout het verhoed dat hierdie %{model} gestoor kon word
+        one: "%{count} fout het verhoed dat hierdie %{model} gestoor kon word"
         other: "%{count} foute het verhoed dat hierdie %{model} gestoor kon word"
   helpers:
     select:
@@ -154,10 +154,10 @@ af:
   number:
     currency:
       format:
-        delimiter: ","
-        format: "%u%n"
+        delimiter: " "
+        format: "%u %n"
         precision: 2
-        separator: "."
+        separator: ","
         significant: false
         strip_insignificant_zeros: false
         unit: R
@@ -208,6 +208,6 @@ af:
     am: vm
     formats:
       default: "%a, %d %b %Y %H:%M:%S %z"
-      long: "%B %d, %Y %H:%M"
+      long: "%d %B %Y %H:%M"
       short: "%d %b %H:%M"
     pm: nm

data/rails/locale/ar.yml

@@ -157,7 +157,7 @@ ar:
       equal_to: يجب أن يساوي طول %{attribute} %{count}
       even: يجب أن يكون عدد %{attribute} زوجياً
       exclusion: حقل %{attribute} محجوز
-      greater_than: ميجب أن يكون عدد %{attribute} أكبر من %{count}
+      greater_than: يجب أن يكون عدد %{attribute} أكبر من %{count}
       greater_than_or_equal_to: يجب أن يكون عدد %{attribute} أكبر أو يساوي %{count}
       inclusion: "%{attribute} غير وارد في القائمة"
       invalid: محتوى %{attribute} غير صالح
@@ -272,7 +272,7 @@ ar:
   time:
     am: صباحًا
     formats:
-      default: "%a %b %d %H:%M:%S %Z %Y"
-      long: "%d %B, %Y %H:%M"
+      default: "%a %d %b %Y %H:%M:%S %Z"
+      long: "%d %B %Y %H:%M"
       short: "%d %b %H:%M"
     pm: مساءً