0
@@ -672,21 +672,20 @@ module Globalize # :nodoc:
0
         # an SQL statement.
0
         # REDEFINED to include only untranslated fields. We don't want to overwrite the
0
         # base translation with other translations.
0
-        def attributes_with_quotes(include_primary_key = true, include_readonly_attributes = true)
0
+        def attributes_with_quotes(include_primary_key = true, include_readonly_attributes = true, attribute_names = @attributes.keys)
0
+          quoted = {}
0
+          connection = self.class.connection
0
           if Locale.base?
0
-            quoted = attributes.inject({}) do |quoted, (name, value)|
0
+            attribute_names.each do |name|
0
               if column = column_for_attribute(name)
0
-                quoted[name] = quote_value(value, column) unless !include_primary_key && column.primary
0
+                quoted[name] = connection.quote(read_attribute(name), column) unless !include_primary_key && column.primary
0
               end
0
-              quoted
0
             end
0
           else
0
-            quoted = attributes.inject({}) do |quoted, (name, value)|
0
-              if !self.class.globalize_facets_hash.has_key?(name) &&
0
-                  column = column_for_attribute(name)
0
-                quoted[name] = quote_value(value, column) unless !include_primary_key && column.primary
0
+            attribute_names.each do |name|
0
+              if !self.class.globalize_facets_hash.has_key?(name) && column = column_for_attribute(name)
0
+                quoted[name] = connection.quote(read_attribute(name), column) unless !include_primary_key && column.primary
0
               end
0
-              quoted
0
             end
0
           end
0
           include_readonly_attributes ? quoted : remove_readonly_attributes(quoted)

0
@@ -15,7 +15,6 @@ module Globalize # :nodoc:
0
 
0
       # if there's no translation, use default or original key
0
       real_default = default || key
0
-
0
       result = fetch_from_cache(key, language, real_default, num, namespace)
0
 
0
       if num
0
@@ -133,7 +132,6 @@ module Globalize # :nodoc:
0
         zero_form   = num == 0
0
         plural_idx  = language.plural_index(num)        # language-defined plural form
0
         zplural_idx = zero_form ? 0 : plural_idx # takes zero-form into account
0
-
0
         cached = cache_fetch(key, language, zplural_idx, namespace)
0
         if cached
0
           result = cached

0
@@ -176,7 +176,6 @@ module Globalize
0
 
0
     def self.translate(key, default = nil, arg = nil, namespace = nil) # :nodoc:
0
       key = key.to_s.gsub('_', ' ') if key.kind_of? Symbol
0
-
0
       translator.fetch(key, self.language, default, arg, namespace)
0
     end
0
 

0
@@ -23,13 +23,13 @@ module ActionMailer # :nodoc:
0
     # It is fully backwards compatible with the original rails version.
0
     def create!(method_name, *parameters) #:nodoc:
0
       initialize_defaults(method_name)
0
-      send(method_name, *parameters)
0
+      __send__(method_name, *parameters)
0
       
0
       # If an explicit, textual body has not been set, we check assumptions.
0
       unless String === @body
0
         # First, we look to see if there are any likely templates that match,
0
         # which include the content-type in their file name (i.e.,
0
-        # "the_template_file.text.html.rhtml", etc.). Only do this if parts
0
+        # "the_template_file.text.html.erb", etc.). Only do this if parts
0
         # have not already been specified manually.
0
         if @parts.empty?
0
           append_localized_parts
0
@@ -60,7 +60,6 @@ module ActionMailer # :nodoc:
0
 
0
       # build the mail object itself
0
       @mail = create_mail
0
-
0
     end
0
 
0
     private
0
@@ -69,35 +68,47 @@ module ActionMailer # :nodoc:
0
         codes.each do |code|
0
           if code
0
             templates = Dir.glob("#{template_path}/#{@template}.#{code}.*")
0
+            template_regex = Regexp.new("^([^\\\.]+)\\\.(" + code + ")\\\.([^\\\.]+\\\.[^\\\.]+)\\\.(" + template_extensions.join('|') + ")$")
0
+            type_index = 2
0
           else
0
             templates = Dir.glob("#{template_path}/#{@template}.*")
0
+            template_regex = Regexp.new("^([^\\\.]+)\\\.([^\\\.]+\\\.[^\\\.]+)\\\.(" + template_extensions.join('|') + ")$")
0
+            type_index = 1
0
           end
0
           templates.each do |path|
0
-            sections = File.basename(path).split(".")[0..-2] || []
0
-
0
-            # skip if this is some other language
0
-            next if !code && Globalize::RFC_3066.valid?(sections[1])
0
-
0
-            # skip either template name and locale, or just template name
0
-            type_sections = code ? sections[2..-1] : sections[1..-1]
0
-            type = type_sections.join("/")
0
-            
0
-            next if type.empty?
0
-            @parts << Part.new(:content_type => type,
0
+            basename = File.basename(path)
0
+            next unless md = template_regex.match(basename)
0
+            template_name = basename
0
+            content_type = md.captures[type_index].gsub('.', '/')
0
+            @parts << Part.new(:content_type => content_type,
0
               :disposition => "inline", :charset => charset,
0
-              :body => render_message(sections.join('.'), @body))
0
+              :body => render_message(template_name, @body))
0
+            
0
+            
0
+            #sections = basename.split(".")[0..-2] || []
0
+            ## skip if this is some other language
0
+            #next if !code && Globalize::RFC_3066.valid?(sections[1])
0
+            #
0
+            ## skip either template name and locale, or just template name
0
+            #type_sections = code ? sections[2..-1] : sections[1..-1]
0
+            #type = type_sections.join("/")
0
+            #next if type.empty?
0
+            #pth = path.split('/')[1..-1].join('/')
0
+            #puts pth
0
+            #
0
+            #@parts << Part.new(:content_type => type,
0
+            #  :disposition => "inline", :charset => charset,
0
+            #  :body => render_message(pth, @body))
0
           end
0
-          
0
 
0
           # if we found templates at this stage, no need to continue to defaults
0
-          break if !templates.empty?
0
+          # break if !templates.empty?
0
         end
0
       end
0
 
0
       def render_localized_normal_template
0
         template_exists = @parts.empty?
0
-        codes = locale_codes
0
-        codes.each do |code|
0
+        locale_codes.each do |code|
0
           localized_name = @template
0
           if !template_exists
0
             if code 

0
@@ -3,15 +3,14 @@ module ActionView # :nodoc: all
0
   class Base
0
     alias_method :globalize_old_render_file, :render_file
0
     
0
+    
0
     # Name of file extensions which are handled internally in rails. Other types
0
     # like liquid has to register through register_handler.
0
-    @@re_extension = /\.(erb|rjs|builder)$/
0
+    # @@re_extension = /\.(erb|rjs|builder)$/
0
     
0
     @@globalize_path_cache = {}
0
 
0
     def render_file(template_path, use_full_path = true, local_assigns = {})
0
-      @first_render ||= template_path
0
-      
0
       if Globalize::Locale.active?
0
         localized_path = locate_globalize_path(template_path, use_full_path)
0
         # don't use_full_path -- we've already expanded the path
0
@@ -22,44 +21,35 @@ module ActionView # :nodoc: all
0
     end
0
   
0
     private
0
-    
0
-      # Override because the original version is too minimalist
0
-      def path_and_extension(template_path) #:nodoc:
0
-        template_path_without_extension = template_path.sub(@@re_extension, '')
0
-        [ template_path_without_extension, $1 ]
0
-      end
0
-      
0
+          
0
       def locate_globalize_path(template_path, use_full_path)
0
+
0
         active_locale = Globalize::Locale.active
0
         locale_code = active_locale.code
0
         cache_key = "#{locale_code}:#{template_path}:#{template_format}"
0
         cached = @@globalize_path_cache[cache_key]
0
         return cached if cached
0
 
0
-        template_path_without_extension, template_extension = path_and_extension(template_path)
0
-        if use_full_path  
0
+        template_path_without_extension, template_extension = @finder.path_and_extension(template_path)
0
+        if use_full_path
0
           if template_extension
0
-            template_file_name = full_template_path(template_path_without_extension, template_extension)
0
+            template_file_name = @finder.pick_template(template_path_without_extension, template_extension)
0
           else
0
-            template_extension = pick_template_extension(template_path).to_s
0
-            unless template_extension
0
-              raise ActionViewError, "No #{template_handler_preferences.to_sentence} template found for #{template_path} in #{view_paths.inspect}"
0
-            end
0
-            template_file_name = full_template_path(template_path, template_extension)
0
+            template_extension = @finder.pick_template_extension(template_path).to_s
0
+            raise_missing_template_exception unless template_extension
0
+            template_file_name = @finder.pick_template(template_path, template_extension)
0
             template_extension = template_extension.gsub(/^.+\./, '') # strip off any formats
0
           end
0
         else
0
           template_file_name = template_path
0
           template_extension = template_path.split('.').last
0
         end
0
-        
0
         pn = Pathname.new(template_file_name)
0
         dir, filename = pn.dirname, pn.basename('.' + template_extension)
0
 
0
         # first try "en-US" style
0
         localized_path = dir + 
0
           (filename.to_s + '.' + locale_code + '.' + template_extension)
0
-
0
         catch :found do
0
           throw :found if localized_path.exist?
0
 

0
@@ -55,7 +55,7 @@ module ActionView
0
       #
0
       # If you would prefer to show month names as abbreviations, set the
0
       # <tt>:use_short_month</tt> key in +options+ to true.
0
-      def select_month(date, options = {})
0
+      def select_month(date, options = {}, html_options = {})
0
         val = date ? (date.kind_of?(Fixnum) ? date : date.month) : ''
0
         if options[:use_hidden]
0
           hidden_html(options[:field_name] || 'month', val, options)
0
@@ -74,11 +74,12 @@ module ActionView
0
             end
0
 
0
             month_options << ((val == month_number) ?
0
-              %(<option value="#{month_number}" selected="selected">#{month_name}</option>\n) :
0
-              %(<option value="#{month_number}">#{month_name}</option>\n)
0
+              content_tag(:option, month_name, :value => month_number, :selected => "selected") :
0
+              content_tag(:option, month_name, :value => month_number)
0
             )
0
+            month_options << "\n"
0
           end
0
-          select_html(options[:field_name] || 'month', month_options, options)
0
+          select_html(options[:field_name] || 'month', month_options.join, options, html_options)
0
         end
0
       end
0
     end

0
@@ -108,7 +108,7 @@ class DateHelperTest < Test::Unit::TestCase
0
   def test_select_day
0
     expected = %(<select id="date_day" name="date[day]">\n)
0
     expected <<
0
-%(<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n)
0
+%(<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option selected="selected" value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n)
0
     expected << "</select>\n"
0
 
0
     assert_equal expected, select_day(Time.mktime(2003, 8, 16))
0
@@ -118,7 +118,7 @@ class DateHelperTest < Test::Unit::TestCase
0
   def test_select_day_with_blank
0
     expected = %(<select id="date_day" name="date[day]">\n)
0
     expected <<
0
-%(<option value=""></option>\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n)
0
+%(<option value=""></option>\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option selected="selected" value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n)
0
     expected << "</select>\n"
0
 
0
     assert_equal expected, select_day(Time.mktime(2003, 8, 16), :include_blank => true)
0
@@ -136,7 +136,7 @@ class DateHelperTest < Test::Unit::TestCase
0
 
0
   def test_select_month
0
     expected = %(<select id="date_month" name="date[month]">\n)
0
-    expected << %(<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8" selected="selected">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n)
0
+    expected << %(<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option selected="selected" value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n)
0
     expected << "</select>\n"
0
 
0
     assert_equal expected, select_month(Time.mktime(2003, 8, 16))
0
@@ -146,7 +146,7 @@ class DateHelperTest < Test::Unit::TestCase
0
   def test_select_month_he
0
     Globalize::Locale.set 'he'
0
     expected = %(<select id="date_month" name="date[month]">\n)
0
-    expected << %(<option value="1">ינואר</option>\n<option value="2">פברואר</option>\n<option value="3">מרץ</option>\n<option value="4">אפריל</option>\n<option value="5">מאי</option>\n<option value="6">יוני</option>\n<option value="7">יולי</option>\n<option value="8" selected="selected">אוגוסט</option>\n<option value="9">ספטמבר</option>\n<option value="10">אוקטובר</option>\n<option value="11">נובמבר</option>\n<option value="12">דצמבר</option>\n)
0
+    expected << %(<option value="1">ינואר</option>\n<option value="2">פברואר</option>\n<option value="3">מרץ</option>\n<option value="4">אפריל</option>\n<option value="5">מאי</option>\n<option value="6">יוני</option>\n<option value="7">יולי</option>\n<option selected="selected" value="8">אוגוסט</option>\n<option value="9">ספטמבר</option>\n<option value="10">אוקטובר</option>\n<option value="11">נובמבר</option>\n<option value="12">דצמבר</option>\n)
0
     expected << "</select>\n"
0
 
0
     assert_equal expected, select_month(Time.mktime(2003, 8, 16))
0
@@ -154,8 +154,8 @@ class DateHelperTest < Test::Unit::TestCase
0
   end
0
 
0
   def test_select_month_with_disabled
0
-    expected = %(<select id="date_month" name="date[month]" disabled="disabled">\n)
0
-    expected << %(<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8" selected="selected">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n)
0
+    expected = %(<select disabled="disabled" id="date_month" name="date[month]">\n)
0
+    expected << %(<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option selected="selected" value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n)
0
     expected << "</select>\n"
0
 
0
     assert_equal expected, select_month(Time.mktime(2003, 8, 16), :disabled => true)
0
@@ -164,7 +164,7 @@ class DateHelperTest < Test::Unit::TestCase
0
 
0
   def test_select_month_with_field_name_override
0
     expected = %(<select id="date_mois" name="date[mois]">\n)
0
-    expected << %(<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8" selected="selected">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n)
0
+    expected << %(<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option selected="selected" value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n)
0
     expected << "</select>\n"
0
 
0
     assert_equal expected, select_month(Time.mktime(2003, 8, 16), :field_name => 'mois')
0
@@ -173,7 +173,7 @@ class DateHelperTest < Test::Unit::TestCase
0
 
0
   def test_select_month_with_blank
0
     expected = %(<select id="date_month" name="date[month]">\n)
0
-    expected << %(<option value=""></option>\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8" selected="selected">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n)
0
+    expected << %(<option value=""></option>\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option selected="selected" value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n)
0
     expected << "</select>\n"
0
 
0
     assert_equal expected, select_month(Time.mktime(2003, 8, 16), :include_blank => true)
0
@@ -190,7 +190,7 @@ class DateHelperTest < Test::Unit::TestCase
0
 
0
   def test_select_month_with_numbers
0
     expected = %(<select id="date_month" name="date[month]">\n)
0
-    expected << %(<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8" selected="selected">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n)
0
+    expected << %(<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option selected="selected" value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n)
0
     expected << "</select>\n"
0
 
0
     assert_equal expected, select_month(Time.mktime(2003, 8, 16), :use_month_numbers => true)
0
@@ -199,7 +199,7 @@ class DateHelperTest < Test::Unit::TestCase
0
 
0
   def test_select_month_with_numbers_and_names
0
     expected = %(<select id="date_month" name="date[month]">\n)
0
-    expected << %(<option value="1">1 - January</option>\n<option value="2">2 - February</option>\n<option value="3">3 - March</option>\n<option value="4">4 - April</option>\n<option value="5">5 - May</option>\n<option value="6">6 - June</option>\n<option value="7">7 - July</option>\n<option value="8" selected="selected">8 - August</option>\n<option value="9">9 - September</option>\n<option value="10">10 - October</option>\n<option value="11">11 - November</option>\n<option value="12">12 - December</option>\n)
0
+    expected << %(<option value="1">1 - January</option>\n<option value="2">2 - February</option>\n<option value="3">3 - March</option>\n<option value="4">4 - April</option>\n<option value="5">5 - May</option>\n<option value="6">6 - June</option>\n<option value="7">7 - July</option>\n<option selected="selected" value="8">8 - August</option>\n<option value="9">9 - September</option>\n<option value="10">10 - October</option>\n<option value="11">11 - November</option>\n<option value="12">12 - December</option>\n)
0
     expected << "</select>\n"
0
 
0
     assert_equal expected, select_month(Time.mktime(2003, 8, 16), :add_month_numbers => true)
0
@@ -208,7 +208,7 @@ class DateHelperTest < Test::Unit::TestCase
0
 
0
   def test_select_month_with_numbers_and_names_with_abbv
0
     expected = %(<select id="date_month" name="date[month]">\n)
0
-    expected << %(<option value="1">1 - Jan</option>\n<option value="2">2 - Feb</option>\n<option value="3">3 - Mar</option>\n<option value="4">4 - Apr</option>\n<option value="5">5 - May</option>\n<option value="6">6 - Jun</option>\n<option value="7">7 - Jul</option>\n<option value="8" selected="selected">8 - Aug</option>\n<option value="9">9 - Sep</option>\n<option value="10">10 - Oct</option>\n<option value="11">11 - Nov</option>\n<option value="12">12 - Dec</option>\n)
0
+    expected << %(<option value="1">1 - Jan</option>\n<option value="2">2 - Feb</option>\n<option value="3">3 - Mar</option>\n<option value="4">4 - Apr</option>\n<option value="5">5 - May</option>\n<option value="6">6 - Jun</option>\n<option value="7">7 - Jul</option>\n<option selected="selected" value="8">8 - Aug</option>\n<option value="9">9 - Sep</option>\n<option value="10">10 - Oct</option>\n<option value="11">11 - Nov</option>\n<option value="12">12 - Dec</option>\n)
0
     expected << "</select>\n"
0
 
0
     assert_equal expected, select_month(Time.mktime(2003, 8, 16), :add_month_numbers => true, :use_short_month => true)
0
@@ -217,7 +217,7 @@ class DateHelperTest < Test::Unit::TestCase
0
 
0
   def test_select_month_with_abbv
0
     expected = %(<select id="date_month" name="date[month]">\n)
0
-    expected << %(<option value="1">Jan</option>\n<option value="2">Feb</option>\n<option value="3">Mar</option>\n<option value="4">Apr</option>\n<option value="5">May</option>\n<option value="6">Jun</option>\n<option value="7">Jul</option>\n<option value="8" selected="selected">Aug</option>\n<option value="9">Sep</option>\n<option value="10">Oct</option>\n<option value="11">Nov</option>\n<option value="12">Dec</option>\n)
0
+    expected << %(<option value="1">Jan</option>\n<option value="2">Feb</option>\n<option value="3">Mar</option>\n<option value="4">Apr</option>\n<option value="5">May</option>\n<option value="6">Jun</option>\n<option value="7">Jul</option>\n<option selected="selected" value="8">Aug</option>\n<option value="9">Sep</option>\n<option value="10">Oct</option>\n<option value="11">Nov</option>\n<option value="12">Dec</option>\n)
0
     expected << "</select>\n"
0
 
0
     assert_equal expected, select_month(Time.mktime(2003, 8, 16), :use_short_month => true)
0
@@ -226,7 +226,7 @@ class DateHelperTest < Test::Unit::TestCase
0
 
0
   def test_select_year