diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb index d03d8ac67..56de82cf0 100644 --- a/ruby/lib/jam_ruby/models/music_session.rb +++ b/ruby/lib/jam_ruby/models/music_session.rb @@ -990,11 +990,22 @@ SQL end end + if timezone_display == "Central Time (US & Canada)" + timezone_display = "US Central Time" + elsif timezone_display == "Pacific Time (US & Canada)" + timezone_display = "US Pacific Time" + elsif timezone_display == "Eastern Time (US & Canada)" + timezone_display = "US Eastern Time" + elsif timezone_display == "Mountain Time (US & Canada)" + timezone_display = "US Mountain Time" + end + duration = safe_scheduled_duration end_time = start_time + duration if with_timezone if shorter - "#{start_time.strftime("%a, %b %e %Y")}, #{start_time.strftime("%l:%M").strip}-#{end_time.strftime("%l:%M %p").strip} (#{short_tz}#{utc_offset_display})" + #"#{start_time.strftime("%a, %b %e %Y")}, #{start_time.strftime("%l:%M").strip}-#{end_time.strftime("%l:%M %p").strip} (#{short_tz}#{utc_offset_display})" + "#{start_time.strftime("%a, %b %e %Y")}, #{start_time.strftime("%l:%M").strip}-#{end_time.strftime("%l:%M %p").strip} (#{timezone_display})" else "#{start_time.strftime("%A, %B %e")}, #{start_time.strftime("%l:%M").strip}-#{end_time.strftime("%l:%M %p").strip} #{timezone_display}" end diff --git a/ruby/spec/jam_ruby/models/music_session_spec.rb b/ruby/spec/jam_ruby/models/music_session_spec.rb index 426e5cad7..64ef812bb 100644 --- a/ruby/spec/jam_ruby/models/music_session_spec.rb +++ b/ruby/spec/jam_ruby/models/music_session_spec.rb @@ -113,6 +113,13 @@ describe MusicSession do music_session.pretty_scheduled_start(true).should == 'Date and time TBD' music_session.pretty_scheduled_start(false).should == 'Date and time TBD' end + + it "displays default correctly (shorter)" do + time = MusicSession.parse_scheduled_start("Thu Jul 10 2014 10:00 PM", "Central Time (US & Canada),America/Chicago") + music_session = FactoryGirl.create(:music_session, scheduled_start: time, timezone: "Central Time (US & Canada),America/Chicago") + puts music_session.pretty_scheduled_start(true, true) + puts music_session.pretty_scheduled_start(true, false) + end end describe "nindex" do