Merge branch 'dev' into feature/dark-mode

src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts

@@ -14,7 +14,19 @@ import { ToastService } from 'src/app/services/toast.service';
 export class CorrespondentEditDialogComponent extends EditDialogComponent<PaperlessCorrespondent> {
 
   constructor(service: CorrespondentService, activeModal: NgbActiveModal, toastService: ToastService) {
-    super(service, activeModal, toastService, 'correspondent')
+    super(service, activeModal, toastService)
+  }
+
+  getCreateTitle() {
+    return $localize`Create new correspondent`
+  }
+
+  getEditTitle() {
+    return $localize`Edit correspondent`
+  }
+
+  getSaveErrorMessage(error: string) {
+    return $localize`Could not save correspondent: ${error}`
   }
 
   getForm(): FormGroup {

src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts

@@ -22,8 +22,8 @@ export class CorrespondentListComponent extends GenericListComponent<PaperlessCo
     super(correspondentsService,modalService,CorrespondentEditDialogComponent)
   }
 
-  getObjectName(object: PaperlessCorrespondent) {
-    return `correspondent '${object.name}'`
+  getDeleteMessage(object: PaperlessCorrespondent) {
+    return $localize`Do you really want to delete the correspondent ${object.name}?`
   }
 
   filterDocuments(object: PaperlessCorrespondent) {

src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts

@@ -14,7 +14,19 @@ import { ToastService } from 'src/app/services/toast.service';
 export class DocumentTypeEditDialogComponent extends EditDialogComponent<PaperlessDocumentType> {
 
   constructor(service: DocumentTypeService, activeModal: NgbActiveModal, toastService: ToastService) { 
-    super(service, activeModal, toastService, 'document type')
+    super(service, activeModal, toastService)
+  }
+
+  getCreateTitle() {
+    return $localize`Create new document type`
+  }
+
+  getEditTitle() {
+    return $localize`Edit document type`
+  }
+
+  getSaveErrorMessage(error: string) {
+    return $localize`Could not save document type: ${error}`
   }
 
   getForm(): FormGroup {

src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts

@@ -22,10 +22,11 @@ export class DocumentTypeListComponent extends GenericListComponent<PaperlessDoc
     super(service, modalService, DocumentTypeEditDialogComponent)
   }
 
-  getObjectName(object: PaperlessDocumentType) {
-    return `document type '${object.name}'`
+  getDeleteMessage(object: PaperlessDocumentType) {
+    return $localize`Do you really want to delete the document type ${object.name}?`
   }
 
+
   filterDocuments(object: PaperlessDocumentType) {
     this.list.documentListView.filter_rules = [
       {rule_type: FILTER_DOCUMENT_TYPE, value: object.id.toString()}

src-ui/src/app/components/manage/generic-list/generic-list.component.ts

@@ -84,14 +84,14 @@ export abstract class GenericListComponent<T extends ObjectWithId> implements On
     })
   }
 
-  getObjectName(object: T) {
-    return object.toString()
+  getDeleteMessage(object: T) {
+    return $localize`Do you really want to delete this element?`
   }
 
   openDeleteDialog(object: T) {
     var activeModal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
     activeModal.componentInstance.title = $localize`Confirm delete`
-    activeModal.componentInstance.messageBold = $localize`Do you really want to delete ${this.getObjectName(object)}?`
+    activeModal.componentInstance.messageBold = this.getDeleteMessage(object)
     activeModal.componentInstance.message = $localize`Associated documents will not be deleted.`
     activeModal.componentInstance.btnClass = "btn-danger"
     activeModal.componentInstance.btnCaption = $localize`Delete`

src-ui/src/app/components/manage/settings/settings.component.ts

@@ -4,7 +4,7 @@ import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
 import { GENERAL_SETTINGS } from 'src/app/data/storage-keys';
 import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { SavedViewService } from 'src/app/services/rest/saved-view.service';
-import { Toast, ToastService } from 'src/app/services/toast.service';
+import { ToastService } from 'src/app/services/toast.service';
 import { AppViewService } from 'src/app/services/app-view.service';
 
 @Component({
@@ -54,7 +54,7 @@ export class SettingsComponent implements OnInit {
     this.savedViewService.delete(savedView).subscribe(() => {
       this.savedViewGroup.removeControl(savedView.id.toString())
       this.savedViews.splice(this.savedViews.indexOf(savedView), 1)
-      this.toastService.showToast(Toast.make("Information", $localize`Saved view "${savedView.name} deleted.`))
+      this.toastService.showInfo($localize`Saved view "${savedView.name} deleted.`)
     })
   }
 
@@ -72,7 +72,7 @@ export class SettingsComponent implements OnInit {
     localStorage.setItem(GENERAL_SETTINGS.DARK_MODE_ENABLED, (this.settingsForm.value.darkModeEnabled == true).toString())
     this.documentListViewService.updatePageSize()
     this.appViewService.updateDarkModeSettings()
-    this.toastService.showToast(Toast.make("Information", $localize`Settings saved successfully.`))
+    this.toastService.showInfo($localize`Settings saved successfully.`)
   }
 
   saveSettings() {
@@ -84,7 +84,7 @@ export class SettingsComponent implements OnInit {
       this.savedViewService.patchMany(x).subscribe(s => {
         this.saveLocalSettings()
       }, error => {
-        this.toastService.showToast(Toast.makeError($localize`Error while storing settings on server: ${JSON.stringify(error.error)}`))
+        this.toastService.showError($localize`Error while storing settings on server: ${JSON.stringify(error.error)}`)
       })
     } else {
       this.saveLocalSettings()

src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts

@@ -14,7 +14,19 @@ import { ToastService } from 'src/app/services/toast.service';
 export class TagEditDialogComponent extends EditDialogComponent<PaperlessTag> {
 
   constructor(service: TagService, activeModal: NgbActiveModal, toastService: ToastService) { 
-    super(service, activeModal, toastService, 'tag')
+    super(service, activeModal, toastService)
+  }
+
+  getCreateTitle() {
+    return $localize`Create new tag`
+  }
+
+  getEditTitle() {
+    return $localize`Edit tag`
+  }
+
+  getSaveErrorMessage(error: string) {
+    return $localize`Could not save tag: ${error}`
   }
 
   getForm(): FormGroup {

src-ui/src/app/components/manage/tag-list/tag-list.component.ts

@@ -26,8 +26,8 @@ export class TagListComponent extends GenericListComponent<PaperlessTag> {
     return TAG_COLOURS.find(c => c.id == id)
   }
 
-  getObjectName(object: PaperlessTag) {
-    return `tag '${object.name}'`
+  getDeleteMessage(object: PaperlessTag) {
+    return $localize`Do you really want to delete the tag ${object.name}?`
   }
 
   filterDocuments(object: PaperlessTag) {