diff --git a/docs/changelog.rst b/docs/changelog.rst index 137fa2fd2..73e457176 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -8,7 +8,7 @@ Changelog paperless-ng 1.2.1 ################## -* `Rodrigo Avelino `_ translated Paperless into Portuguese (Brazil). +* `Rodrigo Avelino `_ translated Paperless into Portuguese (Brazil)! * The date input fields now respect the currently selected date format. @@ -16,6 +16,8 @@ paperless-ng 1.2.1 * When using regular expression matching, the regular expression is now validated before saving the tag/correspondent/type. +* Regression fix: Dates on the front end did not respect date locale settings in some cases. + paperless-ng 1.2.0 ################## diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index cb3698187..42e8877b3 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -69,7 +69,7 @@ import { ColorComponent } from './components/common/input/color/color.component' import localeFr from '@angular/common/locales/fr'; import localeNl from '@angular/common/locales/nl'; import localeDe from '@angular/common/locales/de'; -import localePt from '@angular/common/locales/pt-PT'; +import localePt from '@angular/common/locales/pt'; import localeEnGb from '@angular/common/locales/en-GB'; registerLocaleData(localeFr) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index 34a978fe5..5692d9f78 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -94,7 +94,7 @@  {{d.title | documentTitle}} -
  • +
  • diff --git a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html index ee8e6e6f4..dc329f964 100644 --- a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html +++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html @@ -20,7 +20,7 @@
    -
    -
    -
    Invalid date.
    +
    Invalid date.
    + {{hint}}
    diff --git a/src-ui/src/app/pipes/custom-date.pipe.ts b/src-ui/src/app/pipes/custom-date.pipe.ts index cf5a931cb..6587c157a 100644 --- a/src-ui/src/app/pipes/custom-date.pipe.ts +++ b/src-ui/src/app/pipes/custom-date.pipe.ts @@ -13,17 +13,20 @@ const FORMAT_TO_ISO_FORMAT = { }) export class CustomDatePipe extends DatePipe implements PipeTransform { + private defaultLocale: string + constructor(@Inject(LOCALE_ID) locale: string, private settings: SettingsService) { super(locale) + this.defaultLocale = locale } 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) if (l == "iso-8601") { return super.transform(value, FORMAT_TO_ISO_FORMAT[f], timezone) } 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) } } diff --git a/src-ui/src/locale/messages.pt_BR.xlf b/src-ui/src/locale/messages.pt_BR.xlf index ff438073d..fe574c7bc 100644 --- a/src-ui/src/locale/messages.pt_BR.xlf +++ b/src-ui/src/locale/messages.pt_BR.xlf @@ -1729,7 +1729,7 @@ {VAR_PLURAL, plural, =1 {One more document} other { more documents}} - {VAR_PLURAL, plural, =1 {Mais um documento} other {Mais documentos} + {VAR_PLURAL, plural, =1 {Mais um documento} other {Mais documentos}} src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html 25