numbers_and_words 0.11.2 → 0.11.3

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

@@ -1,11 +1,10 @@
 lt:
   numbers:
     ones: [nulis, vienas, du, trys, keturi, penki, šeši, septyni, aštuoni, devyni]
-    teens: [dešimt, vienuolika, dvylika, trylika, keturiolika, penkiolika, šešiolika, septyniolika, aštuoniolika, devyniolika]
-    tens: [nulis, dešimt, dvidešimt, trisdešimt, keturiasdešimt, penkiasdešimt, šešiasdešimt, septyniasdešimt, aštuoniasdešimt, devyniasdešimt]
-    mega: [ones, thousands, millions, billions, trillions, quadrillions, quintillion, sextillions, septillions, octillions, nonillions, decillions]
-    hundreds: [šimtas, du šimtai, trys šimtai, keturi šimtai, penki šimtai, šeši šimtai, septyni šimtai, aštuoni šimtai, devyni šimtai]
-    one_hundred: šimtas
+    teens: [_, vienuolika, dvylika, trylika, keturiolika, penkiolika, šešiolika, septyniolika, aštuoniolika, devyniolika]
+    tens: [_, dešimt, dvidešimt, trisdešimt, keturiasdešimt, penkiasdešimt, šešiasdešimt, septyniasdešimt, aštuoniasdešimt, devyniasdešimt]
+    hundreds: [_, šimtas, du šimtai, trys šimtai, keturi šimtai, penki šimtai, šeši šimtai, septyni šimtai, aštuoni šimtai, devyni šimtai]
+    mega: [_, thousands, millions, billions, trillions, quadrillions, quintillion, sextillions, septillions, octillions, nonillions, decillions]
     thousands:
       one: tūkstantis
       ones: tūkstančiai

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

@@ -1,11 +1,10 @@
 lv:
   numbers:
     ones: [nulle, viens, divi, trīs, četri, pieci, seši, septiņi, astoņi, deviņi]
-    teens: [desmit, vienpadsmit, divpadsmit, trīspadsmit, četrpadsmit, piecpadsmit, sešpadsmit, septiņpadsmit, astoņpadsmit, deviņpadsmit]
-    tens: [nulle, desmit, divdesmit, trīsdesmit, četrdesmit, piecdesmit, sešdesmit, septiņdesmit, astoņdesmit, deviņdesmit]
-    mega: [ones, thousands, millions, billions, trillions, quadrillions, quintillion, sextillions, septillions, octillions, nonillions, decillions]
-    hundreds: [viens simts, divi simti, trīs simti, četri simti, pieci simti, seši simti, septiņi simti, astoņi simti, deviņi simti]
-    one_hundred: viens simts
+    teens: [_, vienpadsmit, divpadsmit, trīspadsmit, četrpadsmit, piecpadsmit, sešpadsmit, septiņpadsmit, astoņpadsmit, deviņpadsmit]
+    tens: [_, desmit, divdesmit, trīsdesmit, četrdesmit, piecdesmit, sešdesmit, septiņdesmit, astoņdesmit, deviņdesmit]
+    hundreds: [_, viens simts, divi simti, trīs simti, četri simti, pieci simti, seši simti, septiņi simti, astoņi simti, deviņi simti]
+    mega: [_, thousands, millions, billions, trillions, quadrillions, quintillion, sextillions, septillions, octillions, nonillions, decillions]
     thousands:
       one: tūkstotis
       other: tūkstoši

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

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

data/lib/numbers_and_words/i18n/locales/numbers.pt-BR.yml

@@ -1,22 +1,46 @@
 pt-BR:
   numbers:
-    union: e
-    union_separator: e
-    integral:
-      one: inteiro
-      other: inteiros
     ones:
       male: [zero, um, dois, três, quatro, cinco, seis, sete, oito, nove]
       female: [zero, uma, duas, três, quatro, cinco, seis, sete, oito, nove]
-    one: um
-    teens: [dez, onze, doze, treze, quatorze, quinze, dezesseis, dezessete, dezoito, dezenove]
-    tens: [zero, dez, vinte, trinta, quarenta, cinquenta, sessenta, setenta, oitenta, noventa]
+    teens: [_, onze, doze, treze, quatorze, quinze, dezesseis, dezessete, dezoito, dezenove]
+    tens: [_, dez, vinte, trinta, quarenta, cinquenta, sessenta, setenta, oitenta, noventa]
     hundreds:
-      male: [cento, duzentos, trezentos, quatrocentos, quinhentos, seiscentos, setecentos, oitocentos, novecentos]
-      female: [cento, duzentas, trezentas, quatrocentas, quinhentas, seiscentas, setecentas, oitocentas, novecentas]
+      male: [_, cento, duzentos, trezentos, quatrocentos, quinhentos, seiscentos, setecentos, oitocentos, novecentos]
+      female: [_, cento, duzentas, trezentas, quatrocentas, quinhentas, seiscentas, setecentas, oitocentas, novecentas]
     one_hundred: cem
-    mega: [_, mil, milhão, bilhão, trilhão, quadrilhão, quintilhão, sextilhão, septilhão, octilhão, nonilhão, decilhão]
-    megas: [_, mil, milhões, bilhões, trilhões, quadrilhões, quintilhões, sextilhões, septilhões, octilhões, nonilhões, decilhões]
+    mega: [_, thousands, millions, billions, trillions, quadrillions, quintillions, sextillions, septillions, octillions, nonillions, decillions]
+    thousands: mil
+    millions:
+      one: milhão
+      other: milhões
+    billions:
+      one: bilhão
+      other: bilhões
+    trillions:
+      one: trilhão
+      other: trilhões
+    quadrillions:
+      one: quadrilhão
+      other: quadrilhões
+    quintillions:
+      one: quintilhão
+      other: quintilhões
+    sextillions:
+      one: sextilhão
+      other: sextilhões
+    septillions:
+      one: septilhão
+      other: septilhões
+    octillions:
+      one: octilhão
+      other: octilhões
+    nonillions:
+      one: nonilhão
+      other: nonilhões
+    decillions:
+      one: decilhão
+      other: decilhões
     ordinal:
       ones:
         male: [zero, primeiro, segundo, terceiro, quarto, quinto, sexto, sétimo, oitavo, nono]
@@ -25,20 +49,15 @@ pt-BR:
         male: [_, décimo, vigésimo, trigésimo, quadragésimo, quinquagésimo, sexagésimo, septuagésimo, octogésimo, nonagésimo]
         female: [_, décima, vigésima, trigésima, quadragésima, quinquagésima, sexagésima, septuagésima, octogésima, nonagésima]
       hundreds:
-        male: [centésimo, ducentésimo, trecentésimo, quadringentésimo, quingentésimo, sexcentésimo, septingentésimo, octingentésimo, noningentésimo]
-        female: [centésima, ducentésima, trecentésima, quadringentésima, quingentésima, sexcentésima, septingentésima, octingentésima, noningentésima]
+        male: [_, centésimo, ducentésimo, trecentésimo, quadringentésimo, quingentésimo, sexcentésimo, septingentésimo, octingentésimo, noningentésimo]
+        female: [_, centésima, ducentésima, trecentésima, quadringentésima, quingentésima, sexcentésima, septingentésima, octingentésima, noningentésima]
       mega:
         male: [_, milésimo, milionésimo, bilionésimo, trilionésimo, quadrilionésimo, sextilionésimo, septilionésimo, octilionésimo, nonilionésimo]
         female: [_, milésima, milionésima, bilionésima, trilionésima, quadrilionésima, sextilionésima, septilionésima, octilionésima, nonilionésima]
+    integral:
+      one: inteiro
+      other: inteiros
     micro: [_, tenths, hundredths, thousandths, millionths, billionths, trillionths, quadrillionths, quintillionths, sextillionths, septillionths, octillionths, nonillionths, decillionths, undecillionths, duodecillionths, tredecillionths, quattuordecillionths]
-    micro_prefix:
-      tens:
-        one: décimo
-        other: décimos
-      hundreds:
-        one: centésimo
-        other: centésimos
-      separator: de
     tenths:
       one: décimo
       other: décimos
@@ -90,3 +109,13 @@ pt-BR:
     quattuordecillionths:
       one: quadringentilionésimo
       other: quadringentilionésimos
+    micro_separator: e
+    micro_prefix:
+      tens:
+        one: décimo
+        other: décimos
+      hundreds:
+        one: centésimo
+        other: centésimos
+      union: ' de '
+    union: e

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

@@ -1,12 +1,25 @@
 pt:
   numbers:
-    union: e
     ones: [zero, um, dois, três, quatro, cinco, seis, sete, oito, nove]
-    one: um
-    teens: [dez, onze, doze, treze, quatorze, quinze, dezesseis, dezessete, dezoito, dezenove]
-    tens: [zero, dez, vinte, trinta, quarenta, cinquenta, sessenta, setenta, oitenta, noventa]
-    twenty: vinte
-    hundreds: [cento, duzentos, trezentos, quatrocentos, quinhentos, seiscentos, setecentos, oitocentos, novecentos]
+    teens: [_, onze, doze, treze, quatorze, quinze, dezesseis, dezessete, dezoito, dezenove]
+    tens: [_, dez, vinte, trinta, quarenta, cinquenta, sessenta, setenta, oitenta, noventa]
+    hundreds: [_, cento, duzentos, trezentos, quatrocentos, quinhentos, seiscentos, setecentos, oitocentos, novecentos]
     one_hundred: cem
-    mega: [_, mil, milhão, bilhão, trilhão, quadrilhão, quinquilhão]
-    megas: [_, mil, milhões, bilhões, trilhões, quadrilhões, quinquilhões]
+    mega: [_, thousands, millions, billions, trillions, quadrillions, quintillions]
+    thousands: mil
+    millions:
+      one: milhão
+      other: milhões
+    billions:
+      one: bilhão
+      other: bilhões
+    trillions:
+      one: trilhão
+      other: trilhões
+    quadrillions:
+      one: quadrilhão
+      other: quadrilhões
+    quintillions:
+      one: quinquilhão
+      other: quinquilhões
+    union: e

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

@@ -4,20 +4,10 @@ ru:
       male: [ноль, один, два, три, четыре, пять, шесть, семь, восемь, девять]
       female: [ноль, одна, двe, три, четыре, пять, шесть, семь, восемь, девять]
       neuter: [ноль, одно, два, три, четыре, пять, шесть, семь, восемь, девять]
-    teens: [десять, одиннадцать, двенадцать, тринадцать, четырнадцать, пятнадцать, шестнадцать, семнадцать, восемнадцать, девятнадцать]
-    tens: [ноль, десять, двадцать, тридцать, сорок, пятьдесят, шестьдесят, семьдесят, восемьдесят, девяносто]
-    hundreds: [ноль, сто, двести, триста, четыреста, пятьсот, шестьсот, семьсот, восемьсот, девятьсот]
-    union_separator: 'и'
-    union: 'и'
-    micro:
-      one: [_, десятая, сотая, тысячная, миллионная, миллиардная, триллионная]
-      few: [_, десятых, сотых, тысячных, миллионных, миллиардных, триллионных]
-      many: [_, десятых, сотых, тысячных, миллионных, миллиардных, триллионных]
-    sub_micro: [_, десяти, сто]
-    integral:
-      one: целая
-      few: целых
-      many: целых
+    teens: [_, одиннадцать, двенадцать, тринадцать, четырнадцать, пятнадцать, шестнадцать, семнадцать, восемнадцать, девятнадцать]
+    tens: [_, десять, двадцать, тридцать, сорок, пятьдесят, шестьдесят, семьдесят, восемьдесят, девяносто]
+    hundreds: [_, сто, двести, триста, четыреста, пятьсот, шестьсот, семьсот, восемьсот, девятьсот]
+    mega: [_, thousands, millions, billions, trillions, quadrillions, quintillions, sextillions, septillions, octillions, nonillions, decillions]
     thousands:
       one: тысяча
       few: тысячи
@@ -62,16 +52,38 @@ ru:
       one: дециллион
       few: дециллиона
       many: дециллионов
-    mega:
-     - ones
-     - thousands
-     - millions
-     - billions
-     - trillions
-     - quadrillions
-     - quintillion
-     - sextillions
-     - septillions
-     - octillions
-     - nonillions
-     - decillions
+    integral:
+      one: целая
+      few: целых
+      many: целых
+    micro: [_, tenths, hundredths, thousandths, millionths, billionths, trillionths]
+    tenths:
+      one: десятая
+      few: десятых
+      many: десятых
+    hundredths:
+      one: сотая
+      few: сотых
+      many: сотых
+    thousandths:
+      one: тысячная
+      few: тысячных
+      many: тысячных
+    millionths:
+      one: миллионная
+      few: миллионных
+      many: миллионных
+    billionths:
+      one: миллиардная
+      few: миллиардных
+      many: миллиардных
+    trillionths:
+      one: триллионная
+      few: триллионных
+      many: триллионных
+    micro_separator: 'и'
+    micro_prefix:
+      tens: десяти
+      hundreds: сто
+      union: ' '
+    union: 'и'

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

@@ -1,7 +1,7 @@
 se:
   numbers:
     ones: [noll, en, två, tre, fyra, fem, sex, sju, åtta, nio]
-    teens: [tio, elva, tolv, tretton, fjorton, femton, sexton, sjutton, arton, nitton]
-    tens: [noll, tio, tjugo, trettio, fyrtio, femtio, sextio, sjuttio, åttio, nittio]
+    teens: [_, elva, tolv, tretton, fjorton, femton, sexton, sjutton, arton, nitton]
+    tens: [_, tio, tjugo, trettio, fyrtio, femtio, sextio, sjuttio, åttio, nittio]
     hundreds: hundra
-    mega: [ett, tusen, miljoner, miljarder, biljoner, kvadriljon, kvintiljon, sextillion, septillion, octillion, nonillion, decillion]
+    mega: [_, tusen, miljoner, miljarder, biljoner, kvadriljon, kvintiljon, sextillion, septillion, octillion, nonillion, decillion]

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

@@ -1,7 +1,7 @@
 tr:
   numbers:
     ones: [sıfır, bir, iki, üç, dört, beş, altı, yedi, sekiz, dokuz]
-    teens: ['on', on bir, on iki, on üç, on dört, on beş, on altı, on yedi, on sekiz, on dokuz]
-    tens: [sıfır, 'on', yirmi, otuz, kırk, elli, altmış, yetmiş, seksen, doksan]
+    teens: [_, on bir, on iki, on üç, on dört, on beş, on altı, on yedi, on sekiz, on dokuz]
+    tens: [_, 'on', yirmi, otuz, kırk, elli, altmış, yetmiş, seksen, doksan]
     hundreds: yüz
-    mega: [bir, bin, milyon, milyar, trilyon, katrilyon, kentilyon, seksilyon, septilyon, oktilyon, nonilyon, desilyon]
+    mega: [_, bin, milyon, milyar, trilyon, katrilyon, kentilyon, seksilyon, septilyon, oktilyon, nonilyon, desilyon]

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

@@ -4,20 +4,10 @@ ua:
       male: [нуль, один, два, три, чотири, п’ять, шiсть, сiм, вiсiм, дев’ять]
       female: [нуль, одна, двi, три, чотири, п’ять, шiсть, сiм, вiсiм, дев’ять]
       neuter: [нуль, одне, два, три, чотири, п’ять, шiсть, сiм, вiсiм, дев’ять]
-    teens: [десять, одинадцять, дванадцять, тринадцять, чотирнадцять, п’ятнадцять, шiстнадцять, сiмнадцять, вiсiмнадцять, дев’ятнадцять]
-    tens: [нуль, десять, двадцять, тридцять, сорок, п’ятдесят, шiстдесят, сiмдесят, вiсiмдесят, дев’яносто]
-    hundreds: [нуль, сто, двiстi, триста, чотириста, п’ятсот, шiстсот, сiмсот, вiсiмсот, дев’ятсот]
-    union_separator: 'i'
-    union: 'i'
-    micro:
-      one: [_, десята, сота, тысячна, мiльйонна, мiльярдна, трильйонна]
-      few: [_, десятих, сотих, тисячних, мiльйонних, мiльярдних, трильйонних]
-      many: [_, десятих, сотих, тисячних, мiльйонних, мiльярдних, трильйонних]
-    sub_micro: [_, десяти, сто]
-    integral:
-      one: цiла
-      few: цiлих
-      many: цiлих
+    teens: [_, одинадцять, дванадцять, тринадцять, чотирнадцять, п’ятнадцять, шiстнадцять, сiмнадцять, вiсiмнадцять, дев’ятнадцять]
+    tens: [_, десять, двадцять, тридцять, сорок, п’ятдесят, шiстдесят, сiмдесят, вiсiмдесят, дев’яносто]
+    hundreds: [_, сто, двiстi, триста, чотириста, п’ятсот, шiстсот, сiмсот, вiсiмсот, дев’ятсот]
+    mega: [_, thousands, millions, billions, trillions, quadrillions, quintillion, sextillions, septillions, octillions, nonillions, decillions]
     thousands:
       one: тисяча
       few: тисячi
@@ -62,4 +52,38 @@ ua:
       one: децильйон
       few: децильйона
       many: децильйонiв
-    mega: [ones, thousands, millions, billions, trillions, quadrillions, quintillion, sextillions, septillions, octillions, nonillions, decillions]
+    integral:
+      one: цiла
+      few: цiлих
+      many: цiлих
+    micro: [_, tenths, hundredths, thousandths, millionths, billionths, trillionths]
+    tenths:
+      one: десята
+      few: десятих
+      many: десятих
+    hundredths:
+      one: сота
+      few: сотих
+      many: сотих
+    thousandths:
+      one: тысячна
+      few: тисячних
+      many: тисячних
+    millionths:
+      one: мiльйонна
+      few: мiльйонних
+      many: мiльйонних
+    billionths:
+      one: мiльярдна
+      few: мiльярдних
+      many: мiльярдних
+    trillionths:
+      one: трильйонна
+      few: трильйонних
+      many: трильйонних
+    micro_separator: 'i'
+    micro_prefix:
+      tens: десяти
+      hundreds: сто
+      union: ' '
+    union: 'i'

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

@@ -0,0 +1,13 @@
+vi:
+  numbers:
+    ones: ['không', 'một', 'hai', 'ba', 'bốn', 'năm', 'sáu', 'bảy', 'tám', 'chín']
+    teens: [_, 'mười một', 'mười hai', 'mười ba', 'mười bốn', 'mười lăm', 'mười sáu', 'mười bảy', 'thứ mười tám', 'mười chín']
+    tens: [_, 'mười', 'hai mươi', 'ba mươi', 'bốn mươi', 'năm mươi', 'sáu mươi', 'bảy mươi', 'tám mươi', 'chín mươi']
+    hundreds: 'trăm'
+    mega: [_, 'nghìn', 'triệu', 'tỷ', 'nghìn tỷ', 'triệu tỷ']
+    units:
+      tens:
+        one: 'mốt'
+        five: 'lăm'
+    ones_union: 'linh'
+    micro_separator: 'phẩy'

data/lib/numbers_and_words/strategies/array_joiner/languages.rb

@@ -11,6 +11,7 @@ require 'numbers_and_words/strategies/array_joiner/languages/ru'
 require 'numbers_and_words/strategies/array_joiner/languages/ua'
 require 'numbers_and_words/strategies/array_joiner/languages/pt-BR'
 require 'numbers_and_words/strategies/array_joiner/languages/cs'
+require 'numbers_and_words/strategies/array_joiner/languages/vi'
 
 module NumbersAndWords
   module Strategies

data/lib/numbers_and_words/strategies/array_joiner/languages/en-GB.rb

@@ -8,7 +8,7 @@ module NumbersAndWords
           end
 
           def union_element
-            @elements.first.empty? ? "#{union_separator} " : super
+            @elements.first.empty? ? "#{micro_separator} " : super
           end
         end
       end

data/lib/numbers_and_words/strategies/array_joiner/languages/families/base.rb

@@ -9,11 +9,11 @@ module NumbersAndWords
             end
 
             def union_element
-              union_separator.empty? ? ' ' : " #{union_separator} "
+              micro_separator.empty? ? ' ' : " #{micro_separator} "
             end
 
-            def union_separator
-              options[:union_separator] || @translations.union_separator || ''
+            def micro_separator
+              options[:micro_separator] || @translations.micro_separator || ''
             end
           end
         end

data/lib/numbers_and_words/strategies/array_joiner/languages/vi.rb

@@ -0,0 +1,10 @@
+module NumbersAndWords
+  module Strategies
+    module ArrayJoiner
+      module Languages
+        class Vi < Base
+        end
+      end
+    end
+  end
+end

data/lib/numbers_and_words/strategies/figures_converter/decorators.rb

@@ -8,6 +8,7 @@ require 'numbers_and_words/strategies/figures_converter/decorators/pt-BR'
 require 'numbers_and_words/strategies/figures_converter/decorators/hu'
 require 'numbers_and_words/strategies/figures_converter/decorators/ua'
 require 'numbers_and_words/strategies/figures_converter/decorators/cs'
+require 'numbers_and_words/strategies/figures_converter/decorators/vi'
 
 module NumbersAndWords
   module Strategies

data/lib/numbers_and_words/strategies/figures_converter/decorators/hu/fractional.rb

@@ -11,7 +11,7 @@ module NumbersAndWords
             private
 
             def fraction_significance
-              @strategy.translations.micros full_fraction.fraction_capacity, figures.reverse.join.to_i
+              @strategy.translations.micros full_fraction.fraction_capacity
             end
 
             def full_fraction

data/lib/numbers_and_words/strategies/figures_converter/decorators/vi.rb

@@ -0,0 +1,3 @@
+require 'numbers_and_words/strategies/figures_converter/decorators/vi/base'
+require 'numbers_and_words/strategies/figures_converter/decorators/vi/fractional'
+require 'numbers_and_words/strategies/figures_converter/decorators/vi/integral'

data/lib/numbers_and_words/strategies/figures_converter/{languages/families/latin.rb → decorators/vi/base.rb}

@@ -1,10 +1,9 @@
 module NumbersAndWords
   module Strategies
     module FiguresConverter
-      module Languages
-        module Families
-          module Latin
-            include Base
+      module Decorators
+        module Vi
+          class Base < Decorators::Base
           end
         end
       end

data/lib/numbers_and_words/strategies/figures_converter/decorators/vi/fractional.rb

@@ -0,0 +1,12 @@
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Decorators
+        module Vi
+          class Fractional < Base
+          end
+        end
+      end
+    end
+  end
+end