From fd4115ffcf4a140e3977d72ae62cbc2b051b0f80 Mon Sep 17 00:00:00 2001
From: Lyqst <benja.appel@gmail.com>
Date: Wed, 15 Dec 2021 11:48:57 -0300
Subject: [PATCH] Remove date from News title, add posting time in EST

---
 .../client/src/components/news/newsContent.vue | 18 ++++++++++++------
 website/common/locales/en/npc.json             |  1 +
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/website/client/src/components/news/newsContent.vue b/website/client/src/components/news/newsContent.vue
index 70b7b64fa8..e946569f0b 100644
--- a/website/client/src/components/news/newsContent.vue
+++ b/website/client/src/components/news/newsContent.vue
@@ -20,9 +20,11 @@
         class="draft"
       >DRAFT</small>
       <h2 class="title">
-        {{ getPostDate(post) }} - {{ post.title.toUpperCase() }}
+        {{ post.title.toUpperCase() }}
       </h2>
-
+      <small>
+        {{ getPostedOn(post) }}
+      </small>
       <hr>
 
       <div v-html="renderMarkdown(post.text)"></div>
@@ -51,7 +53,8 @@ h1 {
   }
 
   .title {
-    display: inline;
+    text-align: left;
+    margin-bottom: 4px;
   }
 
   .draft {
@@ -105,9 +108,12 @@ export default {
     renderMarkdown (text) {
       return habiticaMarkdown.unsafeHTMLRender(text);
     },
-    getPostDate (post) {
-      const format = this.user ? this.user.preferences.dateFormat.toUpperCase() : 'MM/DD/yyyy';
-      return moment(post.publishDate).format(format);
+    getPostedOn (post) {
+      const publishDate = moment(post.publishDate)
+        .utcOffset(-300)
+        .format(this.user.preferences.dateFormat.toUpperCase());
+      const publishTime = moment(post.publishDate).utcOffset(-300).format('LT');
+      return this.$t('newStuffPostedOn', { publishDate, publishTime });
     },
   },
 };
diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json
index 5f0ac20e7d..b029f1c8b4 100644
--- a/website/common/locales/en/npc.json
+++ b/website/common/locales/en/npc.json
@@ -83,6 +83,7 @@
   "invalidQuantity": "Quantity to purchase must be a positive whole number.",
   "USD": "(USD)",
   "newStuff": "New Stuff by Bailey",
+  "newStuffPostedOn": "Posted on <%= publishDate %>, <%= publishTime %> EST",
   "newBaileyUpdate": "New Bailey Update!",
   "tellMeLater": "Tell Me Later",
   "dismissAlert": "Dismiss This Alert",