Skip to content

Commit bca5d59

Browse files
odeimaizodeimaiz
committed
Bin -> Delete
1 parent 8dea1d1 commit bca5d59

File tree

7 files changed

+25
-26
lines changed

7 files changed

+25
-26
lines changed

‎services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
253253
const dateBy = this.getChildControl("date-by");
254254
dateBy.set({
255255
date: value,
256-
toolTipText: this.tr("Moved to the bin"),
256+
toolTipText: this.tr("Deleted"),
257257
});
258258
}
259259
},
@@ -302,7 +302,7 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
302302

303303
menu.addSeparator();
304304

305-
const trashButton = new qx.ui.menu.Button(this.tr("Move to Bin"), "@FontAwesome5Solid/trash/12");
305+
const trashButton = new qx.ui.menu.Button(this.tr("Delete"), "@FontAwesome5Solid/trash/12");
306306
trashButton.addListener("execute", () => this.fireDataEvent("trashFolderRequested", this.getFolderId()), this);
307307
menu.add(trashButton);
308308
} else if (studyBrowserContext === "trash") {

‎services/static-webserver/client/source/class/osparc/dashboard/GridButtonItem.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
194194
const dateBy = this.getChildControl("date-by");
195195
dateBy.set({
196196
date: value,
197-
toolTipText: this.tr("Moved to the bin"),
197+
toolTipText: this.tr("Deleted"),
198198
});
199199
}
200200
}

‎services/static-webserver/client/source/class/osparc/dashboard/ListButtonItem.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ qx.Class.define("osparc.dashboard.ListButtonItem", {
203203
const dateBy = this.getChildControl("date-by");
204204
dateBy.set({
205205
date: value,
206-
toolTipText: this.tr("Moved to the bin"),
206+
toolTipText: this.tr("Deleted"),
207207
});
208208
}
209209
}

‎services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
124124
const trashButton = this.__trashButton = new qx.ui.toolbar.RadioButton().set({
125125
value: false,
126126
appearance: "filter-toggle-button",
127-
label: this.tr("Bin"),
127+
label: this.tr("Recently Deleted"),
128128
icon: "@FontAwesome5Solid/trash-alt/16",
129129
paddingLeft: 10, // align it with the context
130130
});

‎services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
476476
osparc.store.Workspaces.getInstance().trashWorkspace(workspaceId)
477477
.then(() => {
478478
this.__reloadWorkspaces();
479-
const msg = this.tr("Successfully moved to Bin");
479+
const msg = this.tr("Successfully deleted");
480480
osparc.FlashMessenger.getInstance().logAs(msg, "INFO");
481481
this._resourceFilter.setTrashEmpty(false);
482482
})
@@ -614,7 +614,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
614614
osparc.store.Folders.getInstance().trashFolder(folderId, this.getCurrentWorkspaceId())
615615
.then(() => {
616616
this.__reloadFolders();
617-
const msg = this.tr("Successfully moved to Bin");
617+
const msg = this.tr("Successfully deleted");
618618
osparc.FlashMessenger.getInstance().logAs(msg, "INFO");
619619
this._resourceFilter.setTrashEmpty(false);
620620
})
@@ -626,11 +626,11 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
626626

627627
_trashFolderRequested: function(folderId) {
628628
const trashDays = osparc.store.StaticInfo.getInstance().getTrashRetentionDays();
629-
let msg = this.tr("Are you sure you want to move the Folder and all its content to the Bin?");
629+
let msg = this.tr("Are you sure you want to delete the Folder and all its content?");
630630
msg += "<br><br>" + this.tr("It will be permanently deleted after ") + trashDays + " days.";
631631
const confirmationWin = new osparc.ui.window.Confirmation(msg).set({
632-
caption: this.tr("Move to Bin"),
633-
confirmText: this.tr("Move to Bin"),
632+
caption: this.tr("Delete"),
633+
confirmText: this.tr("Delete"),
634634
confirmAction: "warning",
635635
});
636636
confirmationWin.center();
@@ -1124,7 +1124,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
11241124

11251125
studiesTrashButton.set({
11261126
visibility: selection.length && currentContext === "studiesAndFolders" ? "visible" : "excluded",
1127-
label: this.tr("Move to Bin") + (selection.length > 1 ? ` (${selection.length})` : ""),
1127+
label: this.tr("Delete") + (selection.length > 1 ? ` (${selection.length})` : ""),
11281128
});
11291129

11301130
studiesDeleteButton.set({
@@ -1388,7 +1388,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
13881388
},
13891389

13901390
__createTrashStudiesButton: function() {
1391-
const trashButton = new qx.ui.form.Button(this.tr("Move to Bin"), "@FontAwesome5Solid/trash/14").set({
1391+
const trashButton = new qx.ui.form.Button(this.tr("Delete"), "@FontAwesome5Solid/trash/14").set({
13921392
appearance: "warning-button",
13931393
visibility: "excluded"
13941394
});
@@ -1938,7 +1938,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
19381938
},
19391939

19401940
__getTrashStudyMenuButton: function(studyData) {
1941-
const trashButton = new qx.ui.menu.Button(this.tr("Move to Bin"), "@FontAwesome5Solid/trash/12");
1941+
const trashButton = new qx.ui.menu.Button(this.tr("Delete"), "@FontAwesome5Solid/trash/12");
19421942
trashButton["trashButton"] = true;
19431943
trashButton.set({
19441944
appearance: "menu-button"
@@ -2139,7 +2139,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
21392139
osparc.store.Store.getInstance().trashStudy(studyData.uuid)
21402140
.then(() => {
21412141
this.__removeFromStudyList(studyData.uuid);
2142-
const msg = this.tr("Successfully moved to Bin");
2142+
const msg = this.tr("Successfully deleted");
21432143
osparc.FlashMessenger.getInstance().logAs(msg, "INFO");
21442144
this._resourceFilter.setTrashEmpty(false);
21452145
})
@@ -2192,19 +2192,18 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
21922192
},
21932193

21942194
__createConfirmTrashWindow: function(studyNames) {
2195-
let msg = this.tr("Are you sure you want to move");
2195+
let msg = this.tr("Are you sure you want to delete");
21962196
if (studyNames.length > 1) {
21972197
const studiesText = osparc.product.Utils.getStudyAlias({plural: true});
21982198
msg += ` ${studyNames.length} ${studiesText} `
21992199
} else {
22002200
msg += ` '${studyNames[0]}' `;
22012201
}
2202-
msg += this.tr("to the Bin?");
22032202
const trashDays = osparc.store.StaticInfo.getInstance().getTrashRetentionDays();
22042203
msg += "<br><br>" + (studyNames.length > 1 ? "They" : "It") + this.tr(` will be permanently deleted after ${trashDays} days.`);
22052204
const confirmationWin = new osparc.ui.window.Confirmation(msg).set({
2206-
caption: this.tr("Move to Bin"),
2207-
confirmText: this.tr("Move to Bin"),
2205+
caption: this.tr("Delete"),
2206+
confirmText: this.tr("Delete"),
22082207
confirmAction: "warning",
22092208
});
22102209
osparc.utils.Utils.setIdToWidget(confirmationWin.getConfirmButton(), "confirmDeleteStudyBtn");
@@ -2236,7 +2235,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
22362235
},
22372236

22382237
__createConfirmEmptyTrashWindow: function() {
2239-
const msg = this.tr("Items in the bin will be permanently deleted");
2238+
const msg = this.tr("All items will be permanently deleted");
22402239
const confirmationWin = new osparc.ui.window.Confirmation(msg).set({
22412240
caption: this.tr("Delete"),
22422241
confirmText: this.tr("Delete permanently"),

‎services/static-webserver/client/source/class/osparc/dashboard/StudyBrowserHeader.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,10 +276,10 @@ qx.Class.define("osparc.dashboard.StudyBrowserHeader", {
276276
break;
277277
case "trash": {
278278
this.__setIcon("@FontAwesome5Solid/trash/20");
279-
title.setValue(this.tr("Bin"));
279+
title.setValue(this.tr("Recently Deleted"));
280280
const trashDays = osparc.store.StaticInfo.getInstance().getTrashRetentionDays();
281281
description.set({
282-
value: this.tr(`Items in the Bin will be permanently deleted after ${trashDays} days.`),
282+
value: this.tr(`Items here will be permanently deleted after ${trashDays} days.`),
283283
visibility: "visible",
284284
});
285285
break;

‎services/static-webserver/client/source/class/osparc/dashboard/WorkspaceButtonItem.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ qx.Class.define("osparc.dashboard.WorkspaceButtonItem", {
217217

218218
menu.addSeparator();
219219

220-
const trashButton = new qx.ui.menu.Button(this.tr("Move to Bin"), "@FontAwesome5Solid/trash/12");
220+
const trashButton = new qx.ui.menu.Button(this.tr("Delete"), "@FontAwesome5Solid/trash/12");
221221
trashButton.addListener("execute", () => this.__trashWorkspaceRequested(), this);
222222
menu.add(trashButton);
223223
} else if (studyBrowserContext === "trash") {
@@ -263,7 +263,7 @@ qx.Class.define("osparc.dashboard.WorkspaceButtonItem", {
263263
const dateBy = this.getChildControl("date-by");
264264
dateBy.set({
265265
date: value,
266-
toolTipText: this.tr("Moved to the bin"),
266+
toolTipText: this.tr("Deleted"),
267267
});
268268
}
269269
},
@@ -300,11 +300,11 @@ qx.Class.define("osparc.dashboard.WorkspaceButtonItem", {
300300

301301
__trashWorkspaceRequested: function() {
302302
const trashDays = osparc.store.StaticInfo.getInstance().getTrashRetentionDays();
303-
let msg = this.tr("Are you sure you want to move the Workspace and all its content to the Bin?");
303+
let msg = this.tr("Are you sure you want to delete the Workspace and all its content?");
304304
msg += "<br><br>" + this.tr("It will be permanently deleted after ") + trashDays + " days.";
305305
const confirmationWin = new osparc.ui.window.Confirmation(msg).set({
306-
caption: this.tr("Move to Bin"),
307-
confirmText: this.tr("Move to Bin"),
306+
caption: this.tr("Delete"),
307+
confirmText: this.tr("Delete"),
308308
confirmAction: "delete"
309309
});
310310
confirmationWin.center();

0 commit comments

Comments
 (0)