valvat 0.3.1 → 0.3.2

data/CHANGES.md

@@ -1,6 +1,13 @@
 ### dev
 
-[full changelog](http://github.com/yolk/valvat/compare/v0.3.1...master)
+[full changelog](http://github.com/yolk/valvat/compare/v0.3.2...master)
+
+### 0.3.2 / 2011-01-14
+
+[full changelog](http://github.com/yolk/valvat/compare/v0.3,1...v0.3.2)
+
+* Fixed localization strings (en/de)
+* Moved locales folder to lib/valvat/locales
 
 ### 0.3.1 / 2011-01-12
 

data/lib/valvat/active_model.rb

@@ -40,5 +40,5 @@ module ActiveModel
 end
 
 %w(en de).each do |locale|
-  I18n.load_path << "#{File.dirname(__FILE__)}/../locale/#{locale}.yml"
+  I18n.load_path << "#{File.dirname(__FILE__)}/locales/#{locale}.yml"
 end

data/lib/{locale → valvat/locales}/de.yml

@@ -12,8 +12,8 @@ de:
       cz: tschechische
       de: deutsche
       dk: dänische
-      ee: estnisch
-      es: spanisch
+      ee: estnische
+      es: spanische
       fi: finnische
       fr: französische
       gb: britische
@@ -21,10 +21,10 @@ de:
       hu: ungarische
       ie: irische
       it: italienische
-      lt: litauisch
-      lu: luxemburgisch
+      lt: litauische
+      lu: luxemburgische
       lv: lettische
-      mt: malteser
+      mt: maltesische
       nl: niederländische
       pl: polnische
       pt: portugiesische

data/lib/valvat/locales/en.yml

@@ -0,0 +1,34 @@
+en:
+  errors:
+    messages:
+      invalid_vat: is not a valid %{country_adjective} vat number
+  valvat:
+    country_adjectives:
+      eu: European
+      at: Austrian
+      be: Belgian
+      bg: Bulgarian
+      cy: Cypriot
+      cz: Czech
+      de: German
+      dk: Danish
+      ee: Estonian
+      es: Spanish
+      fi: Finnish
+      fr: French
+      gb: British
+      gr: Greek
+      hu: Hungarian
+      ie: Irish
+      it: Italian
+      lt: Lithuanian
+      lu: Luxembourg
+      lv: Latvian
+      mt: Maltese
+      nl: Dutch
+      pl: Polish
+      pt: Portuguese
+      ro: Rumanian
+      se: Swedish
+      si: Slovenian
+      sk: Slovakian

data/lib/valvat/version.rb

@@ -1,3 +1,3 @@
 class Valvat
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/valvat/active_model_spec.rb

@@ -52,7 +52,7 @@ describe Invoice do
     
     it "should add default (country specific) error message" do
       invoice.valid?
-      invoice.errors[:vat_number].should eql(["is not a valid german vat number"])
+      invoice.errors[:vat_number].should eql(["is not a valid German vat number"])
     end
     
     context "with i18n translation in place" do
@@ -82,13 +82,13 @@ describe Invoice do
       it "should replace country adjective placeholder" do
         invoice = Invoice.new(:vat_number => "IE123")
         invoice.valid?
-        invoice.errors[:vat_number].should eql(["is not a irish vat"])
+        invoice.errors[:vat_number].should eql(["is not a Irish vat"])
       end
 
-      it "should fall back to 'european' if country is missing" do
+      it "should fall back to 'European' if country is missing" do
         invoice = Invoice.new(:vat_number => "XX123")
         invoice.valid?
-        invoice.errors[:vat_number].should eql(["is not a european vat"])
+        invoice.errors[:vat_number].should eql(["is not a European vat"])
       end
     end
   end
@@ -192,13 +192,13 @@ describe InvoiceCheckCountry do
   it "should give back error message with country from :country_match" do
     invoice = InvoiceCheckCountry.new(:country => "FR", :vat_number => "DE259597697")
     invoice.valid?
-    invoice.errors[:vat_number].should eql(["is not a valid french vat number"])
+    invoice.errors[:vat_number].should eql(["is not a valid French vat number"])
   end
   
   it "should give back error message with country from :country_match even on invalid vat number" do
     invoice = InvoiceCheckCountry.new(:country => "FR", :vat_number => "DE259597697123")
     invoice.valid?
-    invoice.errors[:vat_number].should eql(["is not a valid french vat number"])
+    invoice.errors[:vat_number].should eql(["is not a valid French vat number"])
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Sebastian Munz
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 +01:00
+date: 2011-01-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -139,10 +139,10 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- lib/locale/de.yml
-- lib/locale/en.yml
 - lib/valvat.rb
 - lib/valvat/active_model.rb
+- lib/valvat/locales/de.yml
+- lib/valvat/locales/en.yml
 - lib/valvat/lookup.rb
 - lib/valvat/syntax.rb
 - lib/valvat/utils.rb

data/lib/locale/en.yml

@@ -1,34 +0,0 @@
-en:
-  errors:
-    messages:
-      invalid_vat: is not a valid %{country_adjective} vat number
-  valvat:
-    country_adjectives:
-      eu: european
-      at: austrian
-      be: belgian
-      bg: bulgarian
-      cy: cypriot
-      cz: czech
-      de: german
-      dk: danish
-      ee: estonian
-      es: spanish
-      fi: finnish
-      fr: french
-      gb: british
-      gr: greek
-      hu: hungarian
-      ie: irish
-      it: italian
-      lt: lithuanian
-      lu: luxembourg
-      lv: latvian
-      mt: maltese
-      nl: dutch
-      pl: polish
-      pt: portuguese
-      ro: rumanian
-      se: swedish
-      si: slovenian
-      sk: slovakian