i18n-one_sky 2.0.7 → 2.0.8

data/lib/generators/one_sky/init_active_record_backend/templates/active_record_backend.rb

@@ -7,7 +7,8 @@ I18n::Backend::ActiveRecord.send(:include, I18n::Backend::Flatten)
 # ensure we have migrated before we try and use the backend.
 if I18n::Backend::ActiveRecord::Translation.table_exists?
   # chain it into the existing backend
-  I18n.backend = I18n::Backend::Chain.new(I18n.backend, I18n::Backend::ActiveRecord.new)
+  # the Active Record backend must come first!
+  I18n.backend = I18n::Backend::Chain.new(I18n::Backend::ActiveRecord.new, I18n.backend)
 else
   warn "There is currently no translations table. You may need to migrate."
 end

data/lib/i18n/one_sky/active_record_client.rb

@@ -7,8 +7,6 @@ module I18n
     # it encapsulates the logic of I18n::Backend::ActiveRecord
     class ActiveRecordClient < ClientBase
 
-      Translation = I18n::Backend::ActiveRecord::Translation
-
       def download
         puts "Downloading translations for I18n Active Record Backend:"
 
@@ -25,11 +23,8 @@ module I18n
           else
             yaml = platform.translation.download_yaml(locale_code)
             YAML.load(yaml).each do |code, translations|
-              puts "  locale: #{locale_code}, count: #{translations.length}"
-              translations.each do |key, value|
-                Translation.locale(i18n_locale_code).delete_all(["key=?", key])
-                Translation.create!(:locale => i18n_locale_code, :key => key.to_s, :value => value)
-              end
+              active_record_backend.store_translations(i18n_locale_code, translations)
+              puts "  locale: #{i18n_locale_code}, count: #{translation_scope(i18n_locale_code).count}"
             end
           end
         end
@@ -42,13 +37,29 @@ module I18n
       # Grab all the keys from the active record store.
       def all_phrases
         phrases = Hash.new
-        I18n::Backend::ActiveRecord::Translation.locale(I18n.default_locale).find_each() do |translation|
+        translation_scope(I18n.default_locale).find_each() do |translation|
           phrases[translation.key] = translation.value
         end
         phrases
       end
       memoize :all_phrases
 
+      protected
+
+      def active_record_backend
+        if I18n.backend.is_a?(I18n::Backend::Chain)
+          I18n.backend.backends.detect do |backend|
+            backend.is_a?(I18n::Backend::ActiveRecord)
+          end
+        else
+          I18n.backend
+        end
+      end
+
+      def translation_scope(locale)
+        I18n::Backend::ActiveRecord::Translation.locale(locale)
+      end
+
     end
   end
 end

data/lib/i18n/one_sky/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Onesky
-    VERSION = "2.0.7"
+    VERSION = "2.0.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n-one_sky
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2012-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70092684525480 !ruby/object:Gem::Requirement
+  requirement: &70160615244300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70092684525480
+  version_requirements: *70160615244300
 - !ruby/object:Gem::Dependency
   name: one_sky
-  requirement: &70092684524980 !ruby/object:Gem::Requirement
+  requirement: &70160615243800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70092684524980
+  version_requirements: *70160615243800
 - !ruby/object:Gem::Dependency
   name: i18n-active_record
-  requirement: &70092684524520 !ruby/object:Gem::Requirement
+  requirement: &70160615243320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70092684524520
+  version_requirements: *70160615243320
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70092684524060 !ruby/object:Gem::Requirement
+  requirement: &70160615242840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70092684524060
+  version_requirements: *70160615242840
 - !ruby/object:Gem::Dependency
   name: memoist
-  requirement: &70092684523680 !ruby/object:Gem::Requirement
+  requirement: &70160615242460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70092684523680
+  version_requirements: *70160615242460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70092684523140 !ruby/object:Gem::Requirement
+  requirement: &70160615241900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *70092684523140
+  version_requirements: *70160615241900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70092684522640 !ruby/object:Gem::Requirement
+  requirement: &70160615241400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70092684522640
+  version_requirements: *70160615241400
 description: A set of I18n extensions that use OneSky. At its most basic, this allows
   you to easily submit translation requests to the OneSky service and download available
   translations as Simple backend YAML files.