numbers_and_words 0.10.0 → 0.11.12

data/lib/numbers_and_words/translations/families/base.rb

@@ -1,26 +1,28 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     module Families
       module Base
-
-        def teens numbers, options = {}
+        def teens(numbers, options = {})
           t("#{options[:prefix]}.teens")[numbers[0]]
         end
 
-        def tens number, options = {}
+        def tens(number, options = {})
           t("#{options[:prefix]}.tens")[number]
         end
 
-        def tens_with_ones numbers, options = {}
-          [tens(numbers[1]), ones(numbers[0], options)].join options[:separator]
+        def tens_with_ones(numbers, options = {})
+          [tens(numbers[1]), ones(numbers[0], options)].join options[:separator] || ' '
         end
 
-        def megs capacity, options = {}
-          number, mega_name = options[:number], "#{options[:prefix]}.mega"
-          number ? t(mega(capacity), :count => number) : t(mega_name)[capacity]
+        def megs(capacity, options = {})
+          number = options[:number]
+          mega_name = "#{options[:prefix]}.mega"
+          number ? t(mega(capacity), count: number) : t(mega_name)[capacity]
         end
 
-        def mega capacity
+        def mega(capacity)
           t(:mega)[capacity]
         end
 
@@ -28,8 +30,8 @@ module NumbersAndWords
           t :union
         end
 
-        def union_separator
-          t :union_separator
+        def micro_separator
+          t :micro_separator
         end
       end
     end

data/lib/numbers_and_words/translations/families/cyrillic.rb

@@ -1,27 +1,25 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     module Families
       module Cyrillic
         include NumbersAndWords::Translations::Families::Base
 
-        def ones number, options = {}
-          t(:ones)[options[:gender]][number]
+        def zero(_options = {})
+          t(:ones).values.first[0]
         end
 
-        def tens_with_ones numbers, options = {}
-          [tens(numbers[1]), ones(numbers[0], options)].join ' '
+        def ones(number, options = {})
+          t(:ones)[options[:gender]][number]
         end
 
-        def hundreds number, options = {}
+        def hundreds(number, _options = {})
           t(:hundreds)[number]
         end
 
-        def zero options = {}
-          t(:ones).values.first[0]
-        end
-
-        def integral number, options = {}
-          t(:integral, :count => number)
+        def integral(number, _options = {})
+          t(:integral, count: number)
         end
       end
     end

data/lib/numbers_and_words/translations/families/latin.rb

@@ -1,22 +1,22 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     module Families
       module Latin
         include NumbersAndWords::Translations::Families::Base
 
-        #private
+        def zero(options = {})
+          t([options[:prefix], :ones].join('.'))[0]
+        end
 
-        def ones number, options = {}
+        def ones(number, options = {})
           t([options[:prefix], :ones].join('.'))[number]
         end
 
-        def hundreds number, options = {}
+        def hundreds(number, options = {})
           [t(:ones)[number], t([options[:prefix], :hundreds].join('.'))].join options[:separator] || ' '
         end
-
-        def zero options = {}
-          t([options[:prefix], :ones].join('.'))[0]
-        end
       end
     end
   end

data/lib/numbers_and_words/translations/fr.rb

@@ -1,28 +1,33 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Fr < Base
       include NumbersAndWords::Translations::Families::Latin
+      include NumbersAndWords::Translations::Extensions::FractionSignificance
 
       SPECIAL_TENS_CASE = 8
 
-      def tens number, options = {}
-        options[:alone] = true if options[:alone].nil?
-        (SPECIAL_TENS_CASE == number and options[:alone]) ? t(:eighty) : super(number)
+      def tens(number, options = {})
+        return t(:eighty) if number == SPECIAL_TENS_CASE && options[:alone].nil?
+
+        super number, options
       end
 
-      def tens_with_ones numbers, options = {}
-        if [7, 9].include? numbers[1]
-          [tens(numbers[1] - 1, :alone => false), teens(numbers)].join '-'
-        else
-          union = numbers[0] == 1 ? ' et ' : '-'
-          [tens(numbers[1], :alone => false), ones(numbers[0])].join union
-        end
+      def tens_with_ones(numbers, options = {})
+        return [tens(numbers[1] - 1, alone: false), teens(numbers)].join('-') if [7, 9].include? numbers[1]
+
+        separator = numbers[0] == 1 ? " #{union} " : '-'
+        super numbers, options.merge(separator: separator)
       end
 
-      def hundreds number, options = {}
-        options[:pluralize] = false if options[:pluralize].nil?
-        hundreds = t(:hundreds, :count => options[:pluralize] ? number : 1)
-        (number == 1) ? hundreds : [t(:ones)[number], hundreds].join(' ')
+      def hundreds(number, options = {})
+        count = options[:pluralize] ? number : 1
+        hundreds = t(:hundreds, count: count)
+
+        return hundreds if number == 1
+
+        [t(:ones)[number], hundreds].join(' ')
       end
     end
   end

data/lib/numbers_and_words/translations/hu.rb

@@ -1,25 +1,18 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Hu < Base
       include NumbersAndWords::Translations::Families::Latin
       include NumbersAndWords::Translations::Extensions::FractionSignificance
 
-      def tens_with_ones numbers, options = {}
+      def tens_with_ones(numbers, options = {})
         ones, tens = numbers
-        [t(:tens_with_ones)[tens], t([options[:prefix], :ones_with_tens].join('.'))[ones]].join ''
-      end
-
-      def hundreds number, options = {}
-        options[:separator] = ''
-        super number, options
-      end
-
-      def micros capacity, number = nil, separator = ''
-        super capacity, nil, separator
+        [t(:tens_with_ones)[tens], t([options[:prefix], :ones_with_tens].join('.'))[ones]].join
       end
 
-      def union
-        t :union
+      def hundreds(number, options = {})
+        super number, options.merge(separator: '')
       end
     end
   end

data/lib/numbers_and_words/translations/hy.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Translations
+    class Hy < Base
+      include NumbersAndWords::Translations::Families::Latin
+
+      def tens_with_ones(numbers, options = {})
+        options[:separator] ||= ''
+        super
+      end
+
+      def hundreds(number, _options = {})
+        parts = [t(:hundreds)]
+        parts.unshift(t(:ones)[number]) if number > 1
+
+        parts.join(' ')
+      end
+    end
+  end
+end

data/lib/numbers_and_words/translations/it.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class It < Base
       include NumbersAndWords::Translations::Families::Latin
 
-      def tens_with_ones numbers, options = {}
-        super numbers, :separator => ''
+      def tens_with_ones(numbers, _options = {})
+        super numbers, separator: ''
       end
 
-      def hundreds number, options = {}
+      def hundreds(number, _options = {})
         [[number], t(:hundreds)].join ' '
       end
     end

data/lib/numbers_and_words/translations/ka.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Translations
+    class Ka < Base
+      include NumbersAndWords::Translations::Families::Latin
+      TENS_VIGESIMAL_RANGES = [
+        {
+          range: Range.new(0, 4, true),
+          name: :twenty,
+          multiplicative: 2
+        },
+        {
+          range: Range.new(0, 6, true),
+          name: :forty,
+          multiplicative: 4
+        },
+        {
+          range: Range.new(0, 8, true),
+          name: :sixty,
+          multiplicative: 6
+        },
+        {
+          range: Range.new(0, 9, false),
+          name: :eighty,
+          multiplicative: 8
+        }
+      ].freeze
+
+      def vigesimal_range(number)
+        range = nil
+        TENS_VIGESIMAL_RANGES.each do |item|
+          if item[:range].include? number
+            range = item
+            break
+          end
+        end
+
+        range
+      end
+
+      def tens_with_ones(numbers, _options = {})
+        range = vigesimal_range(numbers[1])
+
+        minor = if (numbers[1] - range[:multiplicative]).positive?
+                  teens(numbers)
+                else
+                  ones(numbers[0])
+                end
+
+        [t([:partials, range[:name]].join('.')), minor].join
+      end
+
+      def hundreds(number, options = {})
+        options[:prefix] ||= options[:only_hundreds] == true ? nil : :partials
+
+        parts = [t([options[:prefix], :hundreds].join('.'))]
+        parts.unshift(ones(number, prefix: :partials)) if number > 1
+
+        parts.join
+      end
+    end
+  end
+end

data/lib/numbers_and_words/translations/kz.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Translations
+    class Kz < Base
+      include NumbersAndWords::Translations::Families::Latin
+    end
+  end
+end

data/lib/numbers_and_words/translations/lt.rb

@@ -1,20 +1,12 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Lt < Base
       include NumbersAndWords::Translations::Families::Latin
 
-      def tens number, options = {}
-        super(number)
-      end
-
-      def tens_with_ones numbers, options = {}
-        [tens(numbers[1], :alone => false), ones(numbers[0])].join ' '
-      end
-
-
-      def hundreds number, options = {}
-        options[:is_hundred] = false if options[:is_hundred].nil?
-        options[:is_hundred] ? t(:one_hundred) : t(:hundreds)[number - 1]
+      def hundreds(number, _options = {})
+        t(:hundreds)[number]
       end
     end
   end

data/lib/numbers_and_words/translations/lv.rb

@@ -1,20 +1,12 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Lv < Base
       include NumbersAndWords::Translations::Families::Latin
 
-      def tens number, options = {}
-        super(number)
-      end
-
-      def tens_with_ones numbers, options = {}
-        [tens(numbers[1], :alone => false), ones(numbers[0])].join ' '
-      end
-
-
-      def hundreds number, options = {}
-        options[:is_hundred] = false if options[:is_hundred].nil?
-        options[:is_hundred] ? t(:one_hundred) : t(:hundreds)[number - 1]
+      def hundreds(number, _options = {})
+        t(:hundreds)[number]
       end
     end
   end

data/lib/numbers_and_words/translations/nl.rb

@@ -1,14 +1,26 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Nl < Base
       include NumbersAndWords::Translations::Families::Latin
 
-      def tens_with_ones numbers, options = {}
-        [ones(numbers[0]), tens(numbers[1])].join 'en'
+      def tens_with_ones(numbers, _options = {})
+        [ones(numbers[0]), tens(numbers[1])].join(union(numbers[0]))
+      end
+
+      def hundreds(number, _options = {})
+        return t(:hundreds) if number == 1
+
+        super number, separator: ''
       end
 
-      def hundreds number, options = {}
-        1 == number ? t(:hundreds) : [t(:ones)[number], t(:hundreds)].join
+      private
+
+      def union(units)
+        return t :union2or3 if [2, 3].include?(units)
+
+        t :union
       end
     end
   end

data/lib/numbers_and_words/translations/pt-BR.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Translations
+    class PtBr < Base
+      include NumbersAndWords::Translations::Families::Base
+      include NumbersAndWords::Translations::Extensions::FractionSignificance
+
+      def integral(number, _options = {})
+        t(:integral, count: number)
+      end
+
+      def zero(options = {})
+        t([options[:prefix], :ones, :male].join('.'))[0]
+      end
+
+      def ones(number, options = {})
+        return if options[:is_one_thousand]
+
+        t([options[:prefix], :ones, options[:gender]].join('.'))[number]
+      end
+
+      def tens(number, options = {})
+        path = [options[:prefix], :tens]
+        path.push(options[:gender]) if ordinal?(options)
+        t(path.join('.'))[number]
+      end
+
+      def teens(number, options = {})
+        return [tens(1, options), ones(number[0], options)].join(' ') if ordinal? options
+
+        super(number, options)
+      end
+
+      def tens_with_ones(numbers, options = {})
+        connector = ordinal?(options) ? ' ' : " #{union} "
+        [tens(numbers[1], options), ones(numbers[0], options)].join(connector)
+      end
+
+      def hundreds(number, options = {})
+        return t(:one_hundred) if options[:is_one_hundred] && !ordinal?(options)
+
+        hundreds = t([options[:prefix], :hundreds, options[:gender]].join('.'))[number]
+        return hundreds if ordinal?(options) || options[:is_hundred]
+
+        [hundreds, union].join(' ')
+      end
+
+      def megs(capacity, options = {})
+        return t([options[:prefix], :mega, options[:gender]].join('.'))[capacity] if ordinal?(options)
+        return super(capacity, options) if options[:is_opaque] || options[:is_without_connector]
+
+        suffix = options[:is_with_comma] ? ',' : " #{union}"
+        super(capacity, options) + suffix
+      end
+
+      def micros(capacity, number = nil)
+        micro, prefix = capacity
+        micros = number ? t(micro(micro), count: number) : micro(micro)
+        [micro_prefix(prefix, number), micros].compact.join(t('micro_prefix.union'))
+      end
+
+      def micro_prefix(capacity, number)
+        case capacity
+        when 2 then t('micro_prefix.hundreds', count: number)
+        when 1 then t('micro_prefix.tens', count: number)
+        end
+      end
+
+      private
+
+      def ordinal?(options)
+        options[:prefix] == :ordinal
+      end
+    end
+  end
+end

data/lib/numbers_and_words/translations/pt.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Translations
+    class Pt < Base
+      include NumbersAndWords::Translations::Families::Latin
+
+      def tens_with_ones(numbers, _options = {})
+        super numbers, separator: " #{union} "
+      end
+
+      def hundreds(number, options = {})
+        return t(:one_hundred) if options[:is_one_hundred]
+        return t(:hundreds)[number] if options[:is_hundred]
+
+        [t(:hundreds)[number], union].join(' ')
+      end
+    end
+  end
+end

data/lib/numbers_and_words/translations/ru.rb

@@ -1,25 +1,10 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Ru < Base
       include NumbersAndWords::Translations::Families::Cyrillic
       include NumbersAndWords::Translations::Extensions::FractionSignificance
-
-      def micros capacity, number = nil, separator = ' '
-        micro, prefix = capacity
-        micros = t(:micro, :count => number)[micro]
-        [micro_prefix(prefix), micros].compact.join separator
-      end
-
-      def micro_prefix capacity
-        case capacity
-        when 2 then t(:sub_micro)[2]
-        when 1 then t(:sub_micro)[1]
-        end
-      end
-
-      #def fraction_separator options = {}
-      #  super if options[:with_fractional_separator]
-      #end
     end
   end
 end

data/lib/numbers_and_words/translations/se.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Se < Base
       include NumbersAndWords::Translations::Families::Latin
 
-      def tens_with_ones numbers, options = {}
-        super numbers, :separator => '-'
+      def tens_with_ones(numbers, _options = {})
+        super numbers, separator: '-'
       end
     end
   end

data/lib/numbers_and_words/translations/tr.rb

@@ -1,10 +1,16 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Tr < Base
       include NumbersAndWords::Translations::Families::Latin
 
-      def tens_with_ones numbers, options = {}
-        super numbers, :separator => ' '
+      def hundreds(number, options = {})
+        if number == 1
+          [t([options[:prefix], :hundreds].join('.'))].join options[:separator] || ' '
+        else
+          [t(:ones)[number], t([options[:prefix], :hundreds].join('.'))].join options[:separator] || ' '
+        end
       end
     end
   end

data/lib/numbers_and_words/translations/ua.rb

@@ -1,21 +1,10 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Ua < Base
       include NumbersAndWords::Translations::Families::Cyrillic
       include NumbersAndWords::Translations::Extensions::FractionSignificance
-
-      def micros capacity, number = nil, separator = ' '
-        micro, prefix = capacity
-        micros = t(:micro, :count => number)[micro]
-        [micro_prefix(prefix), micros].compact.join separator
-      end
-
-      def micro_prefix capacity
-        case capacity
-        when 2 then t(:sub_micro)[2]
-        when 1 then t(:sub_micro)[1]
-        end
-      end
     end
   end
 end

data/lib/numbers_and_words/translations/vi.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Translations
+    class Vi < Base
+      include NumbersAndWords::Translations::Families::Latin
+      include NumbersAndWords::Translations::Extensions::FractionSignificance
+      def ones_of_tens(number, options = {})
+        return t('units.tens.one') if number == 1
+        return t('units.tens.five') if number == 5
+
+        ones(number, options)
+      end
+
+      def tens_with_ones(numbers, options = {})
+        [tens(numbers[1]), ones_of_tens(numbers[0], options)].join options[:separator] || ' '
+      end
+
+      def ones_union(number, options = {})
+        [t(:ones_union), ones(number, options)].join options[:separator] || ' '
+      end
+    end
+  end
+end

data/lib/numbers_and_words/translations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'numbers_and_words/translations/base'
 require 'numbers_and_words/translations/families/base'
 require 'numbers_and_words/translations/families/cyrillic'
@@ -5,7 +7,7 @@ require 'numbers_and_words/translations/families/latin'
 require 'numbers_and_words/translations/extensions/fraction_significance'
 require 'numbers_and_words/translations/ru'
 require 'numbers_and_words/translations/en'
-require 'numbers_and_words/translations/en_gb'
+require 'numbers_and_words/translations/en-GB'
 require 'numbers_and_words/translations/ua'
 require 'numbers_and_words/translations/tr'
 require 'numbers_and_words/translations/fr'
@@ -18,12 +20,19 @@ require 'numbers_and_words/translations/es'
 require 'numbers_and_words/translations/lv'
 require 'numbers_and_words/translations/lt'
 require 'numbers_and_words/translations/de'
+require 'numbers_and_words/translations/pt'
+require 'numbers_and_words/translations/pt-BR'
+require 'numbers_and_words/translations/ka'
+require 'numbers_and_words/translations/cs'
+require 'numbers_and_words/translations/vi'
+require 'numbers_and_words/translations/hy'
+require 'numbers_and_words/translations/kz'
 
 module NumbersAndWords
   module Translations
     class << self
       def factory
-        "#{name}::#{I18n.language_class_name}".constantize.new
+        Object.const_get("#{name}::#{I18n.language_class_name}").new
       end
     end
   end

data/lib/numbers_and_words/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
-  VERSION = '0.10.0'
+  VERSION = '0.11.12'
 end