globalize-automatic 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b5f88643e3a9f0e294da50bd44985b2a53eacf7
-  data.tar.gz: 4d5fe443cb3ac353fee710ca5c95a19f5e9543b4
+  metadata.gz: 71eb33551bdba0845058a33b51764557c0b89291
+  data.tar.gz: 9862fb16302f5ba2f1fac1cde23fc17e1d745d22
 SHA512:
-  metadata.gz: 6507f98df54cb7c6334bc29c339c756df23f26b903fc14eb002ea03ec92f815248462336bfdedcdc12f87209294eebcde451484991d36c2774915478023f0949
-  data.tar.gz: e8422202f3193aed4b0a057bbbd891c4c63f1fa8e555139b915c484fbdf9c3a6889856c7599288a0d82f9c42071f7dd28ae5ea156050eff815958fec001742cf
+  metadata.gz: 6450461d008e368860c2e51c55def714f95151d1bc5956f9e1935f814979f8521ab8f4207ab62f88ba17f2c0ec72aff41be04187c9f1d2f686d82b6bb194637d
+  data.tar.gz: 4a7f159688a01035211d3f88067fa33662af6542a1edc0961f80b2a633110de715166b59e8847f058f20444b6b09a10a39b2a691cba70314f468ff74b1c3b6e6

data/lib/globalize/automatic.rb

@@ -109,12 +109,14 @@ module Globalize::Automatic
 
     # 自動翻訳元言語
     # attr_nameの自動変換が有効なとき
-    # 現在設定されている中で一番優先度の高い翻訳元localeを返す
+    # 現在翻訳元として設定されていてかつ自動変換が無効なものの中で
+    # 一番優先度の高い翻訳元localeを返す。
     # どの言語も設定されてない場合は一番優先度の高いもの
     # 自動翻訳元でない場合nil
     def automatic_translation_locale(attr_name)
       locales = automatic_translation_field_locales[attr_name]
       locales.each do |locale|
+        next if send(self.class.automatic_translation_attribute_name_for(attr_name, locale))
         return locale unless translation_for(locale)[attr_name].blank?
       end
       locales.first

data/lib/globalize/automatic/version.rb

@@ -2,6 +2,6 @@
 
 module Globalize
   module Automatic
-    VERSION = '0.0.7'
+    VERSION = '0.0.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: globalize-automatic
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Yuichi Takeuchi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: globalize