diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js index 8eef14aa20e..9539dc47885 100644 --- a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js +++ b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js @@ -27,7 +27,10 @@ } var previews = options.timezones.split("|").map(function(timezone) { - var dateTime = relativeTime.tz(timezone).format("LLL"); + var dateTime = relativeTime + .tz(timezone) + .format(options.format || "LLL"); + var timezoneParts = _formatTimezone(timezone); if (dateTime.match(/TZ/)) { diff --git a/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb b/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb index f81f8084f99..d76857b9ab4 100644 --- a/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb +++ b/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb @@ -4,15 +4,15 @@ describe PrettyText do it 'supports inserting date' do freeze_time cooked = PrettyText.cook <<~MD - [date=2018-05-08 time=22:00 format=LLL timezones="Europe/Paris|America/Los_Angeles"] + [date=2018-05-08 time=22:00 format="L LTS" timezones="Europe/Paris|America/Los_Angeles"] MD expect(cooked).to include('class="discourse-local-date"') expect(cooked).to include('data-date="2018-05-08"') - expect(cooked).to include('data-format="LLL"') + expect(cooked).to include('data-format="L LTS"') expect(cooked).to include('data-timezones="Europe/Paris|America/Los_Angeles"') - expect(cooked).to include('May 8, 2018 3:00 PM (America: Los Angeles)') - expect(cooked).to include('May 9, 2018 12:00 AM (Europe: Paris)') + expect(cooked).to include('05/08/2018 3:00:00 PM (America: Los Angeles)') + expect(cooked).to include('05/09/2018 12:00:00 AM (Europe: Paris)') end it 'uses a simplified syntax in emails' do