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

FIX: removes country from timezone indicator (#6677)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2018-11-27 11:52:02 +01:00
committed by GitHub
parent ac556298ca
commit d461794fbf
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-test.js.es6
View File

@ -16,7 +16,7 @@ acceptance("Local Dates", {
const DEFAULT_DATE = "2018-06-20";
const DEFAULT_ZONE = "Europe/Paris";
const DEFAULT_ZONE_FORMATED = DEFAULT_ZONE.split("/").join(": ");
const DEFAULT_ZONE_FORMATED = DEFAULT_ZONE.split("/")[1];
function advance(count, unit = "days") {
return moment(DEFAULT_DATE)
@ -237,7 +237,7 @@ test("displayedTimezone", assert => {
assert.equal(
transformed.text().trim(),
"June 23, 2018 9:00 AM (America: Chicago)",
"June 23, 2018 9:00 AM (Chicago)",
"it displays timezone when different from watching user"
);
@ -279,7 +279,7 @@ test("displayedTimezone", assert => {
assert.equal(
transformed.text().trim(),
"June 20, 2018 (America: Chicago)",
"June 20, 2018 (Chicago)",
"it uses timezone when displayedTimezone is not set"
);
@ -300,7 +300,7 @@ test("displayedTimezone", assert => {
assert.equal(
transformed.text().trim(),
"June 20, 2018 (Pacific: Auckland)",
"June 20, 2018 (Auckland)",
"it uses displayedTimezone over timezone"
);
});