paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix: tweak relative date

Browse Source
This commit is contained in:
shamoon 2025-01-01 09:47:27 -08:00
parent 90731e05f5
commit 9153be489c
3 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src-ui/messages.xlf
View File

@ -3462,6 +3462,10 @@
<context context-type="sourcefile">src/app/components/common/dates-dropdown/dates-dropdown.component.ts</context> <context context-type="sourcefile">src/app/components/common/dates-dropdown/dates-dropdown.component.ts</context>
<context context-type="linenumber">53</context> <context context-type="linenumber">53</context>
</context-group> </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>
<trans-unit id="8697368973702409683" datatype="html"> <trans-unit id="8697368973702409683" datatype="html">
<source>Last 3 months</source> <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="sourcefile">src/app/components/common/dates-dropdown/dates-dropdown.component.ts</context>
<context context-type="linenumber">63</context> <context context-type="linenumber">63</context>
</context-group> </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>
<trans-unit id="8743659855412792665" datatype="html"> <trans-unit id="8743659855412792665" datatype="html">
<source>Matching algorithm</source> <source>Matching algorithm</source>
@ -9101,13 +9109,6 @@
<context context-type="linenumber">36</context> <context context-type="linenumber">36</context>
</context-group> </context-group>
</trans-unit> </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"> <trans-unit id="3393387677918927062" datatype="html">
<source>%s years ago</source> <source>%s years ago</source>
<context-group purpose="location"> <context-group purpose="location">
@ -9115,13 +9116,6 @@
<context context-type="linenumber">15</context> <context context-type="linenumber">15</context>
</context-group> </context-group>
</trans-unit> </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"> <trans-unit id="1158628882375251480" datatype="html">
<source>%s months ago</source> <source>%s months ago</source>
<context-group purpose="location"> <context-group purpose="location">
@ -9129,8 +9123,8 @@
<context context-type="linenumber">20</context> <context context-type="linenumber">20</context>
</context-group> </context-group>
</trans-unit> </trans-unit>
<trans-unit id="7039133412826927309" datatype="html"> <trans-unit id="7591870443991978948" datatype="html">
<source>%s week ago</source> <source>Last week</source>
<context-group purpose="location"> <context-group purpose="location">
<context context-type="sourcefile">src/app/pipes/custom-date.pipe.ts</context> <context context-type="sourcefile">src/app/pipes/custom-date.pipe.ts</context>
<context context-type="linenumber">24</context> <context context-type="linenumber">24</context>
@ -9143,8 +9137,8 @@
<context context-type="linenumber">25</context> <context context-type="linenumber">25</context>
</context-group> </context-group>
</trans-unit> </trans-unit>
<trans-unit id="91416192007234700" datatype="html"> <trans-unit id="4498682414491138092" datatype="html">
<source>%s day ago</source> <source>Yesterday</source>
<context-group purpose="location"> <context-group purpose="location">
<context context-type="sourcefile">src/app/pipes/custom-date.pipe.ts</context> <context context-type="sourcefile">src/app/pipes/custom-date.pipe.ts</context>
<context context-type="linenumber">29</context> <context context-type="linenumber">29</context>

6
src-ui/src/app/pipes/custom-date.pipe.spec.ts
View File

@ -39,10 +39,12 @@ describe('CustomDatePipe', () => {
const now = new Date() const now = new Date()
const notNow = new Date(now) const notNow = new Date(now)
notNow.setDate(now.getDate() - 1) 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.setDate(now.getDate())
notNow.setMonth(now.getMonth() - 1) 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') expect(datePipe.transform(now, 'relative')).toEqual('Just now')
}) })
}) })

8
src-ui/src/app/pipes/custom-date.pipe.ts
View File

@ -11,22 +11,22 @@ const FORMAT_TO_ISO_FORMAT = {
const INTERVALS = { const INTERVALS = {
year: { year: {
label: $localize`%s year ago`, label: $localize`Last year`,
labelPlural: $localize`%s years ago`, labelPlural: $localize`%s years ago`,
interval: 31536000, interval: 31536000,
}, },
month: { month: {
label: $localize`%s month ago`, label: $localize`Last month`,
labelPlural: $localize`%s months ago`, labelPlural: $localize`%s months ago`,
interval: 2592000, interval: 2592000,
}, },
week: { week: {
label: $localize`%s week ago`, label: $localize`Last week`,
labelPlural: $localize`%s weeks ago`, labelPlural: $localize`%s weeks ago`,
interval: 604800, interval: 604800,
}, },
day: { day: {
label: $localize`%s day ago`, label: $localize`Yesterday`,
labelPlural: $localize`%s days ago`, labelPlural: $localize`%s days ago`,
interval: 86400, interval: 86400,
}, },