fix(settings): translate new persona and delegate rights labels

refs: SHELL-125 (#311)
zextras · Aug 21, 2023 · 115ac44 · 115ac44
1 parent f0f95d4
commit 115ac44
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 9 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -25,7 +25,8 @@ module.exports = {
 				defaultContexts: [],
 				defaultNS: 'en',
 				jsonSpace: 4,
-				compatibilityJSON: 'v3'
+				compatibilityJSON: 'v3',
+				discardOldKeys: false
 			}
 		]
 	]

diff --git a/src/settings/accounts-settings.tsx b/src/settings/accounts-settings.tsx
@@ -357,12 +357,19 @@ export const AccountsSettings = (): JSX.Element => {
 					ace,
 					(accumulator: Array<DelegateType>, item, idx) => {
 						const index = findIndex(accumulator, { email: item.d });
+						const translatedRight = t('settings.account.delegates.right', {
+							context: item.right.toLowerCase(),
+							defaultValue: item.right
+						});
 						if (index === -1) {
-							accumulator.push({ email: item.d || '', right: item.right, id: idx.toString() });
+							accumulator.push({ email: item.d || '', right: translatedRight, id: idx.toString() });
 						} else {
 							accumulator.push({
 								email: item.d || '',
-								right: `${item.right} and ${accumulator[index].right}`,
+								right: t('settings.account.delegates.multiple_rights', {
+									defaultValue: `{{rights.0]}} and {{rights.1}}`,
+									rights: [translatedRight, accumulator[index].right]
+								}),
 								id: idx.toString()
 							});
 							accumulator.splice(index, 1);
@@ -374,7 +381,7 @@ export const AccountsSettings = (): JSX.Element => {
 				setDelegates(result);
 			}
 		});
-	}, []);
+	}, [t]);
 
 	const personaSettings = useMemo<JSX.Element | null>(() => {
 		const identity = identities[selectedIdentityId];

diff --git a/src/settings/components/account-settings/accounts-list.tsx b/src/settings/components/account-settings/accounts-list.tsx
@@ -18,6 +18,7 @@ import {
 	ListV2,
 	ListItem
 } from '@zextras/carbonio-design-system';
+import type { TFunction } from 'i18next';
 import { map } from 'lodash';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
@@ -31,11 +32,15 @@ const List = styled(ListV2)`
 
 function getNewPersonaNextIdentityName(
 	numberToCheck: number,
-	unavailableIdentityNames: Array<string>
+	unavailableIdentityNames: Array<string>,
+	t: TFunction
 ): string {
-	const newPersonaNextIdentityName = `New Persona ${numberToCheck}`;
+	const newPersonaNextIdentityName = t('settings.account.new_identity', {
+		defaultValue: `New Persona {{number}}`,
+		number: numberToCheck
+	});
 	if (unavailableIdentityNames.includes(newPersonaNextIdentityName)) {
-		return getNewPersonaNextIdentityName(numberToCheck + 1, unavailableIdentityNames);
+		return getNewPersonaNextIdentityName(numberToCheck + 1, unavailableIdentityNames, t);
 	}
 	return newPersonaNextIdentityName;
 }
@@ -69,7 +74,7 @@ const AccountsList = ({
 			[...identitiesDefault, ...identities],
 			(item) => item._attrs?.zimbraPrefIdentityName || ''
 		);
-		const newPersonaName = getNewPersonaNextIdentityName(1, unavailableIdentityNames);
+		const newPersonaName = getNewPersonaNextIdentityName(1, unavailableIdentityNames, t);
 
 		addIdentity(`${createListRequestIdRef.current}`, {
 			zimbraPrefIdentityName: newPersonaName,
@@ -80,12 +85,13 @@ const AccountsList = ({
 		});
 		createListRequestIdRef.current += 1;
 		setSelectedIdentityId(identities.length);
-	}, [identitiesDefault, identities, addIdentity, setSelectedIdentityId]);
+	}, [identitiesDefault, identities, addIdentity, setSelectedIdentityId, t]);
 
 	const onConfirmDelete = useCallback((): void => {
 		removeIdentity(identities[selectedIdentityId].id);
 		setSelectedIdentityId(selectedIdentityId - 1);
 	}, [identities, removeIdentity, selectedIdentityId, setSelectedIdentityId]);
+
 	const onDelete = useCallback((): void => {
 		const closeModal = createModal({
 			title: t('label.permanent_delete_title', 'Are you sure to permanently delete this Persona?'),

diff --git a/translations/en.json b/translations/en.json
@@ -198,6 +198,14 @@
         "unable_to_parse_query": "Unable to complete the search, clear it and retry"
     },
     "settings": {
+        "account": {
+            "delegates": {
+                "multiple_rights": "{{rights.0}} and {{rights.1}}",
+                "right_sendas": "SendAs",
+                "right_sendonbehalfof": "SendOnBehalfOf"
+            },
+            "new_identity": "New Persona {{number}}"
+        },
         "accounts": "Accounts",
         "app": "Settings",
         "appearance": {