Skip to content

Commit 4fcbc17

Browse files
odeimaizmrnicegyu11
authored andcommitted
🎨 [Frontend] Enh: Wording and .po file (ITISFoundation#7418)
1 parent e796ee1 commit 4fcbc17

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+4533
-110
lines changed

‎services/static-webserver/client/.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,3 @@ source/resource/iconfont/material
1414
# generator outputs
1515
/api/
1616
/test/
17-
18-
# translations for the moment ignored
19-
*.po

‎services/static-webserver/client/Makefile‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,17 @@ serve: compile ## serves site compiled in image in 127.0.0.1:8080
8888
docker run --rm -p 8080:8080 $(docker_image) $(qx_serve) --target=build
8989

9090

91+
# qx translate --------------------------
92+
93+
define qx_translate_extract =
94+
qx compile --update-po-files
95+
endef
96+
97+
.PHONY: translate-extract
98+
translate-extract: translate-extract ## the generated .po files goes to source/translation https://qooxdoo.org/documentation/v7.8/#/development/howto/internationalization?id=translation
99+
# qx compile --update-po-files
100+
$(docker_compose) run $(if $(detached),--detach --name=$(detached),--rm) qooxdoo-kit $(qx_translate_extract)
101+
91102

92103
# misc --------------------------
93104
.PHONY: shell

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ qx.Class.define("osparc.Application", {
7474
const webSocket = osparc.wrapper.WebSocket.getInstance();
7575
webSocket.addListener("connect", () => osparc.WatchDog.getInstance().setOnline(true));
7676
webSocket.addListener("disconnect", () => osparc.WatchDog.getInstance().setOnline(false));
77-
webSocket.addListener("logout", () => this.logout(qx.locale.Manager.tr("You were logged out")));
77+
webSocket.addListener("logout", () => this.logout(qx.locale.Manager.tr("You have been logged out")));
7878
// alert the users that they are about to navigate away
7979
// from osparc. unfortunately it is not possible
8080
// to provide our own message here
@@ -371,7 +371,7 @@ qx.Class.define("osparc.Application", {
371371
__checkNewRelease: function() {
372372
if (osparc.NewRelease.firstTimeISeeThisFrontend()) {
373373
const newRelease = new osparc.NewRelease();
374-
const title = this.tr("New Release");
374+
const title = this.tr("New Version Released");
375375
const win = osparc.ui.window.Window.popUpInWindow(newRelease, title, 350, 135).set({
376376
clickAwayClose: false,
377377
resizable: false,
@@ -563,7 +563,7 @@ qx.Class.define("osparc.Application", {
563563
if (forcedReason) {
564564
osparc.FlashMessenger.logAs(forcedReason, "WARNING", 0);
565565
} else {
566-
osparc.FlashMessenger.logAs(this.tr("You are logged out"), "INFO");
566+
osparc.FlashMessenger.logAs(this.tr("You have been logged out"), "INFO");
567567
}
568568
this.__closeAllAndToLoginPage();
569569
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ qx.Class.define("osparc.CookieExpirationTracker", {
112112
// /FLASH MESSAGE //
113113

114114
__logoutUser: function() {
115-
const reason = qx.locale.Manager.tr("Session expired");
115+
const reason = qx.locale.Manager.tr("Your session has expired");
116116
qx.core.Init.getApplication().logout(reason);
117117
}
118118
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ qx.Class.define("osparc.MaintenanceTracker", {
166166
end: null,
167167
reason: null
168168
});
169-
const reason = qx.locale.Manager.tr("We are under maintenance. Please check back later");
169+
const reason = qx.locale.Manager.tr("The service is under maintenance. Please check back later");
170170
qx.core.Init.getApplication().logout(reason);
171171
},
172172

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ qx.Class.define("osparc.TooSmallDialog", {
1919
extend: osparc.ui.window.SingletonWindow,
2020

2121
construct: function() {
22-
this.base(arguments, "too-small-logout", this.tr("Window too small"));
22+
this.base(arguments, "too-small-logout", this.tr("Window size too small"));
2323

2424
this.set({
2525
layout: new qx.ui.layout.VBox(10),

‎services/static-webserver/client/source/class/osparc/auth/ui/Login2FAValidationCodeView.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ qx.Class.define("osparc.auth.ui.Login2FAValidationCodeView", {
9797
alignY: "middle"
9898
}));
9999
const resendCodeDesc = new qx.ui.basic.Label().set({
100-
value: this.tr("Didn't receive the code? Resend code")
100+
value: this.tr("Didn't receive the code? Click to resend")
101101
});
102102
resendLayout.add(resendCodeDesc);
103103

‎services/static-webserver/client/source/class/osparc/auth/ui/RequestAccount.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ qx.Class.define("osparc.auth.ui.RequestAccount", {
408408
};
409409
osparc.data.Resources.fetch("auth", "postRequestAccount", params)
410410
.then(() => {
411-
const msg = this.tr("The request is being processed, you will hear from us in the coming hours");
411+
const msg = this.tr("Your request is being processed. You will hear from us soon");
412412
osparc.FlashMessenger.logAs(msg, "INFO");
413413
this.fireDataEvent("done");
414414
})

‎services/static-webserver/client/source/class/osparc/auth/ui/VerifyPhoneNumberView.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ qx.Class.define("osparc.auth.ui.VerifyPhoneNumberView", {
6161
this.add(verificationInfoTitle);
6262

6363
const verificationInfoDesc = new qx.ui.basic.Label().set({
64-
value: this.tr("We will send you a text message to your mobile phone to authenticate you each time you log in."),
64+
value: this.tr("A text message will be sent to your mobile phone for authentication each time you log in."),
6565
rich: true,
6666
wrap: true
6767
});

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2141,16 +2141,18 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
21412141
if (msg) {
21422142
osparc.FlashMessenger.logAs(msg, msgLevel);
21432143
}
2144+
osparc.store.PollTasks.getInstance().removeTask(task);
21442145
osparc.task.TasksContainer.getInstance().removeTaskUI(taskUI);
21452146
this._resourcesContainer.removeNonResourceCard(duplicatingStudyCard);
21462147
};
21472148

21482149
task.addListener("taskAborted", () => {
21492150
const msg = this.tr("Duplication cancelled");
2150-
finished(msg, "INFO");
2151+
finished(msg, "WARNING");
21512152
});
21522153
task.addListener("resultReceived", e => {
2153-
finished();
2154+
const msg = this.tr("Duplication completed");
2155+
finished(msg, "INFO");
21542156
const duplicatedStudyData = e.getData();
21552157
this._updateStudyData(duplicatedStudyData);
21562158
});

0 commit comments

Comments
 (0)