github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 13:31:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Use simple UTC datetime format for local date inner text

Browse Source
This commit is contained in:
Vinoth Kannan
2018-10-10 03:49:49 +05:30
parent 7a6c227fa4
commit 98865e86da
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js.es6
View File

@ -52,25 +52,21 @@ function addLocalDate(buffer, matches, state) {
} }
buffer.push(token); buffer.push(token);
const previews = config.timezones let emailPreview;
.split("|") const emailTimezone = config.timezones.split("|")[0];
.filter(t => t) const formattedDateTime = dateTime.tz(emailTimezone).format(config.format);
.map(timezone => { const formattedTimezone = emailTimezone.replace("/", ": ").replace("_", " ");
const formattedDateTime = dateTime.tz(timezone).format(config.format);
const formattedTimezone = timezone.replace("/", ": ").replace("_", " ");
if (formattedDateTime.match(/TZ/)) { if (formattedDateTime.match(/TZ/)) {
return formattedDateTime.replace("TZ", formattedTimezone); emailPreview = formattedDateTime.replace("TZ", formattedTimezone);
} else { } else {
return `${formattedDateTime} (${formattedTimezone})`; emailPreview = `${formattedDateTime} (${formattedTimezone})`;
} }
});
token.attrs.push(["data-email-preview", previews[0]]); token.attrs.push(["data-email-preview", emailPreview]);
token = new state.Token("text", "", 0); token = new state.Token("text", "", 0);
token.content = previews.join(", "); token.content = dateTime.utc().format(config.format);;
buffer.push(token); buffer.push(token);
token = new state.Token("span_close", "span", -1); token = new state.Token("span_close", "span", -1);

6
plugins/discourse-local-dates/spec/integration/local_dates_spec.rb
View File

@ -21,8 +21,7 @@ RSpec.describe "Local Dates" do
'data-timezones="Europe/Paris|America/Los_Angeles"' 'data-timezones="Europe/Paris|America/Los_Angeles"'
) )
expect(cooked).to include('05/08/2018 3:00:00 PM (America: Los Angeles)') expect(cooked).to include('05/08/2018 10:00:00 PM')
expect(cooked).to include('05/09/2018 12:00:00 AM (Europe: Paris)')
end end
it "should work with timezone" do it "should work with timezone" do
@ -33,8 +32,7 @@ RSpec.describe "Local Dates" do
cooked = post.cooked cooked = post.cooked
expect(cooked).to include('data-force-timezone="Asia/Calcutta"') expect(cooked).to include('data-force-timezone="Asia/Calcutta"')
expect(cooked).to include('05/08/2018 9:30:00 AM (America: Los Angeles)') expect(cooked).to include('05/08/2018 4:30:00 PM')
expect(cooked).to include('05/08/2018 6:30:00 PM (Europe: Paris)')
end end
it 'requires the right attributes to convert to a local date' do it 'requires the right attributes to convert to a local date' do