numbers_and_words 0.11.2 → 0.11.3

data/lib/numbers_and_words/translations/pt.rb

@@ -3,23 +3,14 @@ module NumbersAndWords
     class Pt < Base
       include NumbersAndWords::Translations::Families::Latin
 
-      def tens(numbers, options = {})
-        options[:alone] = true if options[:alone].nil?
-        options[:alone] ? super(numbers) : "#{t(:union)} " + super(numbers)
-      end
-
       def tens_with_ones(numbers, _options = {})
-        [tens(numbers[1]), " #{t(:union)} ", ones(numbers[0])].join
+        super numbers, separator: " #{union} "
       end
 
       def hundreds(number, options = {})
         return t(:one_hundred) if options[:is_one_hundred]
-        options[:is_hundred] ? t(:hundreds)[number - 1] : t(:hundreds)[number - 1] + ' e'
-      end
-
-      def megs(capacity, options = {})
-        options[:is_one] = false if options[:is_one].nil?
-        options[:is_one] ? t(:mega)[capacity] : t(:megas)[capacity]
+        return t(:hundreds)[number] if options[:is_hundred]
+        [t(:hundreds)[number], union].join(' ')
       end
     end
   end

data/lib/numbers_and_words/translations/ru.rb

@@ -3,23 +3,6 @@ module NumbersAndWords
     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/tr.rb

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

data/lib/numbers_and_words/translations/ua.rb

@@ -3,19 +3,6 @@ module NumbersAndWords
     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,21 @@
+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(%i[units tens one].join('.')) if number == 1
+        return t(%i[units tens five].join('.')) 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/version.rb

@@ -1,3 +1,3 @@
 module NumbersAndWords
-  VERSION = '0.11.2'.freeze
+  VERSION = '0.11.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numbers_and_words
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Kirill Lazarev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -92,6 +92,7 @@ files:
 - lib/numbers_and_words/i18n/locales/numbers.se.yml
 - lib/numbers_and_words/i18n/locales/numbers.tr.yml
 - lib/numbers_and_words/i18n/locales/numbers.ua.yml
+- lib/numbers_and_words/i18n/locales/numbers.vi.yml
 - lib/numbers_and_words/i18n/pluralization.rb
 - lib/numbers_and_words/i18n/plurals/cs.rb
 - lib/numbers_and_words/i18n/plurals/fr.rb
@@ -114,6 +115,7 @@ files:
 - lib/numbers_and_words/strategies/array_joiner/languages/pt-BR.rb
 - lib/numbers_and_words/strategies/array_joiner/languages/ru.rb
 - lib/numbers_and_words/strategies/array_joiner/languages/ua.rb
+- lib/numbers_and_words/strategies/array_joiner/languages/vi.rb
 - lib/numbers_and_words/strategies/figures_converter.rb
 - lib/numbers_and_words/strategies/figures_converter/decorators.rb
 - lib/numbers_and_words/strategies/figures_converter/decorators/base.rb
@@ -153,6 +155,10 @@ files:
 - lib/numbers_and_words/strategies/figures_converter/decorators/ua/base.rb
 - lib/numbers_and_words/strategies/figures_converter/decorators/ua/fractional.rb
 - lib/numbers_and_words/strategies/figures_converter/decorators/ua/integral.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/vi.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/vi/base.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/vi/fractional.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/vi/integral.rb
 - lib/numbers_and_words/strategies/figures_converter/languages.rb
 - lib/numbers_and_words/strategies/figures_converter/languages/base.rb
 - lib/numbers_and_words/strategies/figures_converter/languages/cs.rb
@@ -164,7 +170,6 @@ files:
 - lib/numbers_and_words/strategies/figures_converter/languages/families/base.rb
 - lib/numbers_and_words/strategies/figures_converter/languages/families/cyrillic.rb
 - lib/numbers_and_words/strategies/figures_converter/languages/families/helpers.rb
-- lib/numbers_and_words/strategies/figures_converter/languages/families/latin.rb
 - lib/numbers_and_words/strategies/figures_converter/languages/fr.rb
 - lib/numbers_and_words/strategies/figures_converter/languages/hu.rb
 - lib/numbers_and_words/strategies/figures_converter/languages/it.rb
@@ -178,6 +183,7 @@ files:
 - lib/numbers_and_words/strategies/figures_converter/languages/se.rb
 - lib/numbers_and_words/strategies/figures_converter/languages/tr.rb
 - lib/numbers_and_words/strategies/figures_converter/languages/ua.rb
+- lib/numbers_and_words/strategies/figures_converter/languages/vi.rb
 - lib/numbers_and_words/strategies/figures_converter/options.rb
 - lib/numbers_and_words/strategies/figures_converter/options/cs.rb
 - lib/numbers_and_words/strategies/figures_converter/options/cs/gender.rb
@@ -234,6 +240,7 @@ files:
 - lib/numbers_and_words/translations/se.rb
 - lib/numbers_and_words/translations/tr.rb
 - lib/numbers_and_words/translations/ua.rb
+- lib/numbers_and_words/translations/vi.rb
 - lib/numbers_and_words/version.rb
 - lib/numbers_and_words/wrappers.rb
 - lib/numbers_and_words/wrappers/float.rb
@@ -258,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Convert numbers to words using I18N.