github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-08 09:20:45 +08:00
Code Issues Actions 1 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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/components/user-card-contents.js
View File

@ -77,7 +77,7 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
@discourseComputed("userTimezone") @discourseComputed("userTimezone")
formattedUserLocalTime(timezone) { formattedUserLocalTime(timezone) {
return moment.tz(timezone).format(I18n.t("dates.time_with_zone")); return moment.tz(timezone).format(I18n.t("dates.time"));
}, },
@discourseComputed("username") @discourseComputed("username")

2
app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
View File

@ -171,7 +171,7 @@
</span> </span>
{{/if}} {{/if}}
{{#if showUserLocalTime}} {{#if showUserLocalTime}}
<span class="local-time"> <span class="local-time" title="{{i18n "local_time"}}">
{{d-icon "far-clock"}} {{d-icon "far-clock"}}
<span>{{this.formattedUserLocalTime}}</span> <span>{{this.formattedUserLocalTime}}</span>
</span> </span>

1
config/locales/client.en.yml
View File

@ -1444,6 +1444,7 @@ en:
mute: Mute mute: Mute
unmute: Unmute unmute: Unmute
last_post: Posted last_post: Posted
local_time: "Local Time"
time_read: Read time_read: Read
time_read_recently: "%{time_read} recently" time_read_recently: "%{time_read} recently"
time_read_tooltip: "%{time_read} total time read" time_read_tooltip: "%{time_read} total time read"

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