pickle_i18n 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/pickle_i18n.rb

@@ -16,17 +16,25 @@ module PickleI18n
       Pickle::Parser.send(:include, PickleI18n::Parser)
       Pickle::Session.send(:include, PickleI18n::Session)
 
-
       # pickle_config.factories の中身はこんな感じ
       #   {"product"=>#<Pickle::Adapter::FactoryGirl:0x00000102b0b618 @klass=Product(id: integer, name: string, price: decimal, created_at: datetime, updated_at: datetime), @name="product">}
       # モデルの日本語名についてもfactoryを設定します
       # pickle_config.factories['商品'] = pickle_config.factories['product']
-      I18n.t(:activemodel, :locale => locale).tap do |translations|
-        model_translations.update(translations[:models].stringify_keys.invert)
-        translations[:attributes].each do |model_name, attrs|
-          model_attribute_translations[model_name.to_s] = attrs.stringify_keys.invert
+
+      [:activemodel, :activerecord].each do |scope|
+        begin
+          models_hash = I18n.config.backend.translate(locale, :models, :scope => scope)
+          model_translations.update(models_hash.stringify_keys.invert)
+
+          model_to_attr_hash = I18n.config.backend.translate(locale, :attributes, :scope => scope)
+          model_to_attr_hash.each do |model_name, attr_hash|
+            model_attribute_translations[model_name.to_s] = attr_hash.stringify_keys.invert
+          end
+        rescue I18n::MissingTranslationData
+          # 翻訳が見つからない場合はスルーします
         end
       end
+
       model_translations.each do |key, value|
         pickle_config.factories[key] = pickle_config.factories[value]
       end

data/pickle_i18n.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pickle_i18n}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["akimatter"]
-  s.date = %q{2011-05-19}
+  s.date = %q{2011-05-20}
   s.description = %q{pickle_i18n support pickle internationalization}
   s.email = %q{akm2000@gmail.com}
   s.extra_rdoc_files = [
@@ -35,11 +35,10 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/akm/pickle_i18n}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{pickle_i18n support pickle internationalization}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: pickle_i18n
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors: 
 - akimatter
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 +09:00
+date: 2011-05-20 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,10 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
         version: 2.3.0
   type: :development
   prerelease: false
@@ -39,10 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 0
         version: 0.6.0
   type: :development
   prerelease: false
@@ -54,10 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   prerelease: false
@@ -69,10 +53,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 0
         version: 1.6.0
   type: :development
   prerelease: false
@@ -84,8 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -128,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3754027908622278514
+      hash: -147195388161263783
       segments: 
       - 0
       version: "0"
@@ -137,13 +115,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: pickle_i18n support pickle internationalization