Merge pull request #85 from jlduran/patch-1

Minor orthographic typo

README.rdoc

@@ -160,7 +160,7 @@ Számok betűvel írva az I18n könyvtár segítségével.
 
     [11, 22, 133].to_words
     => ["eleven", "twenty-two", "one hundred thirty-three"]
-    => ["once", "veintidos", "ciento treinta y tres"]
+    => ["once", "veintidós", "ciento treinta y tres"]
     => ["одиннадцать", "двадцать два", "сто тридцать три"]
     => ["onze", "vingt-deux", "cent trente-trois"]
     => ["одинадцять", "двадцять два", "сто тридцять три"]

lib/numbers_and_words/i18n/locales/numbers.es.yml

@@ -1,9 +1,10 @@
 es:
   numbers:
     ones: [cero, uno, dos, tres, cuatro, cinco, seis, siete, ocho, nueve]
+    ones_twenties: [cero, uno, dós, trés, cuatro, cinco, séis, siete, ocho, nueve]
     one: un
 
-    teens: [diez, once, doce, trece, catorce, quince, dieciseis, diecisiete, dieciocho, diecinueve]
+    teens: [diez, once, doce, trece, catorce, quince, dieciséis, diecisiete, dieciocho, diecinueve]
     tens: [cero, diez, veinti, treinta, cuarenta, cincuenta, sesenta, setenta, ochenta, noventa]
     twenty: veinte
 

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

@@ -11,18 +11,27 @@ def capacity_iteration
             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?
+            FiguresArray::THOUSAND_CAPACITY == @current_capacity
+          end
+
           def hundreds
             super({:is_hundred => (figures[1,2] == [0,1] && simple_number_to_words.empty?)})
           end

lib/numbers_and_words/translations/es.rb

@@ -13,14 +13,19 @@ def ones number, options = {}
         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)
       end
 
       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 = {}

spec/numbers_and_words/integer/fixture_examples/es.yml

@@ -6,9 +6,13 @@ to_words:
   teens:
     10: diez
     11: once
+    16: dieciséis
     19: diecinueve
     20: veinte
     21: veintiuno
+    22: veintidós
+    23: veintitrés
+    26: veintiséis
     80: ochenta
     90: noventa
     99: noventa y nueve
@@ -24,7 +28,7 @@ to_words:
     990: novecientos noventa
     999: novecientos noventa y nueve
   thousands:
-    1000: un mil
+    1000: mil
     2000: dos mil
     4000: cuatro mil
     5000: cinco mil