i18n-complements 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3b22b0de1c457756d284aa0a6eb849d5bc0a954
-  data.tar.gz: e6a52e8aace1e3e30264b41e2bc5a84419b2492c
+  metadata.gz: e315e195eaf2ffc7641dafa65b29f64daf5270cf
+  data.tar.gz: ade2b242b65632eb4164c42ae859af019604f4d1
 SHA512:
-  metadata.gz: c4bc7979b0ec81716b0ab6c6566401dadb9682ad87fcc668129fcc158c0ec845ae84581bee40ead4315f631233281810ff3ba5a0fb2491d664b0664b61535f21
-  data.tar.gz: 1a58f4a68fd03024545266768f7a305d843064cc24f2b91242ab2cf0013db29c7c336014e870e8c8be01ebb1fc60e71aba6c5d604a17679fa9ee5674bc0a72ad
+  metadata.gz: 03d540be38622615ed373e3f48aeb9288b58c16b12fbb5bb5aba1e9bd4e1270806b9ac04faeda0e7596b1a7ea61cf54165549970295ed5e19328e7c1ac3fe07a
+  data.tar.gz: 9fe8dc68f570ca829850deebdf3fd1f5bac7c5afbbb3c7bc0aaa8650412dbb1bb2b5ce8b95f631cfe41faffbc9a027077bb81c777835bdd89f747910feed8d7d

data/lib/i18n-complements/numisma/currencies.yml

@@ -318,7 +318,7 @@ FRF:
   countries: [fr]
   number: "250"
   precision: 2
-  symbol: 'F'
+  unit: 'F'
 GBP:
   active: true
   countries: [gb, gg, im, je]

data/lib/i18n-complements/numisma/currency.rb

@@ -53,10 +53,10 @@ module I18nComplements
         formatcy  = I18n.translate("number.currency.formats.#{self.code}".to_sym, :locale => options[:locale], :default => {})
         formatcy[:negative_format] ||= "-" + formatcy[:format] if formatcy[:format]
 
-        prec = {}
-        prec[:separator] = formatcy[:separator] || defaultt[:separator] || defaults[:separator] || ','
-        prec[:delimiter] = formatcy[:delimiter] || defaultt[:delimiter] || defaults[:delimiter] || ''
-        prec[:precision] = formatcy[:precision] || self.precision || defaultt[:precision] || 3
+        formatter = {}
+        formatter[:separator] = formatcy[:separator] || defaultt[:separator] || defaults[:separator] || ','
+        formatter[:delimiter] = formatcy[:delimiter] || defaultt[:delimiter] || defaults[:delimiter] || ''
+        formatter[:precision] = formatcy[:precision] || self.precision || defaultt[:precision] || 3
         format           = formatcy[:format] || defaultt[:format] || "%n-%u" # defaults[:format] || 
         negative_format  = formatcy[:negative_format] || defaultt[:negative_format] || defaults[:negative_format] || "-" + format
         unit             = formatcy[:unit] || self.unit || self.code
@@ -68,10 +68,10 @@ module I18nComplements
         
         value = amount.to_s
         integers, decimals = value.split(/\./)
-        value = integers.gsub(/^0+[1-9]+/, '').gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{prec[:delimiter]}")
+        value = integers.gsub(/^0+[1-9]+/, '').gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{formatter[:delimiter]}")
         unless decimals.to_s.match(/^\s*$/)
-          decimals = decimals.gsub(/0+$/, '').ljust(prec[:precision], '0').reverse.split(/(?=\d{3})/).reverse.collect{|x| x.reverse}.join(prec[:delimiter])
-          value += prec[:separator] + decimals
+          value << formatter[:separator]
+          value << decimals.gsub(/0+$/, '').ljust(formatter[:precision], '0').scan(/.{1,3}/).join(formatter[:delimiter])
         end
         return format.gsub(/%n/, value).gsub(/%u/, unit).gsub(/%s/, "\u{00A0}")
       end

data/lib/i18n-complements/version.rb

@@ -1,3 +1,3 @@
 module I18nComplements
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/test/test_currencies.rb

@@ -45,9 +45,12 @@ class TestCurrencies < Test::Unit::TestCase
   
   def test_number_formatting_with_currency
     number = 413500
-    assert_equal "¥413,500", ::I18n.localize(number, :locale => :eng, :currency=>"JPY")
-    assert_equal "413\u{00A0}500\u{00A0}¥", ::I18n.localize(number, :locale => :fra, :currency=>"JPY")
-    assert_equal "413,500円", ::I18n.localize(number, :locale => :jpn, :currency=>"JPY")
+    assert_equal "¥413,500", ::I18n.localize(number, :locale => :eng, :currency => "JPY")
+    assert_equal "413\u{00A0}500\u{00A0}¥", ::I18n.localize(number, :locale => :fra, :currency => "JPY")
+    assert_equal "413,500円", ::I18n.localize(number, :locale => :jpn, :currency => "JPY")
+    assert_equal "€0.325,1", ::I18n.localize(0.3251, :locale => :eng, :currency => "EUR")
+    assert_equal "0,325\u{00A0}1\u{00A0}F", ::I18n.localize(0.3251, :locale => :fra, :currency => "FRF")
+    assert_equal "€123,852.325,1", ::I18n.localize(123852.3251, :locale => :eng, :currency => "EUR")
   end
 
   def test_number_formatting_with_currency_with_core_extensions

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n-complements
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Brice Texier