Merge pull request #4071 from owncloud/wording-changes-trashbin

Rename "trash bin" to the "deleted files".
owncloud · Sep 16, 2020 · a3def97 · a3def97
2 parents d539c0e + b04963a
commit a3def97
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/apps/files/src/components/FilesAppBar.vue b/apps/files/src/components/FilesAppBar.vue
@@ -251,9 +251,7 @@ export default {
     },
 
     $_ocAppBar_clearTrashbinButtonText() {
-      return this.selectedFiles.length < 1
-        ? this.$gettext('Empty trash bin')
-        : this.$gettext('Delete')
+      return this.selectedFiles.length < 1 ? this.$gettext('Empty') : this.$gettext('Delete')
     },
 
     showBreadcrumb() {
@@ -638,13 +636,13 @@ export default {
         .clearTrashBin()
         .then(() => {
           this.showMessage({
-            title: this.$gettext('Trash bin was successfully emptied')
+            title: this.$gettext('All deleted files were removed')
           })
           this.removeFilesFromTrashbin(this.activeFiles)
         })
         .catch(error => {
           this.showMessage({
-            title: this.$gettext("Trash bin couldn't be emptied"),
+            title: this.$gettext('Could not delete files'),
             desc: error.message,
             status: 'danger'
           })

diff --git a/apps/files/src/components/Trashbin.vue b/apps/files/src/components/Trashbin.vue
@@ -31,7 +31,7 @@
               :is-desc="fileSortDirectionDesc"
               @click="toggleSort('deleteTimestampMoment')"
             >
-              <translate translate-context="Deletion time column in trashbin files table">
+              <translate translate-context="Deletion time column in 'deleted files' table">
                 Deletion Time
               </translate>
             </sortable-column-header>
@@ -57,7 +57,7 @@
         <template #noContentMessage>
           <no-content-message icon="delete">
             <template #message>
-              <span v-translate>Your trash bin is empty.</span>
+              <span v-translate>You have no deleted files.</span>
             </template>
           </no-content-message>
         </template>

diff --git a/apps/files/src/default.js b/apps/files/src/default.js
@@ -107,7 +107,7 @@ const navItems = [
     }
   },
   {
-    name: $gettext('Trash bin'),
+    name: $gettext('Deleted files'),
     iconMaterial: 'delete',
     enabled(capabilities) {
       if (capabilities && capabilities.dav) {

diff --git a/apps/files/src/store/actions.js b/apps/files/src/store/actions.js
@@ -438,7 +438,7 @@ export default {
           context.dispatch(
             'showMessage',
             {
-              title: $gettext('Loading trash bin failed…'),
+              title: $gettext('Loading list of deleted files has failed…'),
               status: 'danger'
             },
             { root: true }
@@ -456,7 +456,7 @@ export default {
         context.dispatch(
           'showMessage',
           {
-            title: $gettext('Loading trash bin failed…'),
+            title: $gettext('Loading list of deleted files has failed…'),
             desc: e.message,
             status: 'danger'
           },

diff --git a/changelog/unreleased/change-wording-trashbin b/changelog/unreleased/change-wording-trashbin
@@ -0,0 +1,6 @@
+Change: Rename "trash bin" to "deleted files"
+
+We've renamed the "trash bin" to the more appropriate wording "deleted files".
+
+https://github.com/owncloud/phoenix/pull/4071
+https://github.com/owncloud/product/issues/231
diff --git a/tests/acceptance/features/webUITrashbin/trashbinDelete.feature b/tests/acceptance/features/webUITrashbin/trashbinDelete.feature
@@ -119,14 +119,14 @@ Feature: files and folders can be deleted from the trashbin
   @issue-product-139
   Scenario: Clear trashbin
     When the user clears the trashbin
-    Then the success message with header "Trash bin was successfully emptied" should be displayed on the webUI
+    Then the success message with header "All deleted files were removed" should be displayed on the webUI
     And the trashbin should be empty on the webUI
 
   @skipOnOC10
   @issue-product-139
   # after the issue is fixed delete this scenario and use the one above
   Scenario: Clear trashbin
     When the user clears the trashbin
-    Then the error message with header "Trash bin couldn't be emptied" should be displayed on the webUI
+    Then the error message with header "Could not delete files" should be displayed on the webUI
     And file "lorem.txt" should be listed on the webUI
     And folder "simple-folder" should be listed on the webUI