justinfrench-formtastic 0.2.3 → 0.2.4

data/lib/formtastic.rb

@@ -442,7 +442,8 @@ module Formtastic #:nodoc:
         object_name = @object_name.to_s.send(@@label_str_method)
       end
 
-      I18n.t(prefix.downcase, :default => prefix, :scope => [:formtastic]) << ' ' << object_name
+      button_text = I18n.t(prefix.downcase, :default => prefix, :scope => [:formtastic])
+      "#{button_text} #{object_name}"
     end
 
     # Determins if the attribute (eg :title) should be considered required or not.
@@ -979,6 +980,9 @@ module Formtastic #:nodoc:
     # 'Task #3' and so on.
     #
     def field_set_and_list_wrapping(html_options, contents='', &block) #:nodoc:
+      html_options[:name] ||= html_options.delete(:title)
+      html_options[:name] = localized_attribute_string(html_options[:name], html_options[:name], :title) if html_options[:name].is_a?(Symbol)
+
       legend  = html_options.delete(:name).to_s
       legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
       legend  = template.content_tag(:legend, template.content_tag(:span, legend)) unless legend.blank?
@@ -1213,7 +1217,8 @@ module Formtastic #:nodoc:
       if attr_value.is_a?(String)
         attr_value
       else
-        use_i18n = attr_value.nil? ? @@i18n_lookups_by_default : attr_value
+        use_i18n = attr_value.nil? ? @@i18n_lookups_by_default : (attr_value != false)
+        
         if use_i18n
           model_name = @object.class.name.underscore
           action_name = template.params[:action].to_s rescue ''

data/spec/formtastic_spec.rb

@@ -2574,18 +2574,49 @@ describe 'Formtastic' do
           end
         end
 
-        describe 'when a :name option is provided' do
-          before do
-            @legend_text = "Advanced options"
-
-            semantic_form_for(@new_post) do |builder|
-              builder.inputs :name => @legend_text do
+        describe 'when a :name or :title option is provided' do
+          describe 'and is a string' do
+            before do
+              @legend_text = "Advanced options"
+              @legend_text_using_title = "Advanced options 2"
+              semantic_form_for(@new_post) do |builder|
+                builder.inputs :name => @legend_text do
+                end
+                builder.inputs :title => @legend_text_using_title do
+                end
               end
             end
+
+            it 'should render a fieldset with a legend inside the form' do
+              output_buffer.should have_tag("form fieldset legend", /#{@legend_text}/)
+              output_buffer.should have_tag("form fieldset legend", /#{@legend_text_using_title}/)
+            end
           end
+          
+          describe 'and is a symbol' do
+            before do
+              @localized_legend_text = "Localized advanced options"
+              @localized_legend_text_using_title = "Localized advanced options 2"
+              I18n.backend.store_translations :en, :formtastic => {
+                  :titles => {
+                      :post => {
+                          :advanced_options => @localized_legend_text,
+                          :advanced_options_2 => @localized_legend_text_using_title
+                        }
+                    }
+                }
+              semantic_form_for(@new_post) do |builder|
+                builder.inputs :name => :advanced_options do
+                end
+                builder.inputs :title => :advanced_options_2 do
+                end
+              end
+            end
 
-          it 'should render a fieldset inside the form' do
-            output_buffer.should have_tag("form fieldset legend", /#{@legend_text}/)
+            it 'should render a fieldset with a localized legend inside the form' do
+              output_buffer.should have_tag("form fieldset legend", /#{@localized_legend_text}/)
+              output_buffer.should have_tag("form fieldset legend", /#{@localized_legend_text_using_title}/)
+            end
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: justinfrench-formtastic
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Justin French
@@ -9,7 +9,7 @@ autorequire: formtastic
 bindir: bin
 cert_chain: []
 
-date: 2009-09-07 00:00:00 -07:00
+date: 2009-09-10 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,7 @@ files:
 - spec/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/justinfrench/formtastic/tree/master
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -56,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A Rails form builder plugin/gem with semantically rich and accessible markup