Merge 5b3b054d0b into 05209260a4

app/controllers/admin/conferences_controller.rb

@@ -167,7 +167,7 @@ module Admin
 
     def edit
       @conferences = Conference.all
-      @date_string = date_string(@conference.start_date, @conference.end_date)
+      @date_string = @conference.date_range_string
       respond_to do |format|
         format.html
         format.json { render json: @conference.to_json }

app/views/conference_registrations/show.html.haml

@@ -13,7 +13,7 @@
             = "#{@conference.venue.street},"
             = "#{@conference.venue.city} / #{@conference.venue.country_name}."
           %small
-            = date_string(@conference.start_date, @conference.end_date)
+            = @conference.date_range_string
   .row
     .col-md-12
       %h4

app/views/conferences/_conference_details.html.haml

@@ -9,7 +9,7 @@
             = conference.title
             %small
               %b
-              = date_string(conference.start_date, conference.end_date)
+              = conference.date_range_string
           - if conference.venue
             %p
               = "#{conference.venue.city}/#{conference.venue.country_name}"

app/views/conferences/show.html.haml

@@ -27,7 +27,7 @@
                     = "#{@conference.venue.city} / #{@conference.venue.country_name}"
                   - if @conference.start_date && @conference.end_date
                     %br
-                    = date_string(@conference.start_date, @conference.end_date)
+                    = @conference.date_range_string
 
     - unless @conference.description.blank?
       %section#about

spec/views/conferences/index.html.haml_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'conferences/index' do
   it 'renders _conference partial for each conference' do
-    allow(view).to receive(:date_string).and_return('January 17 - 21 2014')
+    allow(view).to receive(:date_range_string).and_return('January 17 - 21 2014')
     assign(:current, [create(:conference), create(:conference)])
     render
     expect(view).to render_template(partial: '_conference_details', count: 2)

spec/views/conferences/show.html.haml_spec.rb

@@ -3,7 +3,7 @@ describe 'conferences/show.html.haml' do
   let!(:conference) { create(:full_conference) }
 
   before(:each) do
-    allow(view).to receive(:date_string).and_return('January 17 - 21 2014')
+    allow(view).to receive(:date_range_string).and_return('January 17 - 21 2014')
     assign :conference, conference
     render
   end