Fix: tweak relative date

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 314910f5d575575f44113b594c7d205ff97398fe..7535206a4f97da90f93800e5b4ab90c1c78d3c58 100644 (file)
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -3462,6 +3462,10 @@
           <context context-type="sourcefile">src/app/components/common/dates-dropdown/dates-dropdown.component.ts</context>
           <context context-type="linenumber">53</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/custom-date.pipe.ts</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="8697368973702409683" datatype="html">
         <source>Last 3 months</source>
@@ -3476,6 +3480,10 @@
           <context context-type="sourcefile">src/app/components/common/dates-dropdown/dates-dropdown.component.ts</context>
           <context context-type="linenumber">63</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/pipes/custom-date.pipe.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="8743659855412792665" datatype="html">
         <source>Matching algorithm</source>
@@ -9101,13 +9109,6 @@
           <context context-type="linenumber">36</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="7811681478769461161" datatype="html">
-        <source>%s year ago</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/pipes/custom-date.pipe.ts</context>
-          <context context-type="linenumber">14</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="3393387677918927062" datatype="html">
         <source>%s years ago</source>
         <context-group purpose="location">
@@ -9115,13 +9116,6 @@
           <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="3053246523831285824" datatype="html">
-        <source>%s month ago</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/pipes/custom-date.pipe.ts</context>
-          <context context-type="linenumber">19</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="1158628882375251480" datatype="html">
         <source>%s months ago</source>
         <context-group purpose="location">
@@ -9129,8 +9123,8 @@
           <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="7039133412826927309" datatype="html">
-        <source>%s week ago</source>
+      <trans-unit id="7591870443991978948" datatype="html">
+        <source>Last week</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/pipes/custom-date.pipe.ts</context>
           <context context-type="linenumber">24</context>
@@ -9143,8 +9137,8 @@
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="91416192007234700" datatype="html">
-        <source>%s day ago</source>
+      <trans-unit id="4498682414491138092" datatype="html">
+        <source>Yesterday</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/pipes/custom-date.pipe.ts</context>
           <context context-type="linenumber">29</context>

diff --git a/src-ui/src/app/pipes/custom-date.pipe.spec.ts b/src-ui/src/app/pipes/custom-date.pipe.spec.ts
index 758c52d5439002c67d774dac2e6717df8082ae06..901b1048dbcde00458ad5c50eef7cfd412c4f9e1 100644 (file)
--- a/src-ui/src/app/pipes/custom-date.pipe.spec.ts
+++ b/src-ui/src/app/pipes/custom-date.pipe.spec.ts
@@ -39,10 +39,12 @@ describe('CustomDatePipe', () => {
     const now = new Date()
     const notNow = new Date(now)
     notNow.setDate(now.getDate() - 1)
-    expect(datePipe.transform(notNow, 'relative')).toEqual('1 day ago')
+    expect(datePipe.transform(notNow, 'relative')).toEqual('Yesterday')
     notNow.setDate(now.getDate())
     notNow.setMonth(now.getMonth() - 1)
-    expect(datePipe.transform(notNow, 'relative')).toEqual('1 month ago')
+    expect(datePipe.transform(notNow, 'relative')).toEqual(
+      now.getMonth() > 1 ? 'Last month' : 'Last year'
+    )
     expect(datePipe.transform(now, 'relative')).toEqual('Just now')
   })
 })

diff --git a/src-ui/src/app/pipes/custom-date.pipe.ts b/src-ui/src/app/pipes/custom-date.pipe.ts
index a7a31a2ed8210a0599ea1bee4ade0adbceceb37c..69e054a8435d01b108dcba0f4ffcb762dad0419b 100644 (file)
--- a/src-ui/src/app/pipes/custom-date.pipe.ts
+++ b/src-ui/src/app/pipes/custom-date.pipe.ts
@@ -11,22 +11,22 @@ const FORMAT_TO_ISO_FORMAT = {
 
 const INTERVALS = {
   year: {
-    label: $localize`%s year ago`,
+    label: $localize`Last year`,
     labelPlural: $localize`%s years ago`,
     interval: 31536000,
   },
   month: {
-    label: $localize`%s month ago`,
+    label: $localize`Last month`,
     labelPlural: $localize`%s months ago`,
     interval: 2592000,
   },
   week: {
-    label: $localize`%s week ago`,
+    label: $localize`Last week`,
     labelPlural: $localize`%s weeks ago`,
     interval: 604800,
   },
   day: {
-    label: $localize`%s day ago`,
+    label: $localize`Yesterday`,
     labelPlural: $localize`%s days ago`,
     interval: 86400,
   },