numbers_and_words 0.10.0 → 0.10.5

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

@@ -13,40 +13,40 @@ lt:
     millions:
       one: milijonas
       ones: milijonai
-      other: milijonø
+      other: milijonų
     billions:
       one: bilijonas
       ones: bilijonai
-      other: bilijonø
+      other: bilijonų
     trillions:
       one: trilijonas
       ones: trilijonai
-      other: trilijonø
+      other: trilijonų
     quadrillions:
       one: kvadrilijonas
       ones: kvadrilijonai
-      other: kvadrilijonø
+      other: kvadrilijonų
     quintillions:
       one: kvintilijonas
       ones: kvadrilijonai
-      other: kvadrilijonø
+      other: kvadrilijonų
     sextillions:
       one: sekstilijonas
       ones: sekstilijonai
-      other: sekstilijonø
+      other: sekstilijonų
     septillions:
       one: septilijonas
       ones: septilijonai
-      other: septilijonø
+      other: septilijonų
     octillions:
       one: oktilijonas
       ones: oktilijonai
-      other: oktilijonø
+      other: oktilijonų
     nonillions:
       one: nonilijonas
       ones: nonilijonai
-      other: nonilijonø
+      other: nonilijonų
     decillions:
       one: decilijonas
       ones: decilijonai
-      other: decilijonø
+      other: decilijonų

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

@@ -4,10 +4,10 @@ lv:
     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: [simtu, divi simti, trīs simti, četri simti, pieci simti, seši simti, septiņi simti, astoņi simti, deviņi simti]
-    one_hundred: simts
+    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
     thousands:
-      one: tūkstots
+      one: tūkstotis
       other: tūkstoši
     millions:
       one: miljons

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

@@ -0,0 +1,13 @@
+pt:
+  numbers:
+    union: e
+    ones: [zero, um, dois, três, quatro, cinco, seis, sete, oito, nove]
+    ones_twenties: [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]
+    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]

data/lib/numbers_and_words/i18n/pluralization.rb

@@ -1,7 +1,6 @@
 require 'numbers_and_words/i18n/plurals/ru'
 require 'numbers_and_words/i18n/plurals/ua'
 require 'numbers_and_words/i18n/plurals/fr'
-require 'numbers_and_words/i18n/plurals/es'
 require 'numbers_and_words/i18n/plurals/lv'
 require 'numbers_and_words/i18n/plurals/lt'
 

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

@@ -2,7 +2,7 @@ module NumbersAndWords
   module I18n
     module Plurals
       module Fr
-        RULE = lambda { |n| one_conditions(n) ? :one : :many }
+        RULE = lambda { |n| one_conditions(n) ? :one : :other }
 
         extend self
 

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

@@ -23,7 +23,9 @@ require 'numbers_and_words/strategies/figures_converter/languages/families/cyril
 
 require 'numbers_and_words/strategies/figures_converter/languages/ru'
 require 'numbers_and_words/strategies/figures_converter/languages/ua'
+require 'numbers_and_words/strategies/figures_converter/languages/pt'
 
+require 'numbers_and_words/strategies/figures_converter/languages/ka'
 
 module NumbersAndWords
   module Strategies

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

@@ -26,6 +26,22 @@ module NumbersAndWords
             })
           end
 
+          def strings_logic
+            if @options.pronounced.active?
+              @options.pronounced.process self, @figures
+            else
+              if @figures.capacity_count
+                number_without_capacity_to_words + complex_number_to_words
+              elsif @figures.hundreds
+                hundreds_number_to_words
+              elsif @figures.tens or @figures.ones
+                simple_number_to_words
+              else
+                []
+              end
+            end
+          end
+
           def maybe_hyphen_separator
             @options.remove_hyphen.result
           end

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

@@ -11,18 +11,27 @@ module NumbersAndWords
             words.push megs(capacity_words) unless capacity_words.empty?
 
             if 0 < @current_capacity
-              # eg 1000000 should be "un millon" not "uno millon"
+              # eg 1000000 should be "un millón" not "uno millón"
               #    501000 should be "quinientos un mil" not "quinientos uno mil"
-              # so we replace "uno" with "un" throughout
+              #    1000 should be "mil" not "uno mil"
+              # so we replace "uno" with "un" throughout or delete it if that is the case
 
-              capacity_words = capacity_words.map{|word|
-                word.gsub( @translations.ones(1), @translations.one )
-              }
+              capacity_words = capacity_words.map { |word|
+                word.gsub(@translations.ones(1), @translations.one) unless is_a_thousand? and is_a_one?
+              }.compact
             end
 
             words + capacity_words
           end
 
+          def is_a_one?
+            [translations.ones(1)] == words_in_capacity(@current_capacity)
+          end
+
+          def is_a_thousand?
+            @current_capacity.odd?
+          end
+
           def hundreds
             super({:is_hundred => (figures[1,2] == [0,1] && simple_number_to_words.empty?)})
           end

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

@@ -0,0 +1,43 @@
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Languages
+        class Ka < Base
+          include Families::Latin
+
+          private
+
+          def capacity_iteration
+            words = []
+            capacity_words = words_in_capacity(@current_capacity)
+            words.push(megs) unless capacity_words.empty?
+            words += capacity_words unless is_a_thousand? and is_a_one?
+            words
+          end
+
+          def is_a_one?
+            [translations.ones(1)] == words_in_capacity(@current_capacity)
+          end
+
+          def is_a_thousand?
+            FiguresArray::THOUSAND_CAPACITY == @current_capacity
+          end
+
+          def hundreds
+            super({only_hundreds: figures[0, 2] == [0, 0]})
+          end
+
+          def megs
+            if @figures.hundreds || @figures.tens || @figures.ones
+              prefix = :partials
+            else
+              prefix = nil
+            end
+
+            super(prefix: prefix)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -11,18 +11,10 @@ module NumbersAndWords
             words = []
             capacity_words = words_in_capacity(@current_capacity)
             words.push(megs) unless capacity_words.empty?
-            words += capacity_words unless is_a_thousand? and is_a_one?
+            words += capacity_words
             words
           end
 
-          def is_a_one?
-            [translations.ones(1)] == words_in_capacity(@current_capacity)
-          end
-
-          def is_a_thousand?
-            FiguresArray::THOUSAND_CAPACITY == @current_capacity
-          end
-
           def hundreds
             super({:is_hundred => (figures[1,2] == [0,1] && simple_number_to_words.empty?)})
           end

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

@@ -0,0 +1,30 @@
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Languages
+        class Pt < Base
+          include Families::Latin
+
+          def hundreds
+            super({:is_hundred => (is_hundred?), :is_one_hundred => (is_one_hundred?)})
+          end
+
+          def megs
+            super({:is_one => words_in_capacity(@current_capacity) == [@translations.ones(1)]})
+          end
+
+          private
+
+          def is_hundred?
+            figures[0] == 0 && figures[1] == 0 && simple_number_to_words.empty?
+          end
+
+          def is_one_hundred?
+            is_hundred? && figures[2] == 1
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -4,6 +4,24 @@ module NumbersAndWords
       module Languages
         class Tr < Base
           include Families::Latin
+
+          private
+
+          def capacity_iteration
+            words = []
+            capacity_words = words_in_capacity(@current_capacity)
+            words.push(megs) unless capacity_words.empty?
+            words += capacity_words unless is_a_thousand? and is_a_one?
+            words
+          end
+
+          def is_a_one?
+            [translations.ones(1)] == words_in_capacity(@current_capacity)
+          end
+
+          def is_a_thousand?
+            FiguresArray::THOUSAND_CAPACITY == @current_capacity
+          end
         end
       end
     end

data/lib/numbers_and_words/strategies/figures_converter/options/en.rb

@@ -1,4 +1,5 @@
 require 'numbers_and_words/strategies/figures_converter/options/en/hundreds_with_union'
 require 'numbers_and_words/strategies/figures_converter/options/en/remove_hyphen'
 require 'numbers_and_words/strategies/figures_converter/options/en/ordinal'
-require 'numbers_and_words/strategies/figures_converter/options/en/remove_zero'
+require 'numbers_and_words/strategies/figures_converter/options/en/pronounced'
+require 'numbers_and_words/strategies/figures_converter/options/en/remove_zero'

data/lib/numbers_and_words/strategies/figures_converter/options/en/pronounced.rb

@@ -0,0 +1,76 @@
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Options
+        module En
+          class Pronounced
+            attr_accessor :strategy, :options
+
+            def initialize proxy, *args, &block
+              @strategy = proxy.strategy
+              @options = proxy.options
+            end
+
+
+            def result
+              active? ? 'PRONOUNCED' : 'NOTPRONOUNCED'
+            end
+
+            def active?
+              @options[:pronounced]
+            end
+
+            def process language, figures
+              if figures.to_a.count > 4
+                language.number_without_capacity_to_words + language.complex_number_to_words
+              elsif figures.capacity_count
+                handle_thousands language, figures
+              elsif figures.hundreds
+                handle_hundreds language, figures
+              elsif figures.tens or figures.ones
+                language.simple_number_to_words
+              else
+                []
+              end
+            end
+
+            def handle_thousands language, figures
+              units, tens, hundreds, thousands = *figures.to_a.dup
+              if hundreds == 0
+                language.number_without_capacity_to_words + language.complex_number_to_words
+              else
+                result = tens_with_oh language, figures
+                result.push "#{thousands}#{hundreds}".to_i.to_words
+              end
+            end
+
+            def handle_hundreds language, figures
+              units, tens, hundreds = *figures.to_a.dup
+              result = tens_with_oh language, figures
+              result.push hundreds.to_words
+            end
+
+            def tens_with_oh language, figures
+              units, tens = *figures.to_a.dup
+              result = []
+              if tens == 0
+                if units == 0
+                  result.push 'hundred'
+                else
+                  result.push language.ones
+                  result.push 'oh'
+                end
+              else
+                if figures.teens
+                  result.push language.teens
+                elsif figures.tens
+                  result.push language.complex_tens
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/numbers_and_words/strategies/figures_converter/options/en_gb.rb

@@ -1,4 +1,5 @@
 require 'numbers_and_words/strategies/figures_converter/options/en_gb/hundreds_with_union'
 require 'numbers_and_words/strategies/figures_converter/options/en_gb/remove_hyphen'
 require 'numbers_and_words/strategies/figures_converter/options/en_gb/ordinal'
+require 'numbers_and_words/strategies/figures_converter/options/en_gb/pronounced'
 require 'numbers_and_words/strategies/figures_converter/options/en_gb/remove_zero'

data/lib/numbers_and_words/strategies/figures_converter/options/en_gb/pronounced.rb

@@ -0,0 +1,12 @@
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Options
+        module EnGb
+          class Pronounced < En::Pronounced
+          end
+        end
+      end
+    end
+  end
+end

data/lib/numbers_and_words/translations.rb

@@ -18,6 +18,8 @@ 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/ka'
 
 module NumbersAndWords
   module Translations

data/lib/numbers_and_words/translations/es.rb

@@ -13,6 +13,10 @@ module NumbersAndWords
         t(:ones)[number]
       end
 
+      def ones_twenties number, options = {}
+        t(:ones_twenties)[number]
+      end
+
       def tens numbers, options = {}
         options[:alone] = true if options[:alone].nil?
         (numbers == TENS_CASE && options[:alone]) ? t(:twenty) : super(numbers)
@@ -20,7 +24,8 @@ module NumbersAndWords
 
       def tens_with_ones numbers, options = {}
         inter = numbers[1] == TENS_CASE ? "" : " y "
-        [tens(numbers[1], :alone => false), ones(numbers[0])].join inter
+        ones_number = numbers[1] == TENS_CASE ? ones_twenties(numbers[0]) : ones(numbers[0])
+        [tens(numbers[1], :alone => false), ones_number].join inter
       end
 
       def hundreds number, options = {}

data/lib/numbers_and_words/translations/et.rb

@@ -4,11 +4,7 @@ module NumbersAndWords
       include NumbersAndWords::Translations::Families::Latin
 
       def tens_with_ones numbers, options = {}
-        if numbers[1] == 1
-          [ones(numbers[0]), tens(numbers[1], :alone => false)].join ''
-        else
-          [tens(numbers[1], :alone => false), ones(numbers[0])].join ' '
-        end
+        [tens(numbers[1], :alone => false), ones(numbers[0])].join ' '
       end
 
       def hundreds number, options = {}

data/lib/numbers_and_words/translations/hu.rb

@@ -17,10 +17,6 @@ module NumbersAndWords
       def micros capacity, number = nil, separator = ''
         super capacity, nil, separator
       end
-
-      def union
-        t :union
-      end
     end
   end
 end