zlocalize 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fcc6278f96e0fe07e33fc8516efc5f8118cf24b
-  data.tar.gz: 83f6e8ac7787ad6b1e902d77c30468c9d7ae7270
+  metadata.gz: e0b7205eae0de41db4cd6fcbc5aa2cbd5807e60a
+  data.tar.gz: 3c0374e95c6e25cbfb8b43dd93238635b22f605a
 SHA512:
-  metadata.gz: 9ae3437dea609e5bc36d40b440520a51fecfbab81c387bc992d683e57df331e56c8d20a04656551975d093041b26bcac30c2be7edbe828cdc4ee713689229936
-  data.tar.gz: cf38ca76ddc195ccdf26d2fe39b362c3ef548a3fdd30c463c9f27b012490c7f88231214c90823582d3832f850b6761b9c068caa45cadd4a2002699c9bcb05f98
+  metadata.gz: ed6638ee95dd4bb20b32fad644c6352f079d5ed6a788f500e2d4fa82c44a473717130eab600af9bb0612a3493889f46c29f1d2ea3ab41ee56c22e15be96cadb9
+  data.tar.gz: d96e729b473b41d377352a1a770f254a1e8e5ed611b483f22aba85c4023b1e31aee1468d8d191bd36daf744c52d49cb25f5393ec7bc6a79def9de11cd93a5981

data/lib/zlocalize/rails/active_record.rb

@@ -11,3 +11,6 @@ ActiveRecord::Base.send(:include, ZLocalize::Translatable::LocalizedDecimalAttri
 
 require 'zlocalize/rails/translated_attributes_serializer'
 ActiveRecord::Base.send(:include, ZLocalize::Translatable::TranslatedAttributesSerializer)
+
+require 'zlocalize/rails/default_locale_evaluator'
+ActiveRecord::Base.send(:include, ZLocalize::Translatable::DefaultLocaleEvaluator)

data/lib/zlocalize/rails/attached_translations.rb

@@ -41,14 +41,18 @@ module ZLocalize
     end
 
     module AttachedTranslations #:nodoc:
+
       def self.included(base)
         base.extend(ClassMethods)
       end
 
       module ClassMethods
 
-        def has_translations
+        def has_translations(options = {})
           has_many :translations, :as => :translated, :dependent => :destroy
+
+          set_default_locale_for_translations(options[:default_locale])
+
           include ZLocalize::Translatable::AttachedTranslations::InstanceMethods
         end
 
@@ -56,12 +60,18 @@ module ZLocalize
 
       module InstanceMethods
 
-        def translate(attr_name,locale = nil)
+        def translate(attr_name,locale = nil, fetch_default = true)
           locale ||= ZLocalize.locale
           if tr = find_translation(attr_name,locale)
-            tr.value
+            return tr.value
           else
-            ''
+            unless (default_locale = evaluate_default_locale_for_translations).blank?
+              if default_locale.to_s != locale.to_s
+                if tr = find_translation(attr_name,default_locale)
+                  return tr.value
+                end
+              end
+            end
           end
         end
 

data/lib/zlocalize/rails/default_locale_evaluator.rb

@@ -0,0 +1,44 @@
+# -*- encoding : utf-8 -*-
+module ZLocalize
+  module Translatable
+    module DefaultLocaleEvaluator
+
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+
+        cattr_reader :default_locale_for_translations
+
+        def set_default_locale_for_translations(value)
+          @@default_locale_for_translations =
+            case value
+              when nil then nil
+              when Symbol, String then value.to_sym
+              else
+                raise(
+                  Zigotos::Translatable::TranslationError,
+                    "default_locale option must be either a String or a Symbol representing a method on this class (trying to set it to a #{value.class.name})"
+                )
+            end
+
+          include ZLocalize::Translatable::DefaultLocaleEvaluator::InstanceMethods
+        end
+      end
+
+      module InstanceMethods
+
+        def evaluate_default_locale_for_translations
+          unless self.class.default_locale_for_translations.blank?
+            self.send(self.class.default_locale_for_translations)
+          else
+            nil
+          end
+        end
+
+      end # module InstanceMethods
+
+    end # module DefaultLocaleEvaluator
+  end # module Translatable
+end # module ZLocalize

data/lib/zlocalize/rails/translated_attributes_serializer.rb

@@ -15,9 +15,11 @@ module ZLocalize
 
           serialize :translated_attributes, HashWithIndifferentAccess
 
+          set_default_locale_for_translations(options[:default_locale])
+
           [attribute_names].flatten.each do |attr_name|
             class_eval "def #{attr_name}(options = {})
-                          read_translated_attribute('#{attr_name}',(options[:locale] || ZLocalize.locale).to_s)
+                          read_translated_attribute('#{attr_name}',(options[:locale] || ZLocalize.locale).to_s, options[:fetch_default] == true)
                         end"
           end
 
@@ -31,13 +33,22 @@ module ZLocalize
 
           include ZLocalize::Translatable::TranslatedAttributesSerializer::InstanceMethods
         end
+
       end
 
       module InstanceMethods
 
-        def read_translated_attribute(attr_name,locale)
-          s = self.translated_attributes[locale]
-          s.is_a?(Hash) ? s[attr_name] : nil
+        def read_translated_attribute(attr_name,locale,fetch_default = true)
+          s = self.translated_attributes[locale].try(:'[]',attr_name)
+          if s.blank? && fetch_default
+            unless (default_locale = evaluate_default_locale_for_translations).blank?
+              if default_locale.to_s != locale.to_s
+                return self.translated_attributes[default_locale].try(:'[]',attr_name)
+              end
+            end
+          else
+            return s
+          end
         end
 
         alias :translate :read_translated_attribute

data/lib/zlocalize/rails/translated_columns.rb

@@ -38,7 +38,9 @@ module ZLocalize
 
       module ClassMethods
 
-        def translates_columns(column_names)
+        def translates_columns(column_names, options = {})
+
+          set_default_locale_for_translations(options[:default_locale])
 
           [column_names].flatten.each do |col_name|
             class_eval "def #{col_name}(options = {})
@@ -54,12 +56,18 @@ module ZLocalize
 
         def read_translated_column(col_name,locale,fetch_default = true)
           s = self.read_attribute("#{col_name}_#{locale}")
-          if !s.nil?
+          if s.blank? && fetch_default
+            unless (default_locale = evaluate_default_locale_for_translations).blank?
+              if default_locale.to_s != locale.to_s
+                attr_name = "#{col_name}_#{default_locale}"
+                if self.respond_to?(attr_name)
+                  return self.read_attribute(attr_name)
+                end
+              end
+            end
+          else
             return s
-          elsif fetch_default == true
-            return self.read_attribute("#{col_name}_#{ZLocalize.default_locale}")
           end
-          nil
         end
 
       end # module InstanceMethods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zlocalize
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Charles Bedard
@@ -81,6 +81,7 @@ files:
 - lib/zlocalize/rails/active_record.rb
 - lib/zlocalize/rails/attached_translations.rb
 - lib/zlocalize/rails/decimal_attributes.rb
+- lib/zlocalize/rails/default_locale_evaluator.rb
 - lib/zlocalize/rails/generators/initializer.rb
 - lib/zlocalize/rails/generators/templates/initializer_template.rb
 - lib/zlocalize/rails/generators/templates/translations_migration_template.rb