numbers_and_words 0.4.0 → 0.5.0

data/README.rdoc

@@ -1,17 +1,24 @@
-== numbers_and_words {<img src="https://secure.travis-ci.org/kslazarev/numbers_and_words.png" />}[http://travis-ci.org/kslazarev/numbers_and_words]
+== numbers_and_words {<img src="https://secure.travis-ci.org/kslazarev/numbers_and_words.png" />}[http://travis-ci.org/kslazarev/numbers_and_words] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/kslazarev/numbers_and_words]
 
 Convert numbers to words using the I18n library.
 
 Перевод чисел в слова при помощи библиотеки I18n.
 
-== Supported Languages / Языки
+Converti les nombres en lettres en utilisant la librairie I18n.
+
+== Supported Languages / Языки / Langues Supportées
 
 * English
 * Русский
+* Français
 * Українська
-* Türkçe
+* Türkçe**
+* Italiano**
+* Nederlands**
+
+** Experimental
 
-== Examples / Примеры
+== Examples / Примеры / Exemples
 
     I18n.with_locale(:en) { 42.to_words }
     => "forty-two"
@@ -19,60 +26,82 @@ Convert numbers to words using the I18n library.
     I18n.with_locale(:ru) { 42.to_words }
     => "сорок два"
 
+    I18n.with_locale(:fr) { 42.to_words }
+    => "quarante-deux"
+
     21.to_words
     => "twenty-one"
     => "двадцать один"
+    => "vingt et un"
     => "двадцять один"
     => "yirmi bir"
+    => "ventiuno"
+    => "éénentwintig"
 
     231.to_words
     => "two hundred thirty-one"
     => "двести тридцать один"
+    => "deux cent trente-trois"
     => "двiстi тридцять один"
     => "iki yüz otuz bir"
+    => "2 cento trentauno"
+    => "tweehonderdéénendertig"
 
     4030.to_words
     => "four thousand thirty"
     => "четыре тысячи тридцать"
+    => "quatre mille trente"
     => "чотири тисячi тридцять"
     => "dört bin otuz"
+    => "quattro mille trenta"
+    => "vierthousanddertig"
 
     1000100.to_words
     => "one million one hundred"
     => "один миллион сто"
+    => "un million cent"
     => "один мiльйон сто"
     => "bir milyon bir yüz"
+    => "uno milione 1 cento"
+    => "één miljoen honderd"
 
     1000000000000000000000000000000000.to_words
     => "one decillion"
     => "один дециллион"
+    => "un quintilliard"
     => "один децильйон"
     => "bir desilyon"
+    => "uno decillion"
+    => "één decillion"
 
     [1, 2, 3].to_words
     => ["one", "two", "three"]
     => ["один", "два", "три"]
+    => ["un", "deux", "trois"]
 
     [11, 22, 133].to_words
     => ["eleven", "twenty-two", "one hundred thirty-three"] 
     => ["одиннадцать", "двадцать два", "сто тридцать три"]
+    => ["onze", "vingt-deux", "cent trente-trois"]
     => ["одинадцять", "двадцять два", "сто тридцять три"]
     => ["on bir", "yirmi iki", "bir yüz otuz üç"]
+    => ["undici", "ventidue", "1 cento trentatre"]
+    => ["elf", "tweeentwintig", "honderddrieendertig"]
 
-== Requirements / Требования
+== Requirements / Требования / Configuration Requise
 
-* 1.8.7 <= Ruby (compatible with/совместимость с Ruby 1.9, JRuby and/и Rubinius);
-* 0.5.0 <= I18n (earlier versions not tested/ранние версии не тестировались);
+* 1.8.7 <= Ruby (compatible with/совместимость с/compatible avec Ruby 1.9, JRuby and/и/et Rubinius);
+* 0.5.0 <= I18n (earlier versions not tested/ранние версии не тестировались/versions précédentes non testées);
 
-== Installation / Установка
+== Installation / Установка / Installation
 
     gem install numbers_and_words
 
-== License / Лицензия
+== License / Лицензия / Licence
 
 MIT License
 
-== Bugs and Language Support / Поправки и Новые Языки
+== Bugs and Language Support / Поправки и Новые Языки / Bugs et Support d'autres Langues
 
 See CHANGELOG.md for last changes.
 
@@ -80,8 +109,9 @@ Fork the project. Make your feature addition or bug fix with tests.
 
 Send a pull request. Bonus points for topic branches.
 
-== Contacts / Контакты
+== Contacts / Контакты / Contacts
 
 * Kirill Lazarev (mailto:k.s.lazarev@gmail.com)
 * Daniel Doubrovkine (link:http://github.com/dblock)
 * Sergey Shkirando (mailto:shkirando.s@yandex.ru)
+* Ulrich Sossou (Github[http://github.com/sorich87], {Personal Page}[http://ulrichsossou.com/])

data/lib/numbers_and_words/array_additions/helpers.rb

@@ -4,8 +4,8 @@ module NumbersAndWords
       THOUSAND_CAPACITY = 1
 
       def capacity_count
-        count = (self.length.to_f / 3).ceil
-        1 == count ? nil : count
+        count = (self.length.to_f / 3).ceil - 1
+        0 == count ? nil : count
       end
 
       def figures_array_in_capacity capacity

data/lib/numbers_and_words/core_ext.rb

@@ -1,2 +1,2 @@
 require 'numbers_and_words/core_ext/integer'
-require 'numbers_and_words/core_ext/array'
+require 'numbers_and_words/core_ext/array'

data/lib/numbers_and_words/i18n.rb

@@ -9,4 +9,4 @@ module NumbersAndWords
       Dir[File.join File.dirname(__FILE__), "i18n/#{directory}", "**/#{ext}"]
     end
   end
-end
+end

data/lib/numbers_and_words/i18n/initialization.rb

@@ -3,20 +3,22 @@ module NumbersAndWords
     module Initialization
       extend self
 
+      attr_accessor :languages
+
       def init
         locale_files.each { |locale_file| ::I18n.load_path << locale_file}
         NumbersAndWords::I18n::Pluralization.init
       end
 
+      def languages
+        @languages ||= (locale_files.map{|path| path.split(/[\/.]/)[-2]})
+      end
+
       private
 
       def locale_files
         I18n.files 'locales', '*.*'
       end
-
-      def languages
-        locale_files.map{|path| path.split /[\/.]/}[-2]
-      end
     end
   end
-end
+end

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

@@ -0,0 +1,43 @@
+fr:
+  numbers:
+    ones: [zéro, un, deux, trois, quatre, cinq, six, sept, huit, neuf]
+    teens: [dix, onze, douze, treize, quatorze, quinze, seize, dix-sept, dix-huit, dix-neuf]
+    tens: [zéro, dix, vingt, trente, quarante, cinquante, soixante, soixante-dix, quatre-vingt, quatre-vingt-dix]
+    mega: [ones, thousands, millions, billions, trillions, quadrillions, quintillion, sextillions, septillions, octillions, nonillions, decillions]
+    eighty: quatre-vingts
+    hundreds:
+      one: cent
+      many: cents
+    thousands:
+      one: mille
+      many: mille
+    millions:
+      one: million
+      many: millions
+    billions:
+      one: milliard
+      many: milliards
+    trillions:
+      one: billion
+      many: billions
+    quadrillions:
+      one: billiard
+      many: billiards
+    quintillions:
+      one: trillion
+      many: trillions
+    sextillions:
+      one: trilliard
+      many: trilliards
+    septillions:
+      one: quadrillion
+      many: quadrillions
+    octillions:
+      one: quadrilliard
+      many: quadrilliards
+    nonillions:
+      one: quintillion
+      many: quintillions
+    decillions:
+      one: quintilliard
+      many: quintilliards

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

@@ -0,0 +1,7 @@
+it:
+  numbers:
+    ones: [zero, uno, due, tre, quattro, cinque, sei, sette, otto, nove]
+    teens: [dieci, undici, dodici, tredici, quattordici, quindici, sedici, diciasette, diciotto, diciannove]
+    tens: [zero, dieci, venti, trenta, quaranta, cinquanta, sessanta, settanta, ottanta, novanta]
+    hundreds: cento
+    mega: [ones, mille, milione, miliardo, triliardo, quadrillion, quintillion, sextillion, septillion, octillion, nonillion, decillion]

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

@@ -0,0 +1,7 @@
+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]
+    hundreds: honderd
+    mega: [degenen, duizend, miljoen, miljard, biljoen, biljard, triljoen, triljard, septiljoen, octillion, noniljoen, decillion]

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

@@ -4,4 +4,4 @@ tr:
     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]
     hundreds: yüz
-    mega: [bir, bin, milyon, milyar, trilyon, katrilyon, kentilyon, seksilyon, septilyon, oktilyon, nonilyon, desilyon]
+    mega: [bir, bin, milyon, milyar, trilyon, katrilyon, kentilyon, seksilyon, septilyon, oktilyon, nonilyon, desilyon]

data/lib/numbers_and_words/i18n/pluralization.rb

@@ -1,5 +1,6 @@
 require 'numbers_and_words/i18n/plurals/ru'
 require 'numbers_and_words/i18n/plurals/ua'
+require 'numbers_and_words/i18n/plurals/fr'
 
 module NumbersAndWords
   module I18n

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

@@ -0,0 +1,15 @@
+module NumbersAndWords
+  module I18n
+    module Plurals
+      module Fr
+        RULE = lambda { |n| one_conditions(n) ? :one : :many }
+
+        extend self
+
+        def one_conditions n
+          n % 10 == 1 && n % 100 != 11
+        end
+      end
+    end
+  end
+end

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

@@ -25,4 +25,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

data/lib/numbers_and_words/strategies.rb

@@ -1,5 +1,11 @@
 require 'numbers_and_words/strategies/base'
+require 'numbers_and_words/strategies/families/base'
+require 'numbers_and_words/strategies/families/cyrillic'
+require 'numbers_and_words/strategies/families/latin'
 require 'numbers_and_words/strategies/ru'
 require 'numbers_and_words/strategies/en'
 require 'numbers_and_words/strategies/ua'
 require 'numbers_and_words/strategies/tr'
+require 'numbers_and_words/strategies/fr'
+require 'numbers_and_words/strategies/nl'
+require 'numbers_and_words/strategies/it'

data/lib/numbers_and_words/strategies/base.rb

@@ -6,6 +6,13 @@ module NumbersAndWords
       def self.factory
         "NumbersAndWords::Strategies::#{::I18n.locale.to_s.titleize}".constantize.new
       end
+
+      def convert figures
+        @figures = figures.reverse
+        @words = strings
+
+        @words.empty? ? zero : @words.reverse.join(' ')
+      end
     end
   end
 end

data/lib/numbers_and_words/strategies/en.rb

@@ -1,71 +1,8 @@
 module NumbersAndWords
   module Strategies
     class En < Base
+      include Families::Latin
       include NumbersAndWords::TranslationsHelpers::En
-  
-      attr_accessor :figures_in_previous_capacity
-  
-      def convert figures
-        @figures = figures.reverse
-  
-        @words = strings
-        @words.empty? ? zero : @words.reverse.join(' ')
-      end
-  
-      private
-  
-      def strings
-        if figures.capacity_count
-          complex_to_words
-        elsif figures.hundreds
-          simple_hundreds_to_words
-        elsif figures.tens or figures.ones
-          simple_to_words
-        else
-          []
-        end
-      end
-  
-      def complex_to_words
-        words = []
-        figures.capacity_count.times do |capacity|
-          number_in_capacity_by_words = save_parent_figures do |parent_figures|
-            @figures = parent_figures.figures_array_in_capacity(capacity)
-            strings
-          end
-  
-          unless number_in_capacity_by_words.empty?
-            words.push translation_megs(capacity) if 0 < capacity
-            words += number_in_capacity_by_words
-          end
-        end
-        words
-      end
-  
-      def simple_hundreds_to_words
-        simple_to_words + [translation_hundreds(figures.hundreds)]
-      end
-  
-      def simple_to_words
-        if figures.teens
-          [translation_teens(figures.ones)]
-        elsif figures.tens
-          figures.ones ?
-            [translation_tens_with_ones(figures.tens_with_ones)] :
-            [translation_tens(figures.tens)]
-        elsif figures.ones
-          [translation_ones(figures.ones)]
-        else
-          []
-        end
-      end
-  
-      def save_parent_figures
-        parent_figures = @figures
-        result = yield(parent_figures)
-        @figures = parent_figures
-        result
-      end
     end
   end
 end

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

@@ -0,0 +1,71 @@
+module NumbersAndWords
+  module Strategies
+    module Families
+      module Base
+
+        private
+
+        def strings
+          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
+
+        def complex_number_to_words
+          (1..figures.capacity_count).map{|capacity| capacity_iteration(capacity)}.flatten
+        end
+
+        def capacity_iteration capacity
+          words = []
+          capacity_words = words_in_capacity(capacity)
+          words.push(translation_megs(capacity)) unless capacity_words.empty?
+          words + capacity_words
+        end
+
+        def words_in_capacity capacity = 0
+          save_parent_figures do |parent_figures|
+            @figures = parent_figures.figures_array_in_capacity(capacity)
+            strings
+          end
+        end
+
+        alias_method :number_without_capacity_to_words, :words_in_capacity
+
+        def hundreds_number_to_words
+          simple_number_to_words + [translation_hundreds(figures.hundreds)]
+        end
+
+        def complex_tens
+          figures.ones ?
+            translation_tens_with_ones(figures.tens_with_ones) :
+            translation_tens(figures.tens)
+        end
+
+        def simple_number_to_words
+          if figures.teens
+            [translation_teens(figures.ones)]
+          elsif figures.tens
+            [complex_tens]
+          elsif figures.ones
+            [translation_ones(figures.ones)]
+          else
+            []
+          end
+        end
+
+        def save_parent_figures
+          parent_figures = @figures
+          result = yield(parent_figures)
+          @figures = parent_figures
+          result
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module NumbersAndWords
+  module Strategies
+    module Families
+      module Cyrillic
+        include NumbersAndWords::Strategies::Families::Base
+
+        attr_accessor :current_capacity
+
+        private
+
+        def words_in_capacity capacity = 0
+          @current_capacity = capacity
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module NumbersAndWords
+  module Strategies
+    module Families
+      module Latin
+        include NumbersAndWords::Strategies::Families::Base
+      end
+    end
+  end
+end

data/lib/numbers_and_words/strategies/fr.rb

@@ -0,0 +1,32 @@
+module NumbersAndWords
+  module Strategies
+    class Fr < Base
+      include Families::Latin
+      include NumbersAndWords::TranslationsHelpers::Fr
+
+      private
+
+      def capacity_iteration capacity
+        words = []
+        capacity_words = words_in_capacity(capacity)
+        words.push(translation_megs(capacity)) unless capacity_words.empty?
+        words += capacity_words unless is_a_thousand?(capacity) and is_a_one?(capacity_words)
+        words
+      end
+
+      def is_a_one? capacity_words
+        [t(:ones)[1]] == capacity_words
+      end
+
+      def is_a_thousand? capacity
+        FiguresArray::THOUSAND_CAPACITY == capacity
+      end
+
+      def hundreds_number_to_words
+        simple_number_to_words + [
+          translation_hundreds(figures.hundreds, simple_number_to_words.empty?)
+        ]
+      end
+    end
+  end
+end

data/lib/numbers_and_words/strategies/it.rb

@@ -0,0 +1,8 @@
+module NumbersAndWords
+  module Strategies
+    class It < Base
+      include Families::Latin
+      include NumbersAndWords::TranslationsHelpers::It
+    end
+  end
+end

data/lib/numbers_and_words/strategies/nl.rb

@@ -0,0 +1,23 @@
+module NumbersAndWords
+  module Strategies
+    class Nl < Base
+      include Families::Latin
+      include NumbersAndWords::TranslationsHelpers::Nl
+
+      def hundreds_number_to_words
+        [super.reverse.join]
+      end
+
+      def capacity_iteration capacity
+        if FiguresArray::THOUSAND_CAPACITY == capacity
+          words = []
+          capacity_words = words_in_capacity(capacity)
+          words.push(translation_megs(capacity)) unless capacity_words.empty?
+          capacity_words.empty? ? [] : [capacity_words, words].join
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/numbers_and_words/strategies/ru.rb

@@ -1,71 +1,8 @@
 module NumbersAndWords
   module Strategies
     class Ru < Base
+      include Families::Cyrillic
       include NumbersAndWords::TranslationsHelpers::Ru
-
-      def convert figures
-        @figures = figures.reverse
-        @words = strings
-
-        @words.empty? ? zero : @words.reverse.join(' ')
-      end
-
-      private
-
-      def strings gender = :male
-        if figures.capacity_count
-          complex_to_words
-        elsif figures.hundreds
-          simple_hundreds_to_words gender
-        elsif figures.tens or figures.ones
-          simple_to_words gender
-        else
-          []
-        end
-      end
-
-      def complex_to_words
-        words = []
-        figures.capacity_count.times do |capacity|
-          number_in_capacity_by_words = save_parent_figures do
-            @figures = figures.figures_array_in_capacity(capacity)
-            strings figures.is_a_thousand_capacity?(capacity) ? :female : :male
-          end
-
-          unless number_in_capacity_by_words.empty?
-            if 0 < capacity
-              words.push translation_megs(capacity, figures.number_in_capacity(capacity))
-            end
-            words += number_in_capacity_by_words
-          end
-        end
-        words
-      end
-
-      def simple_hundreds_to_words gender
-        simple_to_words(gender) + [translation_hundreds(figures.hundreds)]
-      end
-
-      def simple_to_words gender
-        if figures.teens
-          [translation_teens(figures.ones)]
-        elsif figures.tens
-          figures.ones ?
-            [translation_tens_with_ones(figures.tens_with_ones, gender)] :
-            [translation_tens(figures.tens)]
-        elsif figures.ones
-          [translation_ones(figures.ones, gender)]
-        else
-          []
-        end
-      end
-
-      def save_parent_figures
-        parent_figures = @figures
-        result = yield
-        @figures = parent_figures
-        result
-      end
     end
   end
 end

data/lib/numbers_and_words/strategies/tr.rb

@@ -1,71 +1,8 @@
 module NumbersAndWords
   module Strategies
     class Tr < Base
+      include Families::Latin
       include NumbersAndWords::TranslationsHelpers::Tr
-
-      attr_accessor :figures_in_previous_capacity
-
-      def convert figures
-        @figures = figures.reverse
-
-        @words = strings
-        @words.empty? ? zero : @words.reverse.join(' ')
-      end
-
-      private
-
-      def strings
-        if figures.capacity_count
-          complex_to_words
-        elsif figures.hundreds
-          simple_hundreds_to_words
-        elsif figures.tens or figures.ones
-          simple_to_words
-        else
-          []
-        end
-      end
-
-      def complex_to_words
-        words = []
-        figures.capacity_count.times do |capacity|
-          number_in_capacity_by_words = save_parent_figures do |parent_figures|
-            @figures = parent_figures.figures_array_in_capacity(capacity)
-            strings
-          end
-
-          unless number_in_capacity_by_words.empty?
-            words.push translation_megs(capacity) if 0 < capacity
-            words += number_in_capacity_by_words
-          end
-        end
-        words
-      end
-
-      def simple_hundreds_to_words
-        simple_to_words + [translation_hundreds(figures.hundreds)]
-      end
-
-      def simple_to_words
-        if figures.teens
-          [translation_teens(figures.ones)]
-        elsif figures.tens
-          figures.ones ?
-            [translation_tens_with_ones(figures.tens_with_ones)] :
-            [translation_tens(figures.tens)]
-        elsif figures.ones
-          [translation_ones(figures.ones)]
-        else
-          []
-        end
-      end
-
-      def save_parent_figures
-        parent_figures = @figures
-        result = yield(parent_figures)
-        @figures = parent_figures
-        result
-      end
     end
   end
 end

data/lib/numbers_and_words/strategies/ua.rb

@@ -1,6 +1,8 @@
 module NumbersAndWords
   module Strategies
-    class Ua < Ru
+    class Ua < Base
+      include Families::Cyrillic
+      include NumbersAndWords::TranslationsHelpers::Ua
     end
   end
-end
+end

data/lib/numbers_and_words/translations_helpers.rb

@@ -1,4 +1,11 @@
 require 'numbers_and_words/translations_helpers/base'
+require 'numbers_and_words/translations_helpers/families/base'
+require 'numbers_and_words/translations_helpers/families/cyrillic'
+require 'numbers_and_words/translations_helpers/families/latin'
 require 'numbers_and_words/translations_helpers/ru'
 require 'numbers_and_words/translations_helpers/en'
+require 'numbers_and_words/translations_helpers/ua'
 require 'numbers_and_words/translations_helpers/tr'
+require 'numbers_and_words/translations_helpers/fr'
+require 'numbers_and_words/translations_helpers/nl'
+require 'numbers_and_words/translations_helpers/it'

data/lib/numbers_and_words/translations_helpers/en.rb

@@ -2,39 +2,10 @@ module NumbersAndWords
   module TranslationsHelpers
     module En
       include NumbersAndWords::TranslationsHelpers::Base
-
-      private
-
-      def translation_teens number
-        t(:teens)[number]
-      end
-
-      def translation_tens number
-        t(:tens)[number]
-      end
-
-      def translation_ones number
-        t(:ones)[number]
-      end
+      include NumbersAndWords::TranslationsHelpers::Families::Latin
 
       def translation_tens_with_ones numbers
-        [translation_tens(numbers[1]), translation_ones(numbers[0])].join '-'
-      end
-
-      def translation_union
-        t :union
-      end
-
-      def translation_hundreds number
-        [t(:ones)[number], t(:hundreds)].join ' '
-      end
-
-      def translation_megs capacity
-        t(:mega)[capacity]
-      end
-      
-      def zero
-        t(:ones)[0]
+        super numbers, '-'
       end
     end
   end

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

@@ -0,0 +1,30 @@
+module NumbersAndWords
+  module TranslationsHelpers
+    module Families
+      module Base
+
+        private
+
+        def translation_teens number
+          t(:teens)[number]
+        end
+
+        def translation_tens number
+          t(:tens)[number]
+        end
+
+        def translation_tens_with_ones numbers, separator = ' '
+          [translation_tens(numbers[1]), translation_ones(numbers[0])].join separator
+        end
+
+        def translation_megs capacity, number = nil
+          number ? t(translation_mega(capacity), :count => number) : t(:mega)[capacity]
+        end
+
+        def translation_mega capacity
+          t(:mega)[capacity]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module NumbersAndWords
+  module TranslationsHelpers
+    module Families
+      module Cyrillic
+        include NumbersAndWords::TranslationsHelpers::Families::Base
+
+        private
+
+        def translation_ones number
+          gender = figures.is_a_thousand_capacity?(current_capacity) ? :female : :male
+          t([:ones, gender].join('_'))[number]
+        end
+
+        def translation_hundreds number
+          t(:hundreds)[number]
+        end
+
+        def translation_megs capacity
+          super(capacity, figures.number_in_capacity(capacity))
+        end
+
+        def zero
+          t(:ones_male)[0]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module NumbersAndWords
+  module TranslationsHelpers
+    module Families
+      module Latin
+        include NumbersAndWords::TranslationsHelpers::Families::Base
+
+        private
+
+        def translation_ones number
+          t(:ones)[number]
+        end
+
+        def translation_hundreds number
+          [t(:ones)[number], t(:hundreds)].join ' '
+        end
+
+        def zero
+          t(:ones)[0]
+        end
+      end
+    end
+  end
+end

data/lib/numbers_and_words/translations_helpers/fr.rb

@@ -0,0 +1,34 @@
+module NumbersAndWords
+  module TranslationsHelpers
+    module Fr
+      include NumbersAndWords::TranslationsHelpers::Base
+      include NumbersAndWords::TranslationsHelpers::Families::Latin
+
+      SPECIAL_TENS_CASE = 8
+
+      private
+
+      def translation_tens number, alone = true
+        (SPECIAL_TENS_CASE == number and alone) ? t(:eighty) : super(number)
+      end
+
+      def translation_tens_with_ones numbers
+        if [7, 9].include? numbers[1]
+          [translation_tens(numbers[1] - 1, false), translation_teens(numbers[0])].join '-'
+        else
+          union = numbers[0] == 1 ? ' et ' : '-'
+          [translation_tens(numbers[1], false), translation_ones(numbers[0])].join union
+        end
+      end
+
+      def translation_hundreds number, pluralize = false
+        hundreds = t(:hundreds, :count => pluralize ? number : 1)
+        (number == 1) ? hundreds : [t(:ones)[number], hundreds].join(' ')
+      end
+
+      def translation_megs capacity
+        super(capacity, figures.number_in_capacity(capacity))
+      end
+    end
+  end
+end

data/lib/numbers_and_words/translations_helpers/it.rb

@@ -0,0 +1,16 @@
+module NumbersAndWords
+  module TranslationsHelpers
+    module It
+      include NumbersAndWords::TranslationsHelpers::Base
+      include NumbersAndWords::TranslationsHelpers::Families::Latin
+
+      def translation_tens_with_ones numbers
+        super numbers, ''
+      end
+
+      def translation_hundreds number
+        [[number], t(:hundreds)].join ' '
+      end
+    end
+  end
+end

data/lib/numbers_and_words/translations_helpers/nl.rb

@@ -0,0 +1,18 @@
+module NumbersAndWords
+  module TranslationsHelpers
+    module Nl
+      include NumbersAndWords::TranslationsHelpers::Base
+      include NumbersAndWords::TranslationsHelpers::Families::Latin
+
+      private
+
+      def translation_tens_with_ones numbers
+        [translation_ones(numbers[0]), translation_tens(numbers[1])].join 'en'
+      end
+
+      def translation_hundreds number
+        1 == number ? t(:hundreds) : [t(:ones)[number], t(:hundreds)].join
+      end
+    end
+  end
+end

data/lib/numbers_and_words/translations_helpers/ru.rb

@@ -2,40 +2,7 @@ module NumbersAndWords
   module TranslationsHelpers
     module Ru
       include NumbersAndWords::TranslationsHelpers::Base
-
-      private
-
-      def translation_megs capacity, number
-        t translation_mega(capacity), :count => number
-      end
-
-      def translation_teens number
-        t(:teens)[number]
-      end
-
-      def translation_tens number
-        t(:tens)[number]
-      end
-
-      def translation_ones number, gender
-        t([:ones, gender].join('_'))[number]
-      end
-
-      def translation_tens_with_ones numbers, gender
-        [translation_tens(numbers[1]), translation_ones(numbers[0], gender)].join ' '
-      end
-
-      def translation_hundreds number
-        t(:hundreds)[number]
-      end
-
-      def translation_mega capacity
-        t(:mega)[capacity]
-      end
-
-      def zero
-        t(:ones_male)[0]
-      end
+      include NumbersAndWords::TranslationsHelpers::Families::Cyrillic
     end
   end
 end

data/lib/numbers_and_words/translations_helpers/tr.rb

@@ -2,40 +2,7 @@ module NumbersAndWords
   module TranslationsHelpers
     module Tr
       include NumbersAndWords::TranslationsHelpers::Base
-
-      private
-
-      def translation_teens number
-        t(:teens)[number]
-      end
-
-      def translation_tens number
-        t(:tens)[number]
-      end
-
-      def translation_ones number
-        t(:ones)[number]
-      end
-
-      def translation_tens_with_ones numbers
-        [translation_tens(numbers[1]), translation_ones(numbers[0])].join ' '
-      end
-
-      def translation_union
-        t :union
-      end
-
-      def translation_hundreds number
-        [t(:ones)[number], t(:hundreds)].join ' '
-      end
-
-      def translation_megs capacity
-        t(:mega)[capacity]
-      end
-
-      def zero
-        t(:ones)[0]
-      end
+      include NumbersAndWords::TranslationsHelpers::Families::Latin
     end
   end
 end

data/lib/numbers_and_words/translations_helpers/ua.rb

@@ -0,0 +1,8 @@
+module NumbersAndWords
+  module TranslationsHelpers
+    module Ua
+      include NumbersAndWords::TranslationsHelpers::Base
+      include NumbersAndWords::TranslationsHelpers::Families::Cyrillic
+    end
+  end
+end

data/lib/numbers_and_words/version.rb

@@ -1,3 +1,3 @@
 module NumbersAndWords
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numbers_and_words
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-24 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -94,24 +94,41 @@ files:
 - lib/numbers_and_words/i18n.rb
 - lib/numbers_and_words/i18n/initialization.rb
 - lib/numbers_and_words/i18n/locales/numbers.en.yml
+- lib/numbers_and_words/i18n/locales/numbers.fr.yml
+- lib/numbers_and_words/i18n/locales/numbers.it.yml
+- lib/numbers_and_words/i18n/locales/numbers.nl.yml
 - lib/numbers_and_words/i18n/locales/numbers.ru.yml
 - lib/numbers_and_words/i18n/locales/numbers.tr.yml
 - lib/numbers_and_words/i18n/locales/numbers.ua.yml
 - lib/numbers_and_words/i18n/pluralization.rb
+- lib/numbers_and_words/i18n/plurals/fr.rb
 - lib/numbers_and_words/i18n/plurals/plurals.rb
 - lib/numbers_and_words/i18n/plurals/ru.rb
 - lib/numbers_and_words/i18n/plurals/ua.rb
 - lib/numbers_and_words/strategies.rb
 - lib/numbers_and_words/strategies/base.rb
 - lib/numbers_and_words/strategies/en.rb
+- lib/numbers_and_words/strategies/families/base.rb
+- lib/numbers_and_words/strategies/families/cyrillic.rb
+- lib/numbers_and_words/strategies/families/latin.rb
+- lib/numbers_and_words/strategies/fr.rb
+- lib/numbers_and_words/strategies/it.rb
+- lib/numbers_and_words/strategies/nl.rb
 - lib/numbers_and_words/strategies/ru.rb
 - lib/numbers_and_words/strategies/tr.rb
 - lib/numbers_and_words/strategies/ua.rb
 - lib/numbers_and_words/translations_helpers.rb
 - lib/numbers_and_words/translations_helpers/base.rb
 - lib/numbers_and_words/translations_helpers/en.rb
+- lib/numbers_and_words/translations_helpers/families/base.rb
+- lib/numbers_and_words/translations_helpers/families/cyrillic.rb
+- lib/numbers_and_words/translations_helpers/families/latin.rb
+- lib/numbers_and_words/translations_helpers/fr.rb
+- lib/numbers_and_words/translations_helpers/it.rb
+- lib/numbers_and_words/translations_helpers/nl.rb
 - lib/numbers_and_words/translations_helpers/ru.rb
 - lib/numbers_and_words/translations_helpers/tr.rb
+- lib/numbers_and_words/translations_helpers/ua.rb
 - lib/numbers_and_words/version.rb
 - LICENSE.txt
 - README.rdoc
@@ -128,6 +145,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4516807369747815083
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: