releaf-i18n_database 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a615154a3caf016ba53da44efe406cb12669e3b
-  data.tar.gz: 9d6fbb903b29fbfc9905a65329fbcc785a28abee
+  metadata.gz: d7ce7261adffcef80eeae554ebd065fd1184cb2e
+  data.tar.gz: b650feda888ca31f88229e99e45769b0bb102153
 SHA512:
-  metadata.gz: c2d5ab814fbf1b199c4422e6bf766ebb9adea25dd384d743d20250d0db697e8a79c33b591d9edb290423e4210b0aeb711840119f2afa7aa6c2c75193ed464a26
-  data.tar.gz: 104410b9c5d1604958c6686af93ef4c466541cd402a99cf03b160bf09f92a046618011b660315b8244942bef1f7263677eb23a09d5142509751c4ed7d6226895
+  metadata.gz: 0e18e5b7741bd21daec495cdbe6dae889a552214b453797f830e8ded89b045fa6958d1bd8186283ac08186b087691150b2039cc0bc2e28745334b0e354cf5643
+  data.tar.gz: b9b0051f920eb42253cefde4500261918462f44d2abefddf48c021fb7911df6e881473b1fa009ba7b846bdb1bdbed6ee07be13dbc65c5b115f58bb1b1f7fe8e1

data/app/lib/releaf/i18n_database/translations_store.rb

@@ -56,8 +56,7 @@ class Releaf::I18nDatabase::TranslationsStore
   end
 
   def valid_pluralized_result?(locale, count, result)
-    return false unless TwitterCldr.supported_locale?(locale)
-    result.key?(TwitterCldr::Formatters::Plurals::Rules.rule_for(count, locale))
+    result.key?(I18n.t(:'i18n.plural.rule', locale: locale, resolve: false).call(count))
   end
 
   def returnable_result?(result, options)

data/lib/releaf-i18n_database.rb

@@ -1,6 +1,6 @@
 require 'axlsx_rails'
-require 'twitter_cldr'
 require 'i18n'
+require 'rails-i18n'
 require 'roo'
 
 module Releaf::I18nDatabase
@@ -13,4 +13,3 @@ module Releaf::I18nDatabase
     [Releaf::I18nDatabase::Backend, Releaf::I18nDatabase::HumanizeMissingTranslations]
   end
 end
-

data/lib/releaf/i18n_database/backend.rb

@@ -4,12 +4,15 @@ module Releaf
   module I18nDatabase
     class Backend
 
-      include ::I18n::Backend::Base, ::I18n::Backend::Flatten
+      include ::I18n::Backend::Base
+      include ::I18n::Backend::Flatten
+      include ::I18n::Backend::Pluralization
+
       UPDATED_AT_KEY = 'releaf.i18n_database.translations.updated_at'
       DEFAULT_CONFIG = {
         translation_auto_creation: true,
         translation_auto_creation_patterns: [/.*/],
-        translation_auto_creation_exclusion_patterns: [/^attributes\./]
+        translation_auto_creation_exclusion_patterns: [/^attributes\./, /^i18n\./]
       }
       attr_accessor :translations_cache
 
@@ -18,9 +21,11 @@ module Releaf
       end
 
       def self.locales_pluralizations
-        Releaf.application.config.all_locales.map do|locale|
-          TwitterCldr::Formatters::Plurals::Rules.all_for(locale) if TwitterCldr.supported_locale?(locale)
-        end.flatten.uniq.compact
+        keys = Releaf.application.config.all_locales.map{ |locale| I18n.t(:'i18n.plural.keys', locale: locale) }.flatten
+        # always add zero as it skipped for some locales even when there is zero form (lv for example)
+        keys << :zero
+
+        keys.uniq
       end
 
       def self.configure_component

data/spec/features/translations_spec.rb

@@ -335,6 +335,7 @@ feature "Translations" do
       context "with nonexistent translation" do
         before do
           allow(Releaf.application.config).to receive(:all_locales).and_return(["ru", "lv"])
+          allow(I18n).to receive(:locale_available?).and_return(true)
         end
 
         it "creates empty translation" do
@@ -378,4 +379,48 @@ feature "Translations" do
       end
     end
   end
+
+
+  describe "pluralization" do
+
+    before do
+      locales = [:lv, :ru]
+      allow(I18n.config).to receive(:available_locales).and_return(locales)
+      allow(Releaf.application.config).to receive(:available_locales).and_return(locales)
+      allow(Releaf.application.config).to receive(:all_locales).and_return(locales)
+
+      I18n.reload!
+
+      [:few, :many, :one, :other, :zero].each do |rule|
+        translation = Releaf::I18nDatabase::I18nEntry.create!(key: "public.years.#{rule}")
+        locales.each do |locale|
+          translation.i18n_entry_translation.create!( locale: locale.to_s, text: "years #{locale} #{rule} XX" )
+        end
+      end
+
+      Releaf::I18nDatabase::Backend.reset_cache
+    end
+
+    after do
+      # force I18n reloading to restore the original state.
+      # for this to work, the stubs must be removed beforehand
+      allow(I18n.config).to receive(:available_locales).and_call_original
+      allow(Releaf.application.config).to receive(:available_locales).and_call_original
+      allow(Releaf.application.config).to receive(:all_locales).and_call_original
+      I18n.reload!
+    end
+
+    it "uses rails-i18n pluralization mechanism to detect correct pluralization keys" do
+      expect(I18n.t("years", scope: "public", count: 0, locale: :lv)).to eq 'years lv zero XX'
+      expect(I18n.t("years", scope: "public", count: 1, locale: :lv)).to eq 'years lv one XX'
+      expect(I18n.t("years", scope: "public", count: 3, locale: :lv)).to eq 'years lv other XX'
+
+      expect(I18n.t("years", scope: "public", count: 1, locale: :ru)).to eq 'years ru one XX'
+      expect(I18n.t("years", scope: "public", count: 3, locale: :ru)).to eq 'years ru few XX'
+      expect(I18n.t("years", scope: "public", count: 5, locale: :ru)).to eq 'years ru many XX'
+    end
+
+  end
+
+
 end

data/spec/lib/releaf/i18n_database/backend_spec.rb

@@ -64,16 +64,8 @@ describe Releaf::I18nDatabase::Backend do
   describe ".locales_pluralizations" do
     it "returns array all pluralization forms for releaf locales" do
       allow(Releaf.application.config).to receive(:all_locales).and_return([:de, :ru, :aasdsd])
-
-      allow(TwitterCldr).to receive(:supported_locale?).with(:de).and_return(true)
-      allow(TwitterCldr::Formatters::Plurals::Rules).to receive(:all_for).with(:de).and_return([:one, :other, :many])
-
-      allow(TwitterCldr).to receive(:supported_locale?).with(:ru).and_return(true)
-      allow(TwitterCldr::Formatters::Plurals::Rules).to receive(:all_for).with(:ru).and_return([:one, :other, :few, :zero])
-
-      allow(TwitterCldr).to receive(:supported_locale?).with(:aasdsd).and_return(false)
-
-      expect(described_class.locales_pluralizations).to eq([:one, :other, :many, :few, :zero])
+      allow(I18n).to receive(:locale_available?).and_return(true)
+      expect(described_class.locales_pluralizations).to eq([:one, :other, :few, :many, :zero])
     end
   end
 

data/spec/lib/releaf/i18n_database/translations_store_spec.rb

@@ -229,33 +229,15 @@ describe Releaf::I18nDatabase::TranslationsStore do
   end
 
   describe "#valid_pluralized_result?" do
-    before do
-      allow(TwitterCldr::Formatters::Plurals::Rules).to receive(:rule_for)
-        .with(2, :lv).and_return(:few)
-    end
-
-    context "when unsupported locale given" do
-      it "return false" do
-        allow(TwitterCldr).to receive(:supported_locale?).with(:lv).and_return(false)
-        expect(subject.valid_pluralized_result?(:lv, 2, few: "x", many: "y")).to be false
-      end
-    end
-
     context "when given hash contains valid result for given locale and count" do
-      before do
-        allow(TwitterCldr).to receive(:supported_locale?).with(:lv).and_return(true)
-      end
-
-      context "when given hash contains valid result for given locale and count" do
-        it "return true" do
-          expect(subject.valid_pluralized_result?(:lv, 2, few: "x", many: "y")).to be true
-        end
+      it "return true" do
+        expect(subject.valid_pluralized_result?(:lv, 2, one: "x", other: "y")).to be true
       end
+    end
 
-      context "when given hash contains valid result for given locale and count" do
-        it "return true" do
-          expect(subject.valid_pluralized_result?(:lv, 2, one: "x", many: "y")).to be false
-        end
+    context "when given hash contains invalid result for given locale and count" do
+      it "return false" do
+        expect(subject.valid_pluralized_result?(:lv, 2, one: "x", few: "y")).to be false
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releaf-i18n_database
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - CubeSystems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: releaf-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
-  name: twitter_cldr
+  name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: axlsx_rails
   requirement: !ruby/object:Gem::Requirement