Merge branch 'release/0.6.0' into development

kslazarev · Mar 25, 2013 · e9c8018 · e9c8018
2 parents c29151f + 9816ae4
commit e9c8018
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,22 @@
-## Next Release
+## 0.6.0 (March 25, 2013)
 
 ### Features
-  * Add Hungarian language. \[[#40](https://github.com/kslazarev/numbers_and_words/pull/40)\] \([@eLod](https://github.com/eLod)\)
+  * Support fractional form for Ukranian. \[[#54](https://github.com/kslazarev/numbers_and_words/issues/54)\] \([@Shk-Serji](https://github.com/Shk-Serji)\)
+  * Support fractional form for Russian. \[[#53](https://github.com/kslazarev/numbers_and_words/issues/53)\] \([@kslazarev](https://github.com/kslazarev)\)
+  * Added functionality for spanish . \[[#51](https://github.com/kslazarev/numbers_and_words/issues/51)\] \([@jaambros](https://github.com/jaambros)\)
+  * Support ordinal form for English and Hungarian. \[[#50](https://github.com/kslazarev/numbers_and_words/issues/50)\] \([@eLod](https://github.com/eLod)\)
+  * Add option :remove_hyphen for English language. \[[#45](https://github.com/kslazarev/numbers_and_words/issues/45)\] \([@kslazarev](https://github.com/kslazarev)\)
+  * Add option :hundreds_with_union for English language. \[[#44](https://github.com/kslazarev/numbers_and_words/issues/44)\] \([@kslazarev](https://github.com/kslazarev)\)
+  * Add Spanish language. (experimental). \[[#42](https://github.com/kslazarev/numbers_and_words/issues/42)\] \([@kslazarev](https://github.com/kslazarev)\)
+  * Add Swedish language. (experimental). \[[#41](https://github.com/kslazarev/numbers_and_words/issues/41)\] \([@kslazarev](https://github.com/kslazarev)\)
+  * Add Hungarian language. \[[#40](https://github.com/kslazarev/numbers_and_words/issues/40)\] \([@eLod](https://github.com/eLod)\)
+  * Add option :gender for Russian language. \[[#39](https://github.com/kslazarev/numbers_and_words/issues/39)\] \([@kslazarev](https://github.com/kslazarev)\)
+  * Gem numbers_and_words not working for decimal values. \[[#38](https://github.com/kslazarev/numbers_and_words/issues/38)\] \([@eLod](https://github.com/eLod)\)
+
+### Supports
+  * Update 'code climate' badge. \[[#47](https://github.com/kslazarev/numbers_and_words/issues/47)\] \([@kslazarev](https://github.com/kslazarev)\)
+  * Add @eLog contacts and project description on Hungarian language to README. \[[#46](https://github.com/kslazarev/numbers_and_words/issues/46)\] \([@eLod](https://github.com/eLod)\)
+  * Add language specific options. \[[#43](https://github.com/kslazarev/numbers_and_words/issues/43)\] \([@kslazarev](https://github.com/kslazarev)\)
 
 ## 0.5.0 (October 19, 2012)
 

diff --git a/README.rdoc b/README.rdoc
@@ -17,11 +17,11 @@ Számok betűvel írva az I18n könyvtár segítségével.
 == Supported Languages / Языки / Langues Supportées
 
 * English
+* Spanish
 * Русский
 * Français
 * Українська
 * Magyar
-* Spanish**
 * Türkçe**
 * Italiano**
 * Nederlands**
@@ -34,6 +34,9 @@ Számok betűvel írva az I18n könyvtár segítségével.
     I18n.with_locale(:en) { 42.to_words }
     => "forty-two"
 
+    I18n.with_locale(:es) { 42.to_words }
+    => "cuarenta y dos"
+
     I18n.with_locale(:ru) { 42.to_words }
     => "сорок два"
 
@@ -45,92 +48,98 @@ Számok betűvel írva az I18n könyvtár segítségével.
 
     21.to_words
     => "twenty-one"
+    => "veintiuno"
     => "двадцать один"
     => "vingt et un"
     => "двадцять один"
     => "huszonegy"
-    => "veinte y uno"
     => "yirmi bir"
     => "ventiuno"
     => "éénentwintig"
     => "tjugo-en"
 
     231.to_words
     => "two hundred thirty-one"
+    => "doscientos treinta y uno"
     => "двести тридцать один"
     => "deux cent trente-trois"
     => "двiстi тридцять один"
     => "kettőszázharmincegy"
-    => "dos ciento teinta y uno
     => "iki yüz otuz bir"
     => "2 cento trentauno"
     => "tweehonderdéénendertig"
     => "två hundra trettio-en"
 
     4030.to_words
     => "four thousand thirty"
+    => "cuatro mil treinta"
     => "четыре тысячи тридцать"
     => "quatre mille trente"
     => "чотири тисячi тридцять"
     => "négyezer-harminc"
-    => "cuatro mil teinta"
     => "dört bin otuz"
     => "quattro mille trenta"
     => "vierthousanddertig"
     => "fyra tusen trettio"
 
     1000100.to_words
     => "one million one hundred"
+    => "un millón cien"
     => "один миллион сто"
     => "un million cent"
     => "один мiльйон сто"
     => "egymillió-egyszáz"
-    => "uno millon uno cien"
     => "bir milyon bir yüz"
     => "uno milione 1 cento"
     => "één miljoen honderd"
     => "en miljoner en hundra"
 
     1000000000000000000000000000000000.to_words
     => "one decillion"
+    => "un quintillardo"
     => "один дециллион"
     => "un quintilliard"
     => "один децильйон"
     => "egykvintilliárd"
-    => "uno quintilliard"
     => "bir desilyon"
     => "uno decillion"
     => "één decillion"
     => "en decillion"
 
     [1, 2, 3].to_words
     => ["one", "two", "three"]
+    => ["uno", "dos", "tres"]
     => ["один", "два", "три"]
     => ["un", "deux", "trois"]
     => ["egy", "kettő", "három"]
 
     [11, 22, 133].to_words
     => ["eleven", "twenty-two", "one hundred thirty-three"] 
+    => ["once", "veintidos", "ciento treinta y tres"]
     => ["одиннадцать", "двадцать два", "сто тридцать три"]
     => ["onze", "vingt-deux", "cent trente-trois"]
     => ["одинадцять", "двадцять два", "сто тридцять три"]
     => ["tizenegy", "huszonkettő", "egyszázharminchárom"]
-    => ["once", "veinte y dos", "uno cien teinta y tres"]
     => ["on bir", "yirmi iki", "bir yüz otuz üç"]
     => ["undici", "ventidue", "1 cento trentatre"]
     => ["elf", "tweeentwintig", "honderddrieendertig"]
     => ["elva", "tjugo-två", "en hundra trettio-tre"]
 
-    I18n.with_locale(:en) { 21.7.to_words }
-    => "twenty-one point seven"
-
-    I18n.with_locale(:en) { 21.7.to_words 'and' }
-    => "twenty-one and seven"
+    21.77.to_words
+    => "twenty-one and seventy-seven hundredths"
+    => "двадцать одна целая и семьдесят семь сотых"
+    => "двадцять одна цiла i сiмдесят сiм сотих"
+    => "huszonegy egész hetvenhét század"
 
 == Language options / Языковые опции
 
 * English
 
+  Ordinal form: (ordinal: [true || false])
+
+    I18n.with_locale(:en) { 21.to_words ordinal: true }
+    => "twenty-first"
+
   Remove hyphen between tens and ones: (remove_hyphen: [true || false])
 
     I18n.with_locale(:en) { 21.to_words remove_hyphen: true }
@@ -141,13 +150,32 @@ Számok betűvel írva az I18n könyvtár segítségével.
     I18n.with_locale(:en) { 111.to_words hundreds_with_union: true }
     => "one hundred and eleven"
 
+  Remove 'zero' from integral part of float: (remove_zero: [true || false])
+
+    I18n.with_locale(:en) { 0.7.to_words remove_zero: true }
+    => "seven tenths"
+
 * Russian
 
-  Изменение рода числительного: (gender: [:female || :male || :neuter])
+  Change gender form: (gender: [:female || :male || :neuter])
 
     I18n.with_locale(:ru) { 1001.to_words gender: :neuter }
     => "одна тысяча одно"
 
+* Ukranian
+
+  Change gender form: (gender: [:female || :male || :neuter])
+
+    I18n.with_locale(:ru) { 1001.to_words gender: :neuter }
+    => "одна тисяча одне"
+
+* Hungarian
+
+  Ordinal form: (ordinal: [true || false])
+
+    I18n.with_locale(:hu) { 21.to_words ordinal: true }
+    => "huszonegyedik"
+
 == Requirements / Требования / Configuration Requise
 
 * 1.8.7 <= Ruby (compatible with/совместимость с/compatible avec Ruby 1.9, JRuby and/и/et Rubinius);

diff --git a/spec/numbers_and_words/float/fixture_examples/en.yml b/spec/numbers_and_words/float/fixture_examples/en.yml
@@ -15,7 +15,7 @@ to_words:
     21.77: twenty-one and seventy-seven hundredths
     111.999: one hundred eleven and nine hundred ninety-nine thousandths
     4242.7463: four thousand two hundred forty-two and seven thousand four hundred sixty-three ten-thousandths
-  fractions_with_zero:
+  fractions_without_zero:
     options:
       :remove_zero: true
     0.1: one tenth