Merge 53d5ded into 6b681be

kslazarev · Nov 19, 2013 · 23bfe3a · 23bfe3a
2 parents 6b681be + 53d5ded
commit 23bfe3a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/lib/numbers_and_words/i18n/locales/numbers.lv.yml b/lib/numbers_and_words/i18n/locales/numbers.lv.yml
@@ -7,7 +7,7 @@ lv:
     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
     thousands:
-      one: tūkstots
+      one: tūkstotis
       other: tūkstoši
     millions:
       one: miljons

diff --git a/lib/numbers_and_words/strategies/figures_converter/languages/lv.rb b/lib/numbers_and_words/strategies/figures_converter/languages/lv.rb
@@ -11,18 +11,14 @@ 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 += 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

diff --git a/spec/numbers_and_words/integer/fixture_examples/lv.yml b/spec/numbers_and_words/integer/fixture_examples/lv.yml
@@ -23,12 +23,12 @@ to_words:
     990: deviņi simti deviņdesmit
     999: deviņi simti deviņdesmit deviņi
   thousands:
-    1000: tūkstots
+    1000: viens tūkstotis
     2000: divi tūkstoši
     4000: četri tūkstoši
     5000: pieci tūkstoši
     11000: vienpadsmit tūkstoši
-    21000: divdesmit viens tūkstots
+    21000: divdesmit viens tūkstotis
     999000: deviņi simti deviņdesmit deviņi tūkstoši
     999999: deviņi simti deviņdesmit deviņi tūkstoši deviņi simti deviņdesmit deviņi
   millions: