From 79be09d7340e59d74f592203d9c565107ed48b9a Mon Sep 17 00:00:00 2001 From: ovari123 <ovari123@zoho.com> Date: Sun, 1 Dec 2024 15:12:51 -0400 Subject: [PATCH] misc: unify terminology MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Are you sure you → Do you really → Do you community version of JAMS → JAMS Community Edition purchase → buy Would you like → Do you want Change-Id: I78a99471fb06722fef8f4b434cfd73c242962a26 GitLab: https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/1730 --- .../src/components/Devices/RevokeDeviceDialog.tsx | 4 ++-- jams-react-client/src/layouts/BaseLayout.tsx | 12 ++++++------ jams-react-client/src/layouts/ListLayout.tsx | 12 ++++++------ .../src/views/Blueprints/Blueprints.tsx | 6 +++--- jams-react-client/src/views/Contacts/Contacts.tsx | 4 ++-- jams-react-client/src/views/Groups/Groups.tsx | 4 ++-- .../src/views/UserProfile/DisplayUserProfile.tsx | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/jams-react-client/src/components/Devices/RevokeDeviceDialog.tsx b/jams-react-client/src/components/Devices/RevokeDeviceDialog.tsx index f3f1502e..92faac37 100644 --- a/jams-react-client/src/components/Devices/RevokeDeviceDialog.tsx +++ b/jams-react-client/src/components/Devices/RevokeDeviceDialog.tsx @@ -50,8 +50,8 @@ const RevokeDeviceDialog: FC<RevokeDeviceDialogProps> = ({ <DialogContentText> { i18next.t( - "are_you_sure_you_want_to_revoke_this_device", - "Are you sure you want to revoke this device?" + "do_you_want_to_revoke_the_device", + "Do you want to revoke the device?" ) as string } </DialogContentText> diff --git a/jams-react-client/src/layouts/BaseLayout.tsx b/jams-react-client/src/layouts/BaseLayout.tsx index 5f12945e..b25594c0 100644 --- a/jams-react-client/src/layouts/BaseLayout.tsx +++ b/jams-react-client/src/layouts/BaseLayout.tsx @@ -152,7 +152,7 @@ export default function Admin(props: AdminProps) { setDialogMessage( i18next.t( "new_version_jams_available", - "A new version of JAMS is available. Would you like to update now?" + "A new version of JAMS is available. Do you want to update now?" ) ); setMessageYes("Update Now"); @@ -160,8 +160,8 @@ export default function Admin(props: AdminProps) { } else { setDialogMessage( i18next.t( - "running_community_version_jams", - "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?" + "running_community_edition_jams", + "JAMS Community Edition is running. Do you want to buy a JAMS subscription?" ) ); setMessageYes("Yes, go to Jami Store"); @@ -221,8 +221,8 @@ export default function Admin(props: AdminProps) { if (auth.isActivated()) { setSnackbarMessage( i18next.t( - "updating_jams_shutting_down_shortly", - "Updating JAMS, shutting down shortly..." + "shutting_down_after_jams_update_is_finished", + "Shutting down after JAMS update is finished…" ) ); axios(configApiCall(api_path_get_start_update, "POST", null, null)) @@ -234,7 +234,7 @@ export default function Admin(props: AdminProps) { setSnackbarMessage( i18next.t( "error_while_attempting_update_jams", - "Error occurred while attempting to update JAMS:" + "An error occurred while attempting to update JAMS:" ) + error ); }); diff --git a/jams-react-client/src/layouts/ListLayout.tsx b/jams-react-client/src/layouts/ListLayout.tsx index 1ffc6b9a..cebb1ae5 100644 --- a/jams-react-client/src/layouts/ListLayout.tsx +++ b/jams-react-client/src/layouts/ListLayout.tsx @@ -145,7 +145,7 @@ export default function Admin(props: AdminProps) { setDialogMessage( i18next.t( "new_version_jams_available", - "A new version of JAMS is available. Would you like to update now?" + "A new version of JAMS is available. Do you want to update now?" ) ); setMessageYes("Update Now"); @@ -153,8 +153,8 @@ export default function Admin(props: AdminProps) { } else { setDialogMessage( i18next.t( - "running_community_version_jams", - "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?" + "running_community_edition_jams", + "JAMS Community Edition is running. Do you want to buy a JAMS subscription?" ) ); setMessageYes("Yes, go to Jami Store"); @@ -214,8 +214,8 @@ export default function Admin(props: AdminProps) { if (auth.isActivated()) { setSnackbarMessage( i18next.t( - "updating_jams_shutting_down_shortly", - "Updating JAMS, shutting down shortly..." + "shutting_down_after_jams_update_is_finished", + "Shutting down after JAMS update is finished…" ) ); axios(configApiCall(api_path_get_start_update, "POST", null, null)) @@ -227,7 +227,7 @@ export default function Admin(props: AdminProps) { setSnackbarMessage( i18next.t( "error_while_attempting_update_jams", - "Error occurred while attempting to update JAMS:" + "An error occurred while attempting to update JAMS:" ) + error ); }); diff --git a/jams-react-client/src/views/Blueprints/Blueprints.tsx b/jams-react-client/src/views/Blueprints/Blueprints.tsx index 71478379..a3edc687 100644 --- a/jams-react-client/src/views/Blueprints/Blueprints.tsx +++ b/jams-react-client/src/views/Blueprints/Blueprints.tsx @@ -175,14 +175,14 @@ export default function Blueprints() { aria-describedby="alert-dialog-description" > <DialogTitle id="alert-dialog-title"> - {i18next.t("remove_blueprint", "Remove blueprint") as string} + {i18next.t("delete_blueprint", "Delete blueprint") as string} </DialogTitle> <DialogContent> <DialogContentText id="alert-dialog-description"> { i18next.t( - "are_you_sure_you_want_to_delete", - "Are you sure you want to delete" + "do_you_want_to_delete_the_blueprint", + "Do you want to delete the blueprint?" ) as string } <strong> {removedBlueprint}</strong> ? diff --git a/jams-react-client/src/views/Contacts/Contacts.tsx b/jams-react-client/src/views/Contacts/Contacts.tsx index 965cd5a4..36bc4ec3 100644 --- a/jams-react-client/src/views/Contacts/Contacts.tsx +++ b/jams-react-client/src/views/Contacts/Contacts.tsx @@ -382,8 +382,8 @@ export default function Users(props: UsersProps) { <DialogContentText id="alert-dialog-description"> { i18next.t( - "are_you_sure_you_want_to_remove", - "Are you sure you want to remove" + "do_you_want_to_remove_the_contact", + "Do you want to remove the contact?" ) as string } <strong>{" " + removedContactName + " "}</strong> diff --git a/jams-react-client/src/views/Groups/Groups.tsx b/jams-react-client/src/views/Groups/Groups.tsx index 7d34187c..d34d4211 100644 --- a/jams-react-client/src/views/Groups/Groups.tsx +++ b/jams-react-client/src/views/Groups/Groups.tsx @@ -231,8 +231,8 @@ export default function Groups() { <DialogContentText id="alert-dialog-description"> { i18next.t( - "are_you_sure_you_want_to_delete", - "Are you sure you want to delete" + "do_you_want_to_delete_the_group", + "Do you want to delete the group?" ) as string }{" "} <strong> {removedGroup.name}</strong> ? diff --git a/jams-react-client/src/views/UserProfile/DisplayUserProfile.tsx b/jams-react-client/src/views/UserProfile/DisplayUserProfile.tsx index b15ffee3..f5ca6080 100644 --- a/jams-react-client/src/views/UserProfile/DisplayUserProfile.tsx +++ b/jams-react-client/src/views/UserProfile/DisplayUserProfile.tsx @@ -410,8 +410,8 @@ const DisplayUserProfile: FC<DisplayUserProfileProps> = ({ <DialogContentText id="alert-dialog-description"> { i18next.t( - "are_you_sure_want_revoke", - "Are you sure you want to revoke" + "do_you_want_to_revoke_the_user_account", + "Do you want to revoke the user account?" ) as string }{" "} <strong>{revokedUser}</strong> ? -- GitLab