numbers_and_words 0.7.0 → 0.7.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDgyNjU0NDljYTg3YzBkZDZlNGNlYmFmM2Q5YWJiYTBjYmYyYTc4NQ==
+    YjY4MzliZjgxMWZjZTcyM2FhNDYxZWY0NTU1MmUzYWNhZWI4MWYxOQ==
   data.tar.gz: !binary |-
-    YjVhYmQzYjNiOTViNGZiM2I3NWZlYmU3MzdlOWRlZmI1MDkxOTRkOQ==
+    MDNiNGE0ODQ4NjEzMDliZmJkNWQxMTI1MWU4YTI1ZTRhMzFlODE2Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzgxYTE2YWJmNzc3MzE5Y2Y2NGE0YzliNzRmZTA5YjgzNDVmNTFiZWE2YzM3
-    NWI5OTY0NzlmNDUwNTAxNWIyYmY1ZjljNDNiMzI1ZmNiZDhkMjc1ZGM3Zjdk
-    MmI3YzU1ODlhNmY5MDU3ZWRlNWFhZjk2YWIzNzhlYmZkOGQ3OWE=
+    MGI3NjJkY2E1OWM2OTFhNzZmZmY4NjFhNGNhY2QwZGZhN2RmZjE0YjJlNzUw
+    MTAzNmZiMDY0MzJiOWFjZGY0N2JlZjVlYTVlZTNjZGQzNGNiZTU3YjJlMTFm
+    ZDM5YTQ2NjYzZjAxZDkyYzI2Y2EzZGRkMzU5NGZkYWMxMjMyNzk=
   data.tar.gz: !binary |-
-    NDM0NDRlMjg4ZmYzNzg0ZDg4Njg4YWM4YTBkN2NhNTYzY2RiNDIwZDBiZGM4
-    Njc5YjkyMTVhOGQ1MjgxYzlmMjIwNzBhOGJiZmIyNmI4Y2ZiZTAwNWYxYTcw
-    ZmYwYmM5YTBlOTc5MWYxOTg3YmM5YzQ5YTU3NDA3YzE5ZWY3MzQ=
+    NjAwODNmZDFkMjE0ODc5ZGI0Y2M3YWYwNmU1M2ZlOTY1YTdiM2IxMmM2MWMx
+    ZDM4MDIzNmJlNWFmMjY3Y2M3ODMxMWU1ZmE1ZmU3NDUxZTc0MTYxMTk5Y2Ew
+    ZTY2YmFkYzQzMDM4NzEzYjg0NjE0ODI1ZGQ2YjJiZTFmMmFjNjU=

data/lib/numbers_and_words/i18n/locales/numbers.en-GB.yml

@@ -11,7 +11,7 @@ en-GB:
       tens: [zeroth, tenth, twentieth, thirtieth, fortieth, fiftieth, sixtieth, seventieth, eightieth, ninetieth]
       hundreds: hundredth
       mega: [zeroth, thousandth, millionth, billionth, trillionth, quadrillionth, quintillionth, sextillionth, septillionth, octillionth, nonillionth, decillionth]
-    fraction_separator: and
+    union_separator: point
     micro: [_, tenths, hundredths, thousandths, millionths, billionths, trillionths, quadrillionths, quintillionths, sextillionths, septillionths, octillionths, nonillionths, decillionths]
     tenths:
       one: tenth
@@ -52,4 +52,4 @@ en-GB:
     decillionths:
       one: decillionth
       other: decillionths
-    union: point
+    union: and

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

@@ -11,7 +11,7 @@ en:
       tens: [zeroth, tenth, twentieth, thirtieth, fortieth, fiftieth, sixtieth, seventieth, eightieth, ninetieth]
       hundreds: hundredth
       mega: [zeroth, thousandth, millionth, billionth, trillionth, quadrillionth, quintillionth, sextillionth, septillionth, octillionth, nonillionth, decillionth]
-    fraction_separator: and
+    union_separator: and
     micro: [_, tenths, hundredths, thousandths, millionths, billionths, trillionths, quadrillionths, quintillionths, sextillionths, septillionths, octillionths, nonillionths, decillionths]
     tenths:
       one: tenth

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

@@ -6,6 +6,7 @@ hu:
     tens_with_ones: [nulla, tizen, huszon, harminc, negyven, ötven, hatvan, hetven, nyolcvan, kilencven]
     hundreds: száz
     mega: [egy, ezer, millió, milliárd, billió, billiárd, trillió, trilliárd, kvadrillió, kvadrilliárd, kvintillió, kvintilliárd]
+    union_separator: egész
     union: egész
     ordinal:
       ones: [nulladik, első, második, harmadik, negyedik, ötödik, hatodik, hetedik, nyolcadik, kilencedik]

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

@@ -7,6 +7,7 @@ ru:
     teens: [десять, одиннадцать, двенадцать, тринадцать, четырнадцать, пятнадцать, шестнадцать, семнадцать, восемнадцать, девятнадцать]
     tens: [ноль, десять, двадцать, тридцать, сорок, пятьдесят, шестьдесят, семьдесят, восемьдесят, девяносто]
     hundreds: [ноль, сто, двести, триста, четыреста, пятьсот, шестьсот, семьсот, восемьсот, девятьсот]
+    union_separator: 'и'
     union: 'и'
     micro:
       one: [_, десятая, сотая, тысячная, миллионная, миллиардная, триллионная]

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

@@ -7,6 +7,7 @@ ua:
     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льярдна, трильйонна]

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

@@ -14,7 +14,7 @@ module NumbersAndWords
             end
 
             def union_separator
-              options[:union_separator] || @translations.union || ''
+              options[:union_separator] || @translations.union_separator || ''
             end
           end
         end

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

@@ -27,6 +27,10 @@ module NumbersAndWords
         def union
           t :union
         end
+
+        def union_separator
+          t :union_separator
+        end
       end
     end
   end

data/lib/numbers_and_words/version.rb

@@ -1,3 +1,3 @@
 module NumbersAndWords
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numbers_and_words
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Kirill Lazarev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-14 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n