From f8a55de7431ae936daa07aadcec2a7825596e6b5 Mon Sep 17 00:00:00 2001
From: Sanne de Vries <65487235+sanne-san@users.noreply.github.com>
Date: Wed, 27 Mar 2024 13:52:38 +0100
Subject: [PATCH] =?UTF-8?q?Added=20exact=20timestamp=20to=20the=20title=20?=
 =?UTF-8?q?attribute=20of=20the=20post=20date=20in=20the=20=E2=80=A6=20(#1?=
 =?UTF-8?q?9936)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…post list view

Ref DES-171
---
 ghost/admin/app/helpers/gh-format-post-time.js        |  2 +-
 .../integration/helpers/gh-format-post-time-test.js   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ghost/admin/app/helpers/gh-format-post-time.js b/ghost/admin/app/helpers/gh-format-post-time.js
index 84a9a58f89..c2a499b75d 100644
--- a/ghost/admin/app/helpers/gh-format-post-time.js
+++ b/ghost/admin/app/helpers/gh-format-post-time.js
@@ -55,7 +55,7 @@ export function formatPostTime(timeago, {timezone = 'etc/UTC', format, relative,
     }
 
     // Else, render just the date if edited or published, or the time & date if scheduled
-    let f = scheduled ? `[at] HH:mm [${utcOffset}] [on] DD MMM YYYY` : 'DD MMM YYYY';
+    let f = scheduled ? `[at] HH:mm [${utcOffset}] [on] DD MMM YYYY` : (short ? `DD MMM YYYY` : `HH:mm [${utcOffset}] DD MMM YYYY`);
     return time.format(f);
 }
 
diff --git a/ghost/admin/tests/integration/helpers/gh-format-post-time-test.js b/ghost/admin/tests/integration/helpers/gh-format-post-time-test.js
index 9495280e78..772a53f02f 100644
--- a/ghost/admin/tests/integration/helpers/gh-format-post-time-test.js
+++ b/ghost/admin/tests/integration/helpers/gh-format-post-time-test.js
@@ -127,6 +127,17 @@ describe('Integration: Helper: gh-format-post-time', function () {
         this.set('mockDate', mockDate);
 
         await render(hbs`{{gh-format-post-time mockDate absolute=true}}`);
+        expect(this.element).to.have.trimmed.text('16:00 (UTC) 02 Sep 2017');
+    });
+
+    it('returns correct short format if post was published prior to yesterday', async function () {
+        let {mockDate} = setupMockDate({
+            date: '2017-09-02T16:00:00Z',
+            utcDate: '2017-09-06T18:00:00Z'
+        });
+        this.set('mockDate', mockDate);
+
+        await render(hbs`{{gh-format-post-time mockDate absolute=true short=true}}`);
         expect(this.element).to.have.trimmed.text('02 Sep 2017');
     });