dm-validations-i18n 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/dm-validations-i18n.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-validations-i18n}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Masaki KOMAGATA"]
-  s.date = %q{2010-10-06}
+  s.date = %q{2010-10-07}
   s.description = %q{Localize error messages in dm-validations.}
   s.email = %q{komagata@gmail.com}
   s.extra_rdoc_files = [

data/lib/dm-validations-i18n.rb

@@ -79,7 +79,12 @@ end
 class DataMapper::Validations::ValidationErrors
   class << self
     def default_error_message_with_localized_field_name(key, field, *values)
-      field = DataMapper::Validations::I18n.field_name_translator.translate(field)
+      translator = DataMapper::Validations::I18n.field_name_translator
+
+      if translator
+        field = translator.translate(field)
+      end
+
       @@default_error_messages[key] % [field, *values].flatten
     end
 

data/test/test_dm-validations-i18n.rb

@@ -20,17 +20,15 @@ class TestDmValidationsI18n < Test::Unit::TestCase
     end
   end
 
-  # context 'localized field names with callback' do
-  #   DataMapper::Validations::I18n.translate_field_name_with do |field_name|
-  #     assert_equal field_name, 'foo'
-  #   end
-  # end
-  # context 'localized field names with rails I18n.t' do
-  #   # mock I18n.t(field, "dm-validation")
-  #   DataMapper::Validations::I18n.translate_field_name_with :rails
-  # end
-
   context 'DataMapper::Validations::ValidationErrors.default_error_message' do
+    should "not localize field names if not asked to" do
+      # manually set to nil, beacuse this test might not be the first to run.
+      DataMapper::Validations::I18n.field_name_translator = nil
+
+      DataMapper::Validations::I18n.localize!('zh-TW')
+      assert_equal("height 無效", DataMapper::Validations::ValidationErrors.default_error_message(:invalid, :height))
+    end
+
     should "localize field names with Rails way: I18n.t is used." do
       # mock I18n.t
       class ::I18n

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-validations-i18n
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Masaki KOMAGATA
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 +09:00
+date: 2010-10-07 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency