From d536fa9939038959c53b3f648c1b5c1468ae4a4b Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Wed, 18 Oct 2023 08:32:43 -0400 Subject: [PATCH] translation: team -> workspace --- app/components/ErrorBoundary.tsx | 4 ++-- .../AddPeopleToCollection.tsx | 2 +- app/scenes/CollectionPermissions/index.tsx | 2 +- app/scenes/ErrorSuspended.tsx | 2 +- app/scenes/Settings/Security.tsx | 2 +- plugins/slack/client/Settings.tsx | 4 ++-- server/errors.ts | 16 ++++++++++------ server/middlewares/authentication.test.ts | 2 +- shared/i18n/locales/en_US/translation.json | 15 +++++++-------- 9 files changed, 26 insertions(+), 23 deletions(-) diff --git a/app/components/ErrorBoundary.tsx b/app/components/ErrorBoundary.tsx index 3091ea929..ecf4766d7 100644 --- a/app/components/ErrorBoundary.tsx +++ b/app/components/ErrorBoundary.tsx @@ -121,11 +121,11 @@ class ErrorBoundary extends React.Component { {" "} {this.showDetails ? ( ) : ( )}

diff --git a/app/scenes/CollectionPermissions/AddPeopleToCollection.tsx b/app/scenes/CollectionPermissions/AddPeopleToCollection.tsx index 9f6a4f4a3..0bb587503 100644 --- a/app/scenes/CollectionPermissions/AddPeopleToCollection.tsx +++ b/app/scenes/CollectionPermissions/AddPeopleToCollection.tsx @@ -68,7 +68,7 @@ function AddPeopleToCollection({ collection }: Props) { return ( - {t("Need to add someone who’s not yet on the team yet?")}{" "} + {t("Need to add someone who’s not on the team yet?")}{" "} {t("Invite people to {{ teamName }}", { teamName: team.name, diff --git a/app/scenes/CollectionPermissions/index.tsx b/app/scenes/CollectionPermissions/index.tsx index 0aa09664e..c556ddc0c 100644 --- a/app/scenes/CollectionPermissions/index.tsx +++ b/app/scenes/CollectionPermissions/index.tsx @@ -256,7 +256,7 @@ function CollectionPermissions({ collectionId }: Props) { ) : ( - Public sharing is currently disabled in the team security + Public sharing is currently disabled in the workspace security settings. ) diff --git a/app/scenes/ErrorSuspended.tsx b/app/scenes/ErrorSuspended.tsx index e397861c0..145c91b32 100644 --- a/app/scenes/ErrorSuspended.tsx +++ b/app/scenes/ErrorSuspended.tsx @@ -21,7 +21,7 @@ const ErrorSuspended = () => {

Settings that impact the access, security, and content of your - knowledge base. + workspace. diff --git a/plugins/slack/client/Settings.tsx b/plugins/slack/client/Settings.tsx index 947688064..14b13b80e 100644 --- a/plugins/slack/client/Settings.tsx +++ b/plugins/slack/client/Settings.tsx @@ -63,7 +63,7 @@ function Slack() { Whoops, you need to accept the permissions in Slack to connect{" "} - {{ appName }} to your team. Try again? + {{ appName }} to your workspace. Try again? )} @@ -71,7 +71,7 @@ function Slack() { Something went wrong while authenticating your request. Please try - logging in again? + logging in again. )} diff --git a/server/errors.ts b/server/errors.ts index f8cc57381..a772f6a2e 100644 --- a/server/errors.ts +++ b/server/errors.ts @@ -69,12 +69,16 @@ export function UserSuspendedError({ }: { adminEmail: string | undefined; }) { - return httpErrors(403, "Your access has been suspended by the team admin", { - id: "user_suspended", - errorData: { - adminEmail, - }, - }); + return httpErrors( + 403, + "Your access has been suspended by a workspace admin", + { + id: "user_suspended", + errorData: { + adminEmail, + }, + } + ); } export function InvalidRequestError(message = "Request invalid") { diff --git a/server/middlewares/authentication.test.ts b/server/middlewares/authentication.test.ts index 29c4af230..1804bbe34 100644 --- a/server/middlewares/authentication.test.ts +++ b/server/middlewares/authentication.test.ts @@ -181,7 +181,7 @@ describe("Authentication middleware", () => { } expect(error.message).toEqual( - "Your access has been suspended by the team admin" + "Your access has been suspended by a workspace admin" ); expect(error.errorData.adminEmail).toEqual(admin.email); }); diff --git a/shared/i18n/locales/en_US/translation.json b/shared/i18n/locales/en_US/translation.json index 0db809345..e947305b9 100644 --- a/shared/i18n/locales/en_US/translation.json +++ b/shared/i18n/locales/en_US/translation.json @@ -181,8 +181,7 @@ "Something Unexpected Happened": "Something Unexpected Happened", "Sorry, an unrecoverable error occurred{{notified}}. Please try reloading the page, it may have been a temporary glitch.": "Sorry, an unrecoverable error occurred{{notified}}. Please try reloading the page, it may have been a temporary glitch.", "our engineers have been notified": "our engineers have been notified", - "Report a Bug": "Report a Bug", - "Show Detail": "Show Detail", + "Show detail": "Show detail", "Current version": "Current version", "{{userName}} edited": "{{userName}} edited", "{{userName}} archived": "{{userName}} archived", @@ -457,7 +456,7 @@ "No groups left to add": "No groups left to add", "Add": "Add", "{{ userName }} was added to the collection": "{{ userName }} was added to the collection", - "Need to add someone who’s not yet on the team yet?": "Need to add someone who’s not yet on the team yet?", + "Need to add someone who’s not on the team yet?": "Need to add someone who’s not on the team yet?", "Invite people to {{ teamName }}": "Invite people to {{ teamName }}", "Search by name": "Search by name", "Search people": "Search people", @@ -481,7 +480,7 @@ "Workspace members can view and edit documents in the {{ collectionName }} collection by default.": "Workspace members can view and edit documents in the {{ collectionName }} collection by default.", "Workspace members can view documents in the {{ collectionName }} collection by\n default.": "Workspace members can view documents in the {{ collectionName }} collection by\n default.", "When enabled, documents can be shared publicly on the internet.": "When enabled, documents can be shared publicly on the internet.", - "Public sharing is currently disabled in the team security settings.": "Public sharing is currently disabled in the team security settings.", + "Public sharing is currently disabled in the workspace security settings.": "Public sharing is currently disabled in the workspace security settings.", "Additional access": "Additional access", "Add groups": "Add groups", "Add people": "Add people", @@ -602,7 +601,7 @@ "We were unable to load the document while offline.": "We were unable to load the document while offline.", "Your account has been suspended": "Your account has been suspended", "Warning Sign": "Warning Sign", - "A team admin ({{ suspendedContactEmail }}) has suspended your account. To re-activate your account, please reach out to them directly.": "A team admin ({{ suspendedContactEmail }}) has suspended your account. To re-activate your account, please reach out to them directly.", + "A workspace admin ({{ suspendedContactEmail }}) has suspended your account. To re-activate your account, please reach out to them directly.": "A workspace admin ({{ suspendedContactEmail }}) has suspended your account. To re-activate your account, please reach out to them directly.", "Are you sure about that? Deleting the {{groupName}} group will cause its members to lose access to collections and documents that it is associated with.": "Are you sure about that? Deleting the {{groupName}} group will cause its members to lose access to collections and documents that it is associated with.", "You can edit the name of this group at any time, however doing so too often might confuse your team mates.": "You can edit the name of this group at any time, however doing so too often might confuse your team mates.", "{{userName}} was added to the group": "{{userName}} was added to the group", @@ -857,7 +856,7 @@ "This could be your real name, or a nickname — however you’d like people to refer to you.": "This could be your real name, or a nickname — however you’d like people to refer to you.", "Are you sure you want to require invites?": "Are you sure you want to require invites?", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.", - "Settings that impact the access, security, and content of your knowledge base.": "Settings that impact the access, security, and content of your knowledge base.", + "Settings that impact the access, security, and content of your workspace.": "Settings that impact the access, security, and content of your workspace.", "Allow members to sign-in with {{ authProvider }}": "Allow members to sign-in with {{ authProvider }}", "Connected": "Connected", "Disabled": "Disabled", @@ -909,8 +908,8 @@ "Posting to the {{ channelName }} channel on": "Posting to the {{ channelName }} channel on", "These events should be posted to Slack": "These events should be posted to Slack", "Disconnect": "Disconnect", - "Whoops, you need to accept the permissions in Slack to connect {{appName}} to your team. Try again?": "Whoops, you need to accept the permissions in Slack to connect {{appName}} to your team. Try again?", - "Something went wrong while authenticating your request. Please try logging in again?": "Something went wrong while authenticating your request. Please try logging in again?", + "Whoops, you need to accept the permissions in Slack to connect {{appName}} to your workspace. Try again?": "Whoops, you need to accept the permissions in Slack to connect {{appName}} to your workspace. Try again?", + "Something went wrong while authenticating your request. Please try logging in again.": "Something went wrong while authenticating your request. Please try logging in again.", "Get rich previews of {{ appName }} links shared in Slack and use the {{ command }} slash command to search for documents without leaving your chat.": "Get rich previews of {{ appName }} links shared in Slack and use the {{ command }} slash command to search for documents without leaving your chat.", "Connect {{appName}} collections to Slack channels. Messages will be automatically posted to Slack when documents are published or updated.": "Connect {{appName}} collections to Slack channels. Messages will be automatically posted to Slack when documents are published or updated.", "Connect": "Connect",