paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-10-30 03:56:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed a regression in the date pipe

Browse Source
This commit is contained in:
jonaswinkler
2021-02-25 16:22:50 +01:00
parent e47f577c76
commit e8ab6f1b08
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,17 +13,20 @@ const FORMAT_TO_ISO_FORMAT = {
}) })
export class CustomDatePipe extends DatePipe implements PipeTransform { export class CustomDatePipe extends DatePipe implements PipeTransform {
private defaultLocale: string
constructor(@Inject(LOCALE_ID) locale: string, private settings: SettingsService) { constructor(@Inject(LOCALE_ID) locale: string, private settings: SettingsService) {
super(locale) super(locale)
this.defaultLocale = locale
} }
transform(value: any, format?: string, timezone?: string, locale?: string): string | null { transform(value: any, format?: string, timezone?: string, locale?: string): string | null {
let l = locale || this.settings.get(SETTINGS_KEYS.DATE_LOCALE) let l = locale || this.settings.get(SETTINGS_KEYS.DATE_LOCALE) || this.defaultLocale
let f = format || this.settings.get(SETTINGS_KEYS.DATE_FORMAT) let f = format || this.settings.get(SETTINGS_KEYS.DATE_FORMAT)
if (l == "iso-8601") { if (l == "iso-8601") {
return super.transform(value, FORMAT_TO_ISO_FORMAT[f], timezone) return super.transform(value, FORMAT_TO_ISO_FORMAT[f], timezone)
} else { } else {
return super.transform(value, format || this.settings.get(SETTINGS_KEYS.DATE_FORMAT), timezone, locale) return super.transform(value, format || this.settings.get(SETTINGS_KEYS.DATE_FORMAT), timezone, l)
} }
} }