From 17ca47af1a52f07c523d7b0b2fd7f59b9dd5b5d2 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 29 Apr 2020 08:45:38 +1000
Subject: [PATCH] FIX: Remove timezone in brackets from user card (#9567)

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.
---
 .../app/components/user-card-contents.js       |  2 +-
 .../components/user-card-contents.hbs          |  2 +-
 config/locales/client.en.yml                   |  1 +
 test/javascripts/acceptance/user-card-test.js  | 18 ++++++++----------
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/user-card-contents.js b/app/assets/javascripts/discourse/app/components/user-card-contents.js
index 8e8589533d1..b4f0e5cf4bf 100644
--- a/app/assets/javascripts/discourse/app/components/user-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/user-card-contents.js
@@ -77,7 +77,7 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
 
   @discourseComputed("userTimezone")
   formattedUserLocalTime(timezone) {
-    return moment.tz(timezone).format(I18n.t("dates.time_with_zone"));
+    return moment.tz(timezone).format(I18n.t("dates.time"));
   },
 
   @discourseComputed("username")
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
index 3148fc95d33..239aadad355 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
@@ -171,7 +171,7 @@
               </span>
             {{/if}}
             {{#if showUserLocalTime}}
-              <span class="local-time">
+              <span class="local-time" title="{{i18n "local_time"}}">
                 {{d-icon "far-clock"}}
                 <span>{{this.formattedUserLocalTime}}</span>
               </span>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 3180d66d2fa..cc828b2a0e6 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1444,6 +1444,7 @@ en:
     mute: Mute
     unmute: Unmute
     last_post: Posted
+    local_time: "Local Time"
     time_read: Read
     time_read_recently: "%{time_read} recently"
     time_read_tooltip: "%{time_read} total time read"
diff --git a/test/javascripts/acceptance/user-card-test.js b/test/javascripts/acceptance/user-card-test.js
index d85d02d966d..f15bbd3a7ab 100644
--- a/test/javascripts/acceptance/user-card-test.js
+++ b/test/javascripts/acceptance/user-card-test.js
@@ -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")