gh-mirrors/paperless-ngx
1
0
Fork 1
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-12-18 09:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into feature/popover-previews

Browse Source
This commit is contained in:
Michael Shamoon
2021-02-24 12:41:44 -08:00
parent 706b1f4622 df87599f1b
commit 6f22297158
160 changed files with 11865 additions and 2503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src-ui/src/app/components/manage/settings/settings.component.ts
View File

@@ -34,7 +34,7 @@ export class SettingsComponent implements OnInit {
savedViews: PaperlessSavedView[]
get computedDateLocale(): string {
return this.settingsForm.value.dateLocale || this.settingsForm.value.displayLanguage
return this.settingsForm.value.dateLocale || this.settingsForm.value.displayLanguage || this.currentLocale
}
constructor(
@@ -86,11 +86,15 @@ export class SettingsComponent implements OnInit {
}
get displayLanguageOptions(): LanguageOption[] {
return [{code: "", name: $localize`Use system language`}].concat(this.settings.getLanguageOptions())
return [
{code: "", name: $localize`Use system language`}
].concat(this.settings.getLanguageOptions())
}
get dateLocaleOptions(): LanguageOption[] {
return [{code: "", name: $localize`Use date format of display language`}].concat(this.settings.getLanguageOptions())
return [
{code: "", name: $localize`Use date format of display language`}
].concat(this.settings.getDateLocaleOptions())
}
get today() {