Merge branch 'master' into v2

components/collections/collection.vue

@@ -127,9 +127,12 @@ export default {
       this.showChildren = !this.showChildren
     },
     removeCollection() {
-      if (!confirm("Are you sure you want to remove this Collection?")) return
+      if (!confirm( this.$t("are_you_sure_remove_collection") )) return
       this.$store.commit("postwoman/removeCollection", {
         collectionIndex: this.collectionIndex,
+      })
+	  this.$toast.error(this.$t("deleted"), {
+        icon: "delete",
       })
       this.syncCollections()
     },

components/collections/folder.vue

@@ -103,12 +103,15 @@ export default {
       this.$store.commit("postwoman/selectRequest", { request })
     },
     removeFolder() {
-      if (!confirm("Are you sure you want to remove this folder?")) return
+      if (!confirm( this.$t("are_you_sure_remove_folder"))) return
       this.$store.commit("postwoman/removeFolder", {
         collectionIndex: this.collectionIndex,
         folderIndex: this.folderIndex,
       })
       this.syncCollections()
+	  this.$toast.error(this.$t("deleted"), {
+        icon: "delete",
+      })
     },
     editFolder() {
       this.$emit("edit-folder")

components/collections/index.vue

@@ -62,7 +62,7 @@ TODO:
       </div>
     </div>
     <p v-if="collections.length === 0" class="info">
-      <i class="material-icons">help_outline</i> Create new collection
+      <i class="material-icons">help_outline</i> {{ $t("create_new_collection") }}
     </p>
     <div class="virtual-list">
       <ul>

components/collections/request.vue

@@ -68,11 +68,14 @@ export default {
       this.$store.commit("postwoman/selectRequest", { request: this.request })
     },
     removeRequest() {
-      if (!confirm("Are you sure you want to remove this request?")) return
+      if (!confirm( this.$t("are_you_sure_remove_request"))) return
       this.$store.commit("postwoman/removeRequest", {
         collectionIndex: this.collectionIndex,
         folderIndex: this.folderIndex,
         requestIndex: this.requestIndex,
+      })
+	  this.$toast.error(this.$t("deleted"), {
+        icon: "delete",
       })
       this.syncCollections()
     },

components/environments/environment.vue

@@ -62,8 +62,11 @@ export default {
       }
     },
     removeEnvironment() {
-      if (!confirm("Are you sure you want to remove this environment?")) return
+      if (!confirm(this.$t("are_you_sure_remove_environment"))) return
       this.$store.commit("postwoman/removeEnvironment", this.environmentIndex)
+	  this.$toast.error(this.$t("deleted"), {
+        icon: "delete",
+      })
       this.syncEnvironments()
     },
   },

components/environments/index.vue

@@ -25,7 +25,7 @@
       </div>
     </div>
     <p v-if="environments.length === 0" class="info">
-      <i class="material-icons">help_outline</i> Create new environment
+      <i class="material-icons">help_outline</i> {{ $t("create_new_environment") }}
     </p>
     <div class="virtual-list">
       <ul>