Changeset 109

Timestamp:

04/25/07 20:33:41 (5 years ago)

Author:

saimon

Message:

--Allowing for the possibility of fallbacks for the base locale in internal engine.

e.g. If value of attribute is nil when Locale.base? and fallback option

is active, then fallbacks are also checked for the first non-nil value.

Files:

• branches/saimon/trunk_with_rfc4646_support/lib/globalize/localization/db_translate.rb (modified) (2 diffs)
• branches/saimon/trunk_with_rfc4646_support/test/db_localizes_translates_test.rb (modified) (2 diffs)

branches/saimon/trunk_with_rfc4646_support/lib/globalize/localization/db_translate.rb

@@ -470 +470 @@
-                else
-                  value = read_attribute(:#{facet})
+                  #If the base locale value is nil and fallback is active...
+                  unless value
+                    if @@facet_options[:#{facet}][:fallback]
+                      #If fallbacks are active then go through each fallback locale
+                      #and look for a translation
+                      Locale.active.possible_languages.each do |fallback|
+                        unless Locale.base_language.code == fallback.code
+                          localized_method = "#{facet}_\#{fallback.code}"
+                          value = read_attribute(localized_method.to_sym)
+                          break if value
+                        end
+                      end
+                    end
+                  end
-                end
-                value.nil? ? nil : add_bidi(value, :#{facet})
@@ -500 +514 @@
-                else
-                  value = read_attribute_before_type_cast('#{facet}')
+                  #If the base locale value is nil and fallback is active...
+                  unless value
+                    if @@facet_options[:#{facet}][:fallback]
+                      #If fallbacks are active then go through each fallback locale
+                      #and look for a translation
+                      Locale.active.possible_languages.each do |fallback|
+                        unless Locale.base_language.code == fallback.code
+                          localized_method = "#{facet}_\#{fallback.code}_before_type_cast"
+                          value = send(localized_method.to_sym)
+                          break if value
+                        end
+                      end
+                    end
+                  end
-                end
-                value.nil? ? nil : add_bidi(value, :#{facet})

branches/saimon/trunk_with_rfc4646_support/test/db_localizes_translates_test.rb

@@ -45 +45 @@
-
-  def setup
-'en'
+Language.pick('en')
-    Globalize::Locale.set('en','US')
-  end
@@ -551 +551 @@
-    assert_nil prod.description_before_type_cast
-  end
+
+  def test_fallbacks_for_base_locale
+
+    Globalize::Locale.set_base_language(Language.pick('es-MX'))
+
+    Globalize::Locale.set('he','IL')
+    prod = Product.create!(:code => 'test-fallback 2',
+                           :name => 'hebrew name fallbacks 2',
+                           :description => 'hebrew desc fallbacks 2')
+    assert_equal 'hebrew name fallbacks 2', prod.name
+    assert_equal 'hebrew desc fallbacks 2', prod.description
+    assert_equal 'hebrew name fallbacks 2', prod.name_before_type_cast
+    assert_equal 'hebrew desc fallbacks 2', prod.description_before_type_cast
+
+    Globalize::Locale.set('es-MX','MX')
+    assert_nil prod.name
+    assert_nil prod.name_before_type_cast
+    assert_nil prod.description
+    assert_nil prod.description_before_type_cast
+
+    Globalize::Locale.set('es','ES')
+    prod.name = 'spanish name fallbacks 2'
+    prod.description = 'spanish desc fallbacks 2'
+    prod.save!
+    assert_equal 'spanish name fallbacks 2', prod.name
+    assert_equal 'spanish desc fallbacks 2', prod.description
+    assert_equal 'spanish name fallbacks 2', prod.name_before_type_cast
+    assert_equal 'spanish desc fallbacks 2', prod.description_before_type_cast
+
+    Globalize::Locale.set('es-MX','MX')
+    assert_equal 'spanish name fallbacks 2', prod.name
+    assert_equal 'spanish name fallbacks 2', prod.name_before_type_cast
+    assert_nil prod.description
+    assert_nil prod.description_before_type_cast
+
+    Globalize::Locale.set('es-MX','ES', [['he','IL']])
+    assert_equal 'hebrew name fallbacks 2', prod.name
+    assert_equal 'hebrew name fallbacks 2', prod.name_before_type_cast
+    assert_nil prod.description
+    assert_nil prod.description_before_type_cast
+
+    Globalize::Locale.set_base_language(Language.pick('en'))
+  end
+
-end