Skip to content

Commit 5abe616

Browse files
committed
updatess
1 parent 5432a01 commit 5abe616

File tree

4 files changed

+40
-23
lines changed

4 files changed

+40
-23
lines changed

services/web/server/src/simcore_service_webserver/resource_usage/_constants.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
APP_RABBITMQ_CONSUMERS_KEY: Final[str] = f"{__name__}.rabbit_consumers"
66

77
MSG_RESOURCE_USAGE_TRACKER_SERVICE_UNAVAILABLE: Final[str] = user_message(
8-
"Currently resource usage tracker service is unavailable, please try again later"
8+
"The resource usage tracking service is temporarily unavailable. Please try again in a few moments.",
9+
_version=1,
910
)
1011

11-
MSG_RESOURCE_USAGE_TRACKER_NOT_FOUND: Final[str] = user_message("Not Found")
12+
MSG_RESOURCE_USAGE_TRACKER_NOT_FOUND: Final[str] = user_message(
13+
"The requested resource usage information could not be found.", _version=1
14+
)

services/web/server/src/simcore_service_webserver/studies_dispatcher/_constants.py

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,37 @@
88
#
99

1010
MSG_PROJECT_NOT_FOUND: Final[str] = user_message(
11-
"Cannot find any study with ID '{project_id}'"
11+
"The project with ID '{project_id}' could not be found.", _version=1
1212
)
1313

14-
# This error happens when the linked study ID does not exists OR is not shared with everyone
14+
# This error happens when the linked project ID does not exists OR is not shared with everyone
1515
MSG_PROJECT_NOT_PUBLISHED: Final[str] = user_message(
16-
"Cannot find any study with ID '{project_id}'"
16+
"The project with ID '{project_id}' is not available or not shared.", _version=1
1717
)
1818

19-
# This error happens when the linked study ID does not exists OR is not shared with everyone OR is NOT public
19+
# This error happens when the linked project ID does not exists OR is not shared with everyone OR is NOT public
2020
MSG_PUBLIC_PROJECT_NOT_PUBLISHED: Final[str] = user_message(
21-
"Only available for registered users.<br/><br/>"
22-
"Please login and try again.<br/><br/>"
23-
"If you don't have an account, please request one at {support_email}<br/><br/>"
21+
"This project is only available for registered users.<br/><br/>"
22+
"Please log in and try again.<br/><br/>"
23+
"If you don't have an account, please request one at {support_email}.<br/><br/>",
24+
_version=1,
2425
)
2526

2627
MSG_GUESTS_NOT_ALLOWED: Final[str] = user_message(
27-
"Access restricted to registered users.<br/><br/>"
28-
"If you don't have an account, please email to support and request one<br/><br/>"
28+
"Access is restricted to registered users.<br/><br/>"
29+
"If you don't have an account, please contact support to request one.<br/><br/>",
30+
_version=1,
2931
)
3032

3133
MSG_TOO_MANY_GUESTS: Final[str] = user_message(
32-
"We have reached the maximum of anonymous users allowed the platform. "
33-
"Please try later or login with a registered account."
34+
"We have reached the maximum number of anonymous users allowed on the platform. "
35+
"Please try again later or log in with a registered account.",
36+
_version=1,
3437
)
3538

3639
MSG_UNEXPECTED_DISPATCH_ERROR: Final[str] = user_message(
37-
"Sorry, but looks like something unexpected went wrong!"
38-
"We track these errors automatically, but if the problem persists feel free to contact us."
39-
"In the meantime, try refreshing."
40+
"Sorry, something unexpected went wrong! "
41+
"We track these errors automatically, but if the problem persists please contact us. "
42+
"In the meantime, try refreshing the page.",
43+
_version=1,
4044
)

services/web/server/src/simcore_service_webserver/tags/_rest.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,27 +39,35 @@
3939
_TO_HTTP_ERROR_MAP: ExceptionToHttpErrorMap = {
4040
TagNotFoundError: HttpErrorInfo(
4141
status.HTTP_404_NOT_FOUND,
42-
user_message("Tag {tag_id} not found: either no access or does not exists"),
42+
user_message(
43+
"The tag '{tag_id}' could not be found or you don't have access to it.",
44+
_version=1,
45+
),
4346
),
4447
TagOperationNotAllowedError: HttpErrorInfo(
4548
status.HTTP_403_FORBIDDEN,
4649
user_message(
47-
"Could not {operation} tag {tag_id}. Not found or insuficient access."
50+
"Unable to {operation} tag '{tag_id}'. The tag was not found or you don't have sufficient access.",
51+
_version=1,
4852
),
4953
),
5054
ShareTagWithEveryoneNotAllowedError: HttpErrorInfo(
5155
status.HTTP_403_FORBIDDEN,
52-
user_message("Sharing with everyone is not permitted."),
56+
user_message("Sharing with everyone is not allowed.", _version=1),
5357
),
5458
ShareTagWithProductGroupNotAllowedError: HttpErrorInfo(
5559
status.HTTP_403_FORBIDDEN,
5660
user_message(
57-
"Sharing with all users is only permitted to admin users (e.g. testers, POs, ...)."
61+
"Sharing with all users is only allowed for admin users (e.g. testers, POs, ...).",
62+
_version=1,
5863
),
5964
),
6065
InsufficientTagShareAccessError: HttpErrorInfo(
6166
status.HTTP_403_FORBIDDEN,
62-
user_message("Insufficient access rightst to share (or unshare) tag {tag_id}."),
67+
user_message(
68+
"You don't have sufficient access rights to share (or unshare) tag '{tag_id}'.",
69+
_version=1,
70+
),
6371
),
6472
}
6573

services/web/server/src/simcore_service_webserver/trash/_rest.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@
2727
ProjectRunningConflictError: HttpErrorInfo(
2828
status.HTTP_409_CONFLICT,
2929
user_message(
30-
"Current study is in use and cannot be trashed [project_id={project_uuid}]. Please stop all services first and try again"
30+
"The project is currently in use and cannot be moved to trash. Please stop all running services first and try again.",
31+
_version=1,
3132
),
3233
),
3334
ProjectStoppingError: HttpErrorInfo(
3435
status.HTTP_503_SERVICE_UNAVAILABLE,
3536
user_message(
36-
"Something went wrong while stopping services before trashing. Aborting trash."
37+
"An error occurred while stopping services before moving to trash. The operation has been cancelled.",
38+
_version=1,
3739
),
3840
),
3941
}

0 commit comments

Comments
 (0)