From 31b74515b6fd8057d12ad5c9131973314a6ec102 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 16 Jan 2021 20:49:12 -0800
Subject: [PATCH 1/2] Allow "live" changing of date format
---
.../app/components/manage/settings/settings.component.html | 6 +++---
.../app/components/manage/settings/settings.component.ts | 4 ++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index d5acfb149..9b35b5b3f 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -48,15 +48,15 @@
-
+
-
+
-
+
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index d10297f95..9a315c245 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -30,6 +30,10 @@ export class SettingsComponent implements OnInit {
savedViews: PaperlessSavedView[]
+ get comptuedDateLocale(): string {
+ return this.settingsForm.value.dateLocale || this.settingsForm.value.displayLanguage
+ }
+
constructor(
public savedViewService: SavedViewService,
private documentListViewService: DocumentListViewService,
From 741ccfa280be57e622c8a8253419229cda5d246f Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sat, 16 Jan 2021 21:39:13 -0800
Subject: [PATCH 2/2] Fix svg attribute error
Unrelated to the rest of this branch but not worth a separate PR
---
src-ui/src/app/components/dashboard/dashboard.component.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html
index 47751fe8b..c10b8ea04 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.html
+++ b/src-ui/src/app/components/dashboard/dashboard.component.html
@@ -1,5 +1,5 @@
-