IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Remove timezone in brackets from user card (#9567)

Browse Source 
For clarity and to save space remove the timezone in brackets e.g. (EDT) from the user card. Also add a title to the user time span to say it is Local Time.
This commit is contained in:
Martin Brennan
2020-04-29 08:45:38 +10:00
committed by GitHub
parent 0d519c78fb
commit 17ca47af1a
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/javascripts/acceptance/user-card-test.js
View File

@@ -25,11 +25,10 @@ QUnit.test("user card local time", async assert => {
assert.ok(invisible(".user-card"), "user card is invisible by default");
await click("a[data-user-card=eviltrout]:first");
let expectedTime =
moment
.tz("Australia/Brisbane")
.add(-2, "hours")
.format("hh:mm a") + " (AWST)";
let expectedTime = moment
.tz("Australia/Brisbane")
.add(-2, "hours")
.format("h:mm a");
assert.ok(visible(".user-card"), "card should appear");
assert.equal(
@@ -51,11 +50,10 @@ QUnit.test("user card local time", async assert => {
await click("a[data-user-card=charlie]:first");
expectedTime =
moment
.tz("Australia/Brisbane")
.add(-14, "hours")
.format("hh:mm a") + " (EDT)";
expectedTime = moment
.tz("Australia/Brisbane")
.add(-14, "hours")
.format("h:mm a");
assert.equal(
find(".user-card .local-time")