numbers_and_words 0.11.10 → 0.11.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04032d6938d0487167512413e0035cfd44e568ad622c20fc304d80a217556cf9
-  data.tar.gz: c316187430a6d4930978215f478f34d9973fbe2bf0efa50dd3969652375eab51
+  metadata.gz: 8fbb352f4dff4e1515b73e36972350bb7161cf0c5d8f931565da3c9ace866b30
+  data.tar.gz: cab2aaac07c83e7f0c19d97f814608083c573ba36840a8499a7d6334875fa5cd
 SHA512:
-  metadata.gz: 81f843d717a8b84cb29096e43845201ac5a2a95e63177736df9135520f452badcc01057035500afd65bed7df9bf36cf78a6ad94a5168295e3d43b2597b6d746b
-  data.tar.gz: 64dc18b49df49650052b3bc2ca1ad895ddbacd4e60cffe7614c76712bd0270a8eb3695e571fe8c31b4fdf801148bf183056a76a1124f831f6b973e5a231bcc15
+  metadata.gz: 85b1af1ea9a76b79bbcdcd98fbd57e10eb677d042ac12ab02648e693b77b83ec7551bfc008e3af7c3615e33cd56295cef1f01c5e2ad213adca7e8aef403efc0c
+  data.tar.gz: e7334d4acf4752d1974c55ae76f897c91a64a110b44fea55c42d82913a65fa621737617048067a9ae47ba7bea94d2908d3a937297a348339b4494ed39d01cbeb

data/README.rdoc

@@ -34,7 +34,7 @@ Deletrea números en varios idiomas utilizando la gema I18n.
 * Türkçe [tr]
 * Deutsch** [de]
 * Italiano** [it]
-* Nederlands** [nl]
+* Nederlands [nl]
 * Swedish** [se]
 * English (British)** [en-GB]
 * Česky [cs]
@@ -107,7 +107,7 @@ Deletrea números en varios idiomas utilizando la gema I18n.
     => "ოცდაერთი"
     => "einundzwanzig"
     => "ventiuno"
-    => "éénentwintig"
+    => "eenentwintig"
     => "tjugo-en"
     => "dvacetjedna"
     => "vinte e um"
@@ -129,7 +129,7 @@ Deletrea números en varios idiomas utilizando la gema I18n.
     => "iki yüz otuz bir"
     => "zweihunderteinunddreißig"
     => "2 cento trentauno"
-    => "tweehonderdéénendertig"
+    => "tweehonderdeenendertig"
     => "två hundra trettio-en"
     => "dvě stě třicetjedna"
     => "duzentos e trinta e um"
@@ -226,7 +226,7 @@ Deletrea números en varios idiomas utilizando la gema I18n.
     => ["on bir", "yirmi iki", "yüz otuz üç"]
     => ["elf", "zweiundzwanzig", "einhundertdreiunddreißig"]
     => ["undici", "ventidue", "1 cento trentatre"]
-    => ["elf", "tweeentwintig", "honderddrieendertig"]
+    => ["elf", "tweeëntwintig", "honderddrieëndertig"]
     => ["elva", "tjugo-två", "en hundra trettio-tre"]
     => ["jedenáct", "dvacetdva", "jedno sto třicettři"]
     => ["mười một", "hai mươi hai", "một trăm ba mươi ba"]

data/lib/numbers_and_words/helper_classes/array_extensions/helpers.rb

@@ -42,6 +42,10 @@ module NumbersAndWords
         self[0].to_i if self[0].to_i.positive?
       end
 
+      def only_ones
+        ones if !tens && !hundreds
+      end
+
       def teens
         tens_with_ones if tens == 1
       end

data/lib/numbers_and_words/i18n/locales/numbers.nl.yml

@@ -1,8 +1,10 @@
 nl:
   numbers:
-    ones: [nul, één, twee, drie, vier, vijf, zes, zeven, acht, negen]
+    ones: [nul, een, twee, drie, vier, vijf, zes, zeven, acht, negen]
+    loose_one: één
     teens: [_, elf, twaalf, dertien, veertien, vijftien, zestien, zeventien, achttien, negentien]
     tens: [_, tien, twintig, dertig, veertig, vijftig, zestig, zeventig, tachtig, negentig]
     hundreds: honderd
     mega: [_, duizend, miljoen, miljard, biljoen, biljard, triljoen, triljard, septiljoen, octillion, noniljoen, decillion]
     union: en
+    union2or3: ën

data/lib/numbers_and_words/i18n/plurals/plurals.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-Hash[
-  NumbersAndWords::I18n::Pluralization.languages.map do |language|
-    [language.to_sym, {
-      i18n: {
-        plural: {
-          rule: Object.const_get("NumbersAndWords::I18n::Plurals::#{language.split('-').collect(&:capitalize).join}::RULE")
-        }
+NumbersAndWords::I18n::Pluralization.languages.map do |language|
+  [language.to_sym, {
+    i18n: {
+      plural: {
+        rule: Object.const_get("NumbersAndWords::I18n::Plurals::#{language.split('-').collect(&:capitalize).join}::RULE")
       }
-    }]
-  end
-]
+    }
+  }]
+end.to_h

data/lib/numbers_and_words/strategies/figures_converter/languages/nl.rb

@@ -10,9 +10,16 @@ module NumbersAndWords
           end
 
           def capacity_iteration
-            if FiguresArray::THOUSAND_CAPACITY == @current_capacity
-              capacity_words = words_in_capacity(@current_capacity)
-              capacity_words.empty? ? [] : [capacity_words, megs].join
+            return super if FiguresArray::THOUSAND_CAPACITY != @current_capacity
+            return megs if figures.number_in_capacity(@current_capacity) == 1
+
+            capacity_words = words_in_capacity(@current_capacity)
+            capacity_words.empty? ? [] : [capacity_words, megs].join
+          end
+
+          def simple_number_to_words
+            if @figures.only_ones && @figures.ones == 1
+              [@translations.t(:loose_one)]
             else
               super
             end

data/lib/numbers_and_words/translations/nl.rb

@@ -6,7 +6,7 @@ module NumbersAndWords
       include NumbersAndWords::Translations::Families::Latin
 
       def tens_with_ones(numbers, _options = {})
-        [ones(numbers[0]), tens(numbers[1])].join(union)
+        [ones(numbers[0]), tens(numbers[1])].join(union(numbers[0]))
       end
 
       def hundreds(number, _options = {})
@@ -14,6 +14,14 @@ module NumbersAndWords
 
         super number, separator: ''
       end
+
+      private
+
+      def union(units)
+        return t :union2or3 if [2, 3].include?(units)
+
+        t :union
+      end
     end
   end
 end

data/lib/numbers_and_words/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NumbersAndWords
-  VERSION = '0.11.10'
+  VERSION = '0.11.11'
 end

data/lib/numbers_and_words/wrappers/integer.rb

@@ -16,7 +16,7 @@ module NumbersAndWords
       private
 
       def to_figures_array
-        number.to_s.split(//).map(&:to_i).to_figures
+        number.to_s.chars.map(&:to_i).to_figures
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numbers_and_words
 version: !ruby/object:Gem::Version
-  version: 0.11.10
+  version: 0.11.11
 platform: ruby
 authors:
 - Kirill Lazarev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -274,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.4
+rubygems_version: 3.2.21
 signing_key:
 specification_version: 4
 summary: Spell out numbers in several languages