mini_i18n 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aaf36c6e857bd3a2b63925d82b9757f6f550c3fc
-  data.tar.gz: ea8e88fdbe0299a90367eb1b92f92e04b2089ab1
+SHA256:
+  metadata.gz: c9f1764e408c5192196c7630a410f22139768cbfb72a315e662e0c66911eec89
+  data.tar.gz: 4410a333ad7565dcf86f6c85186b6e557343a17d2f3b4b71ef727ed2f891f048
 SHA512:
-  metadata.gz: 68d29e18fb17542eb1801d95c743625b5732bd050123e5e1dd17c0db5fcb076aa4f32aed00f8b40243d0076461675ad8d727d92fc136f09c64f4dbb789c23527
-  data.tar.gz: db0a08f461d7204aad83e88bebf9ca29935acb9b4434fc228d30b341c7f2ddc9b2cea483a5c15f434a302f1b96a2618a377e60858997e7c034f73a4e0abed238
+  metadata.gz: 685f079c4337705b59026bf88beb330c88d662ec111c1af8ea5a029638d143c47c2521975c9d8fa8e1db6796ddf7e0a9b6a0d15693a9ae1077cde466e3cc69c5
+  data.tar.gz: cc0357f872d83ab2cd0523d8c3a8f7c265e59f30a4b82d97afeb1ad71f6b85eaf7f73c02154f42edb327904883ee710eede3ddb3e78b549f963728a59edb425b

data/lib/mini_i18n/pluralization.rb

@@ -0,0 +1,23 @@
+module MiniI18n
+  module Pluralization
+    def self.pluralize(mappings, count, locale = MiniI18n.locale)
+      rule = MiniI18n.pluralization_rules.fetch(locale.to_sym, default_rule)
+      mappings[rule.call(count)]
+    end
+
+    private
+
+    def self.default_rule
+      -> (n) {
+        case n
+        when 0
+          'zero'
+        when 1
+          'one'
+        else
+          'other'
+        end
+      }
+    end
+  end
+end

data/lib/mini_i18n/version.rb

@@ -1,3 +1,3 @@
 module MiniI18n
-  VERSION = "0.7.0"
+  VERSION = "0.9.0"
 end

data/lib/mini_i18n.rb

@@ -2,6 +2,7 @@ require "yaml"
 require "mini_i18n/version"
 require "mini_i18n/utils"
 require "mini_i18n/localization"
+require "mini_i18n/pluralization"
 
 module MiniI18n
   class << self
@@ -48,12 +49,20 @@ module MiniI18n
       @@separator = new_separator || DEFAULT_SEPARATOR
     end
 
+    def pluralization_rules
+      @@pluralization_rules ||= {}
+    end
+
+    def pluralization_rules=(new_rules)
+      @@pluralization_rules = new_rules
+    end
+
     def configure
       yield(self) if block_given?
     end
 
     def load_translations(path)
-      Dir[path.to_s].each do |file|
+      Dir[path.to_s].sort.each do |file|
         YAML.load_file(file).each do |locale, new_translations|
           add_translations(locale.to_s, new_translations)
         end
@@ -62,6 +71,7 @@ module MiniI18n
 
     def translate(key, options = {})
       return if key.empty? || translations.empty?
+
       return multiple_translate(key, options) if key.is_a?(Array)
       return multiple_locales(key, options) if options[:locale].is_a?(Array)
 
@@ -76,7 +86,7 @@ module MiniI18n
       result = lookup(*keys)
 
       result = with_fallbacks(result, keys)
-      result = with_pluralization(result, options)
+      result = with_pluralization(result, options, _locale)
       result = with_interpolation(result, options)
 
       result || options[:default]
@@ -123,18 +133,11 @@ module MiniI18n
       result
     end
 
-    def with_pluralization(result, options)
+    def with_pluralization(result, options, locale)
       count = options[:count]
 
       if count && result.is_a?(Hash)
-        case count
-        when 0
-          result = result["zero"]
-        when 1
-          result = result["one"]
-        else
-          result = result["many"]
-        end
+        result = Pluralization.pluralize(result, count, locale)
       end
 
       result

data/spec/fixtures/locales/en.json

@@ -0,0 +1,5 @@
+{
+  "en": {
+    "from_json": "from JSON"
+  }
+}

data/spec/fixtures/locales/en.yml

@@ -7,4 +7,4 @@ en:
   notifications:
     zero: 'no unread notifications'
     one: '1 unread notification'
-    many: '%{count} unread notifications'
+    other: '%{count} unread notifications'

data/spec/fixtures/locales/multiple.yml

@@ -13,6 +13,9 @@ es:
   number:
     as:
       currency: '%{number} €'
+  notifications:
+    zero: 'no hay nuevas notificaciones'
+    other: 'tienes notificaciones por leer'
 
 fr:
   hello: "bonjour"

data/spec/mini_i18n_spec.rb

@@ -6,6 +6,10 @@ RSpec.describe MiniI18n do
       expect(MiniI18n.translations["en"]).to include 'bye'
     end
 
+    it "allows to load translations from JSON" do
+      expect(MiniI18n.t(:from_json)).to eq 'from JSON'
+    end
+
     it "does not raise if path is nil" do
       expect(MiniI18n.load_translations(nil)).to eq []
     end
@@ -42,8 +46,8 @@ RSpec.describe MiniI18n do
       MiniI18n.separator = ' '
       expect(MiniI18n.t('second_level hello')).to eq 'hello 2'
 
-      MiniI18n.separator = '::'
-      expect(MiniI18n.t('second_level::hello')).to eq 'hello 2'
+      MiniI18n.separator = '/'
+      expect(MiniI18n.t('second_level/hello')).to eq 'hello 2'
     end
   end
 
@@ -101,5 +105,16 @@ RSpec.describe MiniI18n do
       expect(MiniI18n.t('notifications', count: 1)).to eq '1 unread notification'
       expect(MiniI18n.t('notifications', count: 5)).to eq '5 unread notifications'
     end
+
+    it "pluralization with custom rules" do
+      MiniI18n.pluralization_rules = {
+        es: -> (n) {
+          n == 0 ? 'zero' : 'other'
+        }
+      }
+
+      expect(MiniI18n.t('notifications', count: 0, locale: :es)).to eq 'no hay nuevas notificaciones'
+      expect(MiniI18n.t('notifications', count: 1, locale: :es)).to eq 'tienes notificaciones por leer'
+    end
   end
 end

metadata

@@ -1,59 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: mini_i18n
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - markets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-22 00:00:00.000000000 Z
+date: 2022-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -90,8 +76,10 @@ extra_rdoc_files: []
 files:
 - lib/mini_i18n.rb
 - lib/mini_i18n/localization.rb
+- lib/mini_i18n/pluralization.rb
 - lib/mini_i18n/utils.rb
 - lib/mini_i18n/version.rb
+- spec/fixtures/locales/en.json
 - spec/fixtures/locales/en.yml
 - spec/fixtures/locales/localization.yml
 - spec/fixtures/locales/multiple.yml
@@ -110,19 +98,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Minimalistic I18n library for Ruby
 test_files:
+- spec/fixtures/locales/en.json
 - spec/fixtures/locales/en.yml
 - spec/fixtures/locales/localization.yml
 - spec/fixtures/locales/multiple.yml