ActionItem862: translating default contents in settings

Antonio Terceiro
1 parent 92389213
Showing 2 changed files with 7 additions and 1 deletions Show diff stats
lib/acts_as_having_settings.rb
test/unit/acts_as_having_settings_test.rb
@@ -28,7 +28,7 @@ module ActsAsHavingSettings
         class_eval <<-CODE
           def #{setting}
             val = send(self.class.settings_field)[:#{setting}]
-            val.nil? ? #{default} : val
+            val.nil? ? (#{default}.is_a?(String) ? gettext(#{default}) : #{default}) : val
           end
           def #{setting}=(value)
             send(self.class.settings_field)[:#{setting}] = self.class.acts_as_having_settings_type_cast(value, #{data_type.inspect})
@@ -6,6 +6,7 @@ class ActsAsHavingSettingsTest &lt; Test::Unit::TestCase
   class TestClass < Block
     settings_items :flag, :type => :boolean
     settings_items :flag_disabled_by_default, :type => :boolean, :default => false
+    settings_items :name, :type => :string, :default => N_('ENGLISH TEXT')
   end
   should 'store settings in a hash' do
@@ -62,6 +63,11 @@ class ActsAsHavingSettingsTest &lt; Test::Unit::TestCase
     assert_equal false, TestClass.new.flag_disabled_by_default
   end
+  should 'translate default values' do
+    TestClass.any_instance.expects(:gettext).with('ENGLISH TEXT').returns("TRANSLATED")
+    assert_equal 'TRANSLATED', TestClass.new.name
+  end
+
   should 'be able to specify type of atrributes (boolean)' do
     obj = TestClass.new
     obj.flag = 'true'
	@@ -28,7 +28,7 @@ module ActsAsHavingSettings		@@ -28,7 +28,7 @@ module ActsAsHavingSettings
28	class_eval <<-CODE	28	class_eval <<-CODE
29	def #{setting}	29	def #{setting}
30	val = send(self.class.settings_field)[:#{setting}]	30	val = send(self.class.settings_field)[:#{setting}]
31	- val.nil? ? #{default} : val	31	+ val.nil? ? (#{default}.is_a?(String) ? gettext(#{default}) : #{default}) : val
32	end	32	end
33	def #{setting}=(value)	33	def #{setting}=(value)
34	send(self.class.settings_field)[:#{setting}] = self.class.acts_as_having_settings_type_cast(value, #{data_type.inspect})	34	send(self.class.settings_field)[:#{setting}] = self.class.acts_as_having_settings_type_cast(value, #{data_type.inspect})