From 19b63f090929974fc67202d274beb283c4099f42 Mon Sep 17 00:00:00 2001
From: szakitibi <szakitibi@users.noreply.github.com>
Date: Mon, 27 May 2024 12:06:49 +0200
Subject: [PATCH 1/7] Fix translation "by" in document_byline.pt

---
 plone/app/layout/viewlets/document_byline.pt | 32 +++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/plone/app/layout/viewlets/document_byline.pt b/plone/app/layout/viewlets/document_byline.pt
index 6539d981..05f5d6f5 100644
--- a/plone/app/layout/viewlets/document_byline.pt
+++ b/plone/app/layout/viewlets/document_byline.pt
@@ -9,21 +9,23 @@
                 tal:condition="python:creator_ids and view.show_about()"
   >
     <span class="label-by-author">
-      <tal:i18n i18n:translate="">by</tal:i18n>
-      <tal:for repeat="user_id creator_ids">
-        <tal:user define="
-                    url_path python: view.get_url_path(user_id);
-                    fullname python:view.get_fullname(user_id);
-                  ">
-          <a class="badge rounded-pill bg-light text-dark fw-normal fs-6"
-             href="${navigation_root_url}/${url_path}"
-             tal:condition="url_path"
-          >${fullname}</a>
-          <span class="badge rounded-pill bg-light text-dark fw-normal fs-6"
-                tal:condition="not:url_path"
-          >${fullname}</span>
-        </tal:user>
-      </tal:for>
+      <tal:i18n i18n:translate="label_by_author">
+      by
+      <tal:for repeat="user_id creator_ids" i18n:name="author">
+          <tal:user define="
+                      url_path python: view.get_url_path(user_id);
+                      fullname python:view.get_fullname(user_id);
+                    ">
+            <a class="badge rounded-pill bg-light text-dark fw-normal fs-6"
+               href="${navigation_root_url}/${url_path}"
+               tal:condition="url_path"
+            >${fullname}</a>
+            <span class="badge rounded-pill bg-light text-dark fw-normal fs-6"
+                  tal:condition="not:url_path"
+            >${fullname}</span>
+          </tal:user>
+        </tal:for>
+      </tal:i18n>
     &mdash;
     </span>
   </tal:creators>

From 1b7a2bf577c71710bac2ee9d858b29475fd4673c Mon Sep 17 00:00:00 2001
From: szakitibi <szakitibi@users.noreply.github.com>
Date: Mon, 27 May 2024 12:23:18 +0200
Subject: [PATCH 2/7] Use from-now format and local time tooltip for modified
 in document_byline.pt

---
 plone/app/layout/viewlets/document_byline.pt | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/plone/app/layout/viewlets/document_byline.pt b/plone/app/layout/viewlets/document_byline.pt
index 05f5d6f5..ee06aadf 100644
--- a/plone/app/layout/viewlets/document_byline.pt
+++ b/plone/app/layout/viewlets/document_byline.pt
@@ -10,8 +10,8 @@
   >
     <span class="label-by-author">
       <tal:i18n i18n:translate="label_by_author">
-      by
-      <tal:for repeat="user_id creator_ids" i18n:name="author">
+        by
+        <tal:for repeat="user_id creator_ids" i18n:name="author">
           <tal:user define="
                       url_path python: view.get_url_path(user_id);
                       fullname python:view.get_fullname(user_id);
@@ -39,7 +39,12 @@
           tal:condition="published"
     >
       <span i18n:translate="box_published">published</span>
-      <span tal:content="python:context.toLocalizedTime(published)">Published</span>
+      <span tal:content="published"
+            class="pat-display-time"
+            data-pat-display-time="from-now: true"
+            datetime="${published}"
+            title="${python: context.toLocalizedTime(published, long_format=True)}"
+      >Published</span>
       <tal:sep condition="show_modification_date">,</tal:sep>
     </span>
 
@@ -49,9 +54,12 @@
       <span i18n:translate="box_last_modified">
       last modified
       </span>
-      <span tal:content="python:context.toLocalizedTime(modified)">
-      Modified
-      </span>
+      <span tal:content="modified"
+            class="pat-display-time"
+            data-pat-display-time="from-now: true"
+            datetime="${modified}"
+            title="${python: context.toLocalizedTime(modified, long_format=True)}"
+      >Modified</span>
     </span>
   </tal:dates>
 

From bc47002d5ca05452c6f18f8cf8f8eb07d19049fb Mon Sep 17 00:00:00 2001
From: szakitibi <szakitibi@users.noreply.github.com>
Date: Mon, 27 May 2024 13:59:30 +0200
Subject: [PATCH 3/7] add change log

---
 news/369.bugix | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 news/369.bugix

diff --git a/news/369.bugix b/news/369.bugix
new file mode 100644
index 00000000..e644b73a
--- /dev/null
+++ b/news/369.bugix
@@ -0,0 +1,2 @@
+- Fixes the "by" translation on date issues for document byline viewlet
+[szakitibi]

From 4006451e158fea07d03302a20abc8b927bbeb075 Mon Sep 17 00:00:00 2001
From: szakitibi <szakitibi@users.noreply.github.com>
Date: Mon, 27 May 2024 14:06:58 +0200
Subject: [PATCH 4/7] fix typo

---
 news/369.bugix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/news/369.bugix b/news/369.bugix
index e644b73a..ab05a3d7 100644
--- a/news/369.bugix
+++ b/news/369.bugix
@@ -1,2 +1,2 @@
-- Fixes the "by" translation on date issues for document byline viewlet
+- Fixes the "by" translation and the date issues for document byline viewlet
 [szakitibi]

From c1cb9381b1a1f911f868d76086bb8f13abc449b2 Mon Sep 17 00:00:00 2001
From: szakitibi <szakitibi@users.noreply.github.com>
Date: Mon, 17 Jun 2024 11:56:22 +0200
Subject: [PATCH 5/7] Update news/369.bugix

Co-authored-by: Maurits van Rees <maurits@vanrees.org>
---
 news/369.bugix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/news/369.bugix b/news/369.bugix
index ab05a3d7..da17156b 100644
--- a/news/369.bugix
+++ b/news/369.bugix
@@ -1,2 +1,2 @@
-- Fixes the "by" translation and the date issues for document byline viewlet
+Fixes the "by" translation and the date issues for document byline viewlet
 [szakitibi]

From d6b8463375d4a5e0d11be2b6225432c344fd9a32 Mon Sep 17 00:00:00 2001
From: szakitibi <szakitibi@users.noreply.github.com>
Date: Mon, 17 Jun 2024 12:44:27 +0200
Subject: [PATCH 6/7] revert dates back to absolute one

https://github.com/plone/plone.app.layout/pull/369#issuecomment-2172875563
---
 plone/app/layout/viewlets/document_byline.pt | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/plone/app/layout/viewlets/document_byline.pt b/plone/app/layout/viewlets/document_byline.pt
index ee06aadf..f501b7a7 100644
--- a/plone/app/layout/viewlets/document_byline.pt
+++ b/plone/app/layout/viewlets/document_byline.pt
@@ -39,12 +39,7 @@
           tal:condition="published"
     >
       <span i18n:translate="box_published">published</span>
-      <span tal:content="published"
-            class="pat-display-time"
-            data-pat-display-time="from-now: true"
-            datetime="${published}"
-            title="${python: context.toLocalizedTime(published, long_format=True)}"
-      >Published</span>
+      <span tal:content="python:context.toLocalizedTime(published)">Published</span>
       <tal:sep condition="show_modification_date">,</tal:sep>
     </span>
 
@@ -54,12 +49,9 @@
       <span i18n:translate="box_last_modified">
       last modified
       </span>
-      <span tal:content="modified"
-            class="pat-display-time"
-            data-pat-display-time="from-now: true"
-            datetime="${modified}"
-            title="${python: context.toLocalizedTime(modified, long_format=True)}"
-      >Modified</span>
+      <span tal:content="python:context.toLocalizedTime(modified)">
+      Modified
+      </span>
     </span>
   </tal:dates>
 

From 8722cfff0051941fd34a8199a1cce4b51d76d0eb Mon Sep 17 00:00:00 2001
From: szakitibi <szakitibi@users.noreply.github.com>
Date: Mon, 17 Jun 2024 12:44:59 +0200
Subject: [PATCH 7/7] Update 369.bugix

---
 news/369.bugix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/news/369.bugix b/news/369.bugix
index da17156b..e1db13f8 100644
--- a/news/369.bugix
+++ b/news/369.bugix
@@ -1,2 +1,2 @@
-Fixes the "by" translation and the date issues for document byline viewlet
+Fixes the "by" translation for document byline viewlet
 [szakitibi]