Settings: Clear trash when deleting all local mappings (#428)

gbv · Jun 24, 2019 · 945e4e3 · 945e4e3
1 parent 8dcf410
commit 945e4e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/config/locale.json b/config/locale.json
@@ -219,7 +219,7 @@
       "localUploadPlaceholder": "Choose a file...",
       "localDeleteTitle": "Delete Local Mappings",
       "localDeleteText": "Delete all local mappings",
-      "localDeleteSure": "This action cannot be undone! Are you sure?",
+      "localDeleteSure": "This action deletes all local mappings (including all mappings in the trash) and cannot be undone! Are you sure?",
       "suggestions1": "For issues and suggestions, please use the",
       "suggestions2": "GitHub issue tracker",
       "suggestions3": ".",
@@ -403,7 +403,7 @@
       "localUploadPlaceholder": "Datei auswählen...",
       "localDeleteTitle": "Lokale Mappings löschen",
       "localDeleteText": "Alle lokalen Mappings löschen",
-      "localDeleteSure": "Diese Aktion kann nicht rückgängig gemacht werden! Fortfahren?",
+      "localDeleteSure": "Diese Aktion löscht alle lokalen Mappings (inkl. der kürzlich gelöschten Mappings) und kann nicht rückgängig gemacht werden! Fortfahren?",
       "suggestions1": "Für Probleme oder Vorschläge, bitte den",
       "suggestions2": "GitHub Issue Tracker",
       "suggestions3": " benutzen.",

diff --git a/src/components/TheSettings.vue b/src/components/TheSettings.vue
@@ -557,6 +557,8 @@ export default {
           this.$store.commit("mapping/setRefresh", { registry: "http://coli-conc.gbv.de/registry/local-mappings" })
           this.refreshDownloads()
           this.deleteMappingsButtons = false
+          // Also clear mapping trash
+          this.$store.commit("mapping/clearTrash")
         }).catch(error => {
           console.error("TheSettings - Error deleting local mappings", error)
         })