Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Update all browser extension app translation key references and point to new core/i18n (#2434)
Leendert de Borstba2808a93dc4
diff --git a/apps/browser-extension/package-lock.json b/apps/browser-extension/package-lock.jsonindex 9a17d7b72..1d26d8ec9 100644--- a/apps/browser-extension/package-lock.json+++ b/apps/browser-extension/package-lock.json@@ -10,6 +10,7 @@"hasInstallScript": true,"dependencies": {"@aliasvault/client": "file:../../core/client",+ "@aliasvault/i18n": "file:../../core/i18n","@aliasvault/models": "file:../../core/models","@aliasvault/vault": "file:../../core/vault","@dnd-kit/core": "^6.3.1",@@ -84,6 +85,11 @@"vitest": "^5.0.1"}},+ "../../core/i18n": {+ "name": "@aliasvault/i18n",+ "version": "0.31.0",+ "license": "AGPL-3.0"+ },"../../core/models": {"name": "@aliasvault/models","version": "1.0.0",@@ -223,6 +229,10 @@"resolved": "../../core/client","link": true},+ "node_modules/@aliasvault/i18n": {+ "resolved": "../../core/i18n",+ "link": true+ },"node_modules/@aliasvault/models": {"resolved": "../../core/models","link": truediff --git a/apps/browser-extension/package.json b/apps/browser-extension/package.jsonindex feba66ccb..765c3097e 100644--- a/apps/browser-extension/package.json+++ b/apps/browser-extension/package.json@@ -32,6 +32,7 @@},"dependencies": {"@aliasvault/client": "file:../../core/client",+ "@aliasvault/i18n": "file:../../core/i18n","@aliasvault/models": "file:../../core/models","@aliasvault/vault": "file:../../core/vault","@dnd-kit/core": "^6.3.1",diff --git a/apps/browser-extension/src/entrypoints/background/ContextMenu.ts b/apps/browser-extension/src/entrypoints/background/ContextMenu.tsindex a9f718dfe..3e299473b 100644--- a/apps/browser-extension/src/entrypoints/background/ContextMenu.ts+++ b/apps/browser-extension/src/entrypoints/background/ContextMenu.ts@@ -145,7 +145,7 @@ export function handleContextMenuClick(info: Browser.contextMenus.OnClickData, tvoid (async (): Promise<void> => {const settings = await getPasswordSettingsOrDefault();const password = await RustCore.generatePassword(settings);- const message = await t('content.passwordCopiedToClipboard');+ const message = await t('items.toasts.passwordCopied');browser.scripting.executeScript({target: { tabId },func: copyPasswordToClipboard,diff --git a/apps/browser-extension/src/entrypoints/contentScript/Popup.ts b/apps/browser-extension/src/entrypoints/contentScript/Popup.tsindex b547fcd7b..98a0ebfe7 100644--- a/apps/browser-extension/src/entrypoints/contentScript/Popup.ts+++ b/apps/browser-extension/src/entrypoints/contentScript/Popup.ts@@ -256,7 +256,7 @@ export function openTotpPopup(input: HTMLInputElement, container: HTMLElement, f* Matches the styling of the regular autofill popup.*/async function createTotpPopup(input: HTMLInputElement, items: Item[] | undefined, rootContainer: HTMLElement, recentlySelected?: ItemRef | null) : Promise<void> {- const searchPlaceholder = await t('content.searchVault');+ const searchPlaceholder = await t('items.searchPlaceholder');const hideFor1HourText = await t('content.hideFor1Hour');const hidePermanentlyText = await t('content.hidePermanently');const noTotpItemsText = await t('content.noTotpItemsFound');@@ -842,7 +842,7 @@ export async function createAutofillPopup(input: HTMLInputElement, items: Item[]// Get all translations firstconst newText = await t('content.new');- const searchPlaceholder = await t('content.searchVault');+ const searchPlaceholder = await t('items.searchPlaceholder');const hideFor1HourText = await t('content.hideFor1Hour');const hidePermanentlyText = await t('content.hidePermanently');const noMatchesText = await t('content.noMatchesFound');diff --git a/apps/browser-extension/src/entrypoints/popup/App.tsx b/apps/browser-extension/src/entrypoints/popup/App.tsxindex 7693ef4c3..2254a5287 100644--- a/apps/browser-extension/src/entrypoints/popup/App.tsx+++ b/apps/browser-extension/src/entrypoints/popup/App.tsx@@ -197,9 +197,9 @@ const App: React.FC = () => {{ path: '/auth-settings', element: <AuthSettings />, showBackButton: true, title: t('common.settings') },{ path: '/items', element: <ItemsList />, showBackButton: false },{ path: '/items/folder/:manifestId/:folderId', element: <ItemsList />, showBackButton: true },- { path: '/items/select-type', element: <ItemTypeSelector />, showBackButton: true, title: t('itemTypes.selectType') },+ { path: '/items/select-type', element: <ItemTypeSelector />, showBackButton: true, title: t('items.addNewItem') },{ path: '/items/add', element: <ItemAddEdit />, showBackButton: true },- { path: '/items/deleted', element: <RecentlyDeleted />, showBackButton: true, title: t('recentlyDeleted.title') },+ { path: '/items/deleted', element: <RecentlyDeleted />, showBackButton: true, title: t('items.recentlyDeleted.title') },{ path: '/items/:manifestId/:id/edit', element: <ItemAddEdit />, showBackButton: true },{ path: '/items/:manifestId/:id', element: <ItemDetails />, showBackButton: true },{ path: '/passkeys/create', element: <PasskeyCreate />, layout: LayoutType.PASSKEY },diff --git a/apps/browser-extension/src/entrypoints/popup/components/Dialogs/HelpModal.tsx b/apps/browser-extension/src/entrypoints/popup/components/Dialogs/HelpModal.tsxindex a4fb86071..c2eb80c38 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Dialogs/HelpModal.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Dialogs/HelpModal.tsx@@ -1,4 +1,5 @@import React, { useState } from 'react';+import { useTranslation } from 'react-i18next';import ModalWrapper from '@/entrypoints/popup/components/Dialogs/ModalWrapper';@@ -13,6 +14,7 @@ type HelpModalProps = {* Shows a modal popup with help information when clicked.*/const HelpModal: React.FC<HelpModalProps> = ({ title, content, className = '' }) => {+ const { t } = useTranslation();const [showModal, setShowModal] = useState(false);return (@@ -21,7 +23,7 @@ const HelpModal: React.FC<HelpModalProps> = ({ title, content, className = '' })onClick={() => setShowModal(true)}className={`${className}`}type="button"- aria-label="Help"+ aria-label={t('common.help')}><svgclassName="w-4 h-4 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-help"diff --git a/apps/browser-extension/src/entrypoints/popup/components/Dialogs/MobileUnlockModal.tsx b/apps/browser-extension/src/entrypoints/popup/components/Dialogs/MobileUnlockModal.tsxindex bfd826760..5917cf5e4 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Dialogs/MobileUnlockModal.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Dialogs/MobileUnlockModal.tsx@@ -198,7 +198,7 @@ const MobileUnlockModal: React.FC<IMobileUnlockModalProps> = ({{qrCodeUrl && (<div className="flex flex-col items-center w-full max-w-[300px] mx-auto">- <img src={qrCodeUrl} alt="QR Code" className="w-full border-4 border-gray-200 dark:border-gray-600 rounded mb-3" />+ <img src={qrCodeUrl} alt={t('common.qrCode')} className="w-full border-4 border-gray-200 dark:border-gray-600 rounded mb-3" />{verificationCode && (<div className="w-full flex items-center gap-3 p-3 rounded-lg border border-gray-200 dark:border-gray-600 bg-gray-50 dark:bg-gray-700/50"><div className="flex-shrink-0 flex items-center justify-center w-14 h-14 rounded-full border-2 border-primary-500 bg-white dark:bg-gray-800 text-2xl font-bold text-gray-900 dark:text-white">diff --git a/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx b/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsxindex 44d93cdcf..e177603c1 100644--- a/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx@@ -200,7 +200,7 @@ export const EmailPreview: React.FC<EmailPreviewProps> = ({ email }) => {}markPollFailed(`The server rejected the mailbox request: ${apiErrorResponse?.code ?? 'unknown'}`);- setError(t('emails.apiErrors.' + apiErrorResponse?.code));+ setError(t('apiErrors.' + apiErrorResponse?.code, { defaultValue: t('common.errors.unknownErrorTryAgain') }));return;}} catch (err) {diff --git a/apps/browser-extension/src/entrypoints/popup/components/Folders/DeleteFolderModal.tsx b/apps/browser-extension/src/entrypoints/popup/components/Folders/DeleteFolderModal.tsxindex 4674755a4..07367f307 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Folders/DeleteFolderModal.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Folders/DeleteFolderModal.tsx@@ -69,7 +69,7 @@ const DeleteFolderModal: React.FC<DeleteFolderModalProps> = ({<ModalWrapperisOpen={isOpen}onClose={handleClose}- title={t('items.deleteFolder')}+ title={t('items.folders.deleteFolder')}footer={<div className="flex justify-end"><button@@ -102,10 +102,10 @@ const DeleteFolderModal: React.FC<DeleteFolderModalProps> = ({</div><div><p className="font-medium text-gray-900 dark:text-white">- {t('items.deleteFolderKeepItems')}+ {t('items.folders.deleteFolderKeepItems')}</p><p className="text-sm text-gray-500 dark:text-gray-400">- {t('items.deleteFolderKeepItemsDescription')}+ {t('items.folders.deleteFolderKeepItemsDescription')}</p></div></div>@@ -128,10 +128,10 @@ const DeleteFolderModal: React.FC<DeleteFolderModalProps> = ({</div><div><p className="font-medium text-red-600 dark:text-red-400">- {t('items.deleteFolderAndItems')}+ {t('items.folders.deleteFolderAndItems')}</p><p className="text-sm text-gray-500 dark:text-gray-400">- {t('items.deleteFolderAndItemsDescription', { count: itemCount })}+ {t('items.folders.deleteFolderAndItemsDescription', { count: itemCount })}</p></div></div>diff --git a/apps/browser-extension/src/entrypoints/popup/components/Folders/FolderModal.tsx b/apps/browser-extension/src/entrypoints/popup/components/Folders/FolderModal.tsxindex 90fb29e78..1398b4be0 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Folders/FolderModal.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Folders/FolderModal.tsx@@ -44,7 +44,7 @@ const FolderModal: React.FC<FolderModalProps> = ({const trimmedName = folderName.trim();if (!trimmedName) {- setError(t('items.folderNameRequired'));+ setError(t('items.folders.folderNameRequired'));return;}@@ -70,7 +70,7 @@ const FolderModal: React.FC<FolderModalProps> = ({<ModalWrapperisOpen={isOpen}onClose={onClose}- title={mode === 'create' ? t('items.createFolder') : t('items.editFolder')}+ title={mode === 'create' ? t('items.folders.createFolder') : t('items.folders.editFolder')}footer={<div className="flex justify-end gap-3"><button@@ -102,7 +102,7 @@ const FolderModal: React.FC<FolderModalProps> = ({htmlFor="folderName"className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">- {t('items.folderName')}+ {t('items.folders.folderName')}</label><inputid="folderName"diff --git a/apps/browser-extension/src/entrypoints/popup/components/Forms/CustomFieldModal.tsx b/apps/browser-extension/src/entrypoints/popup/components/Forms/CustomFieldModal.tsxindex 4397eda00..db901dcf4 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Forms/CustomFieldModal.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Forms/CustomFieldModal.tsx@@ -112,7 +112,7 @@ const CustomFieldModal: React.FC<CustomFieldModalProps> = ({><option value={FieldTypes.Text}>{t('itemTypes.fieldTypes.text')}</option><option value={FieldTypes.Password}>{t('itemTypes.fieldTypes.password')}</option>- <option value={FieldTypes.Hidden}>{t('itemTypes.fieldTypes.hidden')}</option>+ <option value={FieldTypes.Hidden}>{t('itemTypes.fieldTypes.hiddenMasked')}</option><option value={FieldTypes.TextArea}>{t('itemTypes.fieldTypes.textArea')}</option><option value={FieldTypes.URL}>{t('itemTypes.fieldTypes.url')}</option><option value={FieldTypes.Email}>{t('itemTypes.fieldTypes.email')}</option>diff --git a/apps/browser-extension/src/entrypoints/popup/components/Forms/FormInputCopyToClipboard.tsx b/apps/browser-extension/src/entrypoints/popup/components/Forms/FormInputCopyToClipboard.tsxindex 6b693b30f..0ff54c17f 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Forms/FormInputCopyToClipboard.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Forms/FormInputCopyToClipboard.tsx@@ -152,7 +152,7 @@ export const FormInputCopyToClipboard: React.FC<FormInputCopyToClipboardProps> =<buttontype="button"className="p-1 text-green-500 dark:text-green-400 transition-colors duration-200"- title={t('common.copied')}+ title={t('common.copiedShort')}><svg className="w-4 h-4" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><Icon name="check" />diff --git a/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordConfigForm.tsx b/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordConfigForm.tsxindex 4130344bf..72f88731a 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordConfigForm.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordConfigForm.tsx@@ -1,5 +1,6 @@import { sliderToLength, lengthToSlider, SLIDER_MIN, SLIDER_MAX } from '@aliasvault/client/utilities/PasswordLengthSlider';-import { MIN_WORD_COUNT, MAX_WORD_COUNT, DEFAULT_WORD_COUNT, getLanguageInfo, resolveDefaultLanguage } from '@aliasvault/models/defaults';+import { getLanguageInfo, resolveDefaultLanguage } from '@aliasvault/i18n/languages';+import { MIN_WORD_COUNT, MAX_WORD_COUNT, DEFAULT_WORD_COUNT } from '@aliasvault/models/defaults';import React from 'react';import { useTranslation } from 'react-i18next';@@ -131,7 +132,7 @@ const PasswordConfigForm: React.FC<IPasswordConfigFormProps> = ({: 'border-transparent text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200'}`}>- {mode === 'basic' ? t('items.passwordTypeBasic') : t('items.passwordTypeDiceware')}+ {mode === 'basic' ? t('common.password') : t('items.passwordTypeDiceware')}</button>);})}@@ -195,7 +196,7 @@ const PasswordConfigForm: React.FC<IPasswordConfigFormProps> = ({? 'bg-primary-600 text-white hover:bg-primary-700': 'bg-gray-200 text-gray-700 hover:bg-gray-300 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600'}`}- title={t('items.includeLowercase')}+ title={t('items.includeLowercaseLetters')}><span className="font-mono text-base">a-z</span></button>@@ -209,7 +210,7 @@ const PasswordConfigForm: React.FC<IPasswordConfigFormProps> = ({? 'bg-primary-600 text-white hover:bg-primary-700': 'bg-gray-200 text-gray-700 hover:bg-gray-300 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600'}`}- title={t('items.includeUppercase')}+ title={t('items.includeUppercaseLetters')}><span className="font-mono text-base">A-Z</span></button>@@ -223,7 +224,7 @@ const PasswordConfigForm: React.FC<IPasswordConfigFormProps> = ({? 'bg-primary-600 text-white hover:bg-primary-700': 'bg-gray-200 text-gray-700 hover:bg-gray-300 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600'}`}- title={t('items.includeNumbers')}+ title={t('items.includeDigits')}><span className="font-mono text-base">0-9</span></button>@@ -237,7 +238,7 @@ const PasswordConfigForm: React.FC<IPasswordConfigFormProps> = ({? 'bg-primary-600 text-white hover:bg-primary-700': 'bg-gray-200 text-gray-700 hover:bg-gray-300 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600'}`}- title={t('items.includeSpecialChars')}+ title={t('items.includeSpecialCharacters')}><span className="font-mono text-base">!@#</span></button>@@ -253,7 +254,7 @@ const PasswordConfigForm: React.FC<IPasswordConfigFormProps> = ({className="h-4 w-4 text-primary-600 focus:ring-primary-500 border-gray-300 rounded dark:bg-gray-700 dark:border-gray-600"/><label htmlFor="use-non-ambiguous" className="ml-2 text-sm text-gray-700 dark:text-gray-300">- {t('items.avoidAmbiguousChars')}+ {t('items.avoidAmbiguousCharacters')}</label></div></div>diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/TotpBlock.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/TotpBlock.tsxindex 94a68af56..f3272aaa6 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/TotpBlock.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/TotpBlock.tsx@@ -156,7 +156,7 @@ const TotpBlock: React.FC<TotpBlockProps> = ({ itemId, manifestId }) => {</span><div className="text-xs">{copiedId === totpCode.Id ? (- <span className="text-green-600 dark:text-green-400">{t('common.copied')}</span>+ <span className="text-green-600 dark:text-green-400">{t('common.copiedShort')}</span>) : (<span className="text-gray-500 dark:text-gray-400">{getTotpRemainingSeconds(totpCode)}s</span>)}diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/TotpEditor.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/TotpEditor.tsxindex d7dd64dba..683aab2d6 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/TotpEditor.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/TotpEditor.tsx@@ -148,7 +148,7 @@ const TotpEditor: React.FC<TotpEditorProps> = ({// Validate required fieldsif (!formData.secretKey) {- setFormError(t('items.validation.required'));+ setFormError(t('validation.required'));return;}@@ -534,7 +534,7 @@ const TotpEditor: React.FC<TotpEditorProps> = ({{showQrCode && qrCodeDataUrl && (<div className="flex justify-center mt-3"><div className="bg-white border-2 border-white rounded-lg">- <img src={qrCodeDataUrl} alt="TOTP QR Code" className="w-64 h-64" />+ <img src={qrCodeDataUrl} alt={t('common.qrCode')} className="w-64 h-64" /></div></div>)}diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemCard.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemCard.tsxindex da694c665..a3fb8096c 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemCard.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemCard.tsx@@ -178,7 +178,7 @@ const ItemCard: React.FC<ItemCardProps> = ({ item, showFolderPath = false, searcstrokeWidth="2"strokeLinecap="round"strokeLinejoin="round"- aria-label="Has passkey"+ aria-label={t('items.hasPasskey')}><path d="M21 2l-2 2m-7.61 7.61a5.5 5.5 0 1 1-7.778 7.778 5.5 5.5 0 0 1 7.777-7.777zm0 0L15.5 7.5m0 0l3 3L22 7l-3-3m-3.5 3.5L19 4" /></svg>@@ -192,7 +192,7 @@ const ItemCard: React.FC<ItemCardProps> = ({ item, showFolderPath = false, searcstrokeWidth="2"strokeLinecap="round"strokeLinejoin="round"- aria-label="Has attachments"+ aria-label={t('items.hasAttachments')}><path d="M21.44 11.05l-9.19 9.19a6 6 0 0 1-8.49-8.49l9.19-9.19a4 4 0 0 1 5.66 5.66l-9.2 9.19a2 2 0 0 1-2.83-2.83l8.49-8.48" /></svg>@@ -202,7 +202,7 @@ const ItemCard: React.FC<ItemCardProps> = ({ item, showFolderPath = false, searcclassName="w-3.5 h-3.5 text-gray-500 dark:text-gray-400"viewBox="0 -960 960 960"fill="currentColor"- aria-label="Has 2FA"+ aria-label={t('items.hasTotp')}><path d="M160-160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h640q33 0 56.5 23.5T880-720v480q0 33-23.5 56.5T800-160H160Zm100-200h46v-240h-36l-70 50 24 36 36-26v180Zm124 0h156v-40h-94l-2-2q21-20 34.5-34t21.5-22q18-18 27-36t9-38q0-29-22-48.5T458-600q-26 0-47 15t-29 39l40 16q5-13 14.5-20.5T458-558q15 0 24.5 8t9.5 20q0 11-4 20.5T470-486l-32 32-54 54v40Zm296 0q36 0 58-20t22-52q0-18-10-32t-28-22v-2q14-8 22-20.5t8-29.5q0-27-21-44.5T678-600q-25 0-46.5 14.5T604-550l40 16q4-12 13-19t21-7q13 0 21.5 7.5T708-534q0 14-10 22t-26 8h-18v40h20q20 0 31 8t11 22q0 13-11 22.5t-25 9.5q-17 0-26-7.5T638-436l-40 16q7 29 28.5 44.5T680-360ZM160-240h640v-480H160v480Zm0 0v-480 480Z"/></svg>@@ -214,7 +214,7 @@ const ItemCard: React.FC<ItemCardProps> = ({ item, showFolderPath = false, searc{menuEnabled && (<buttononClick={handleEllipsisClick}- aria-label={t('items.itemOptions')}+ aria-label={t('items.contextMenu.title')}aria-haspopup="menu"className={`absolute right-2 top-1/2 -translate-y-1/2 px-1 py-1 rounded text-gray-400 transition-opacity ${isActive || menuPosition ? 'opacity-100' : 'opacity-0'diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemFilterDropdown.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemFilterDropdown.tsxindex 86693b9c2..db20c3815 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemFilterDropdown.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemFilterDropdown.tsx@@ -121,7 +121,7 @@ const ItemFilterDropdown: React.FC<ItemFilterDropdownProps> = ({}}className="absolute right-2 top-1/2 -translate-y-1/2 flex items-center gap-1.5 px-2 py-1 text-xs text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300 rounded hover:bg-gray-200 dark:hover:bg-gray-600">- <span>{t('items.filters.folders')}</span>+ <span>{t('items.filters.showFolders')}</span><svgclassName={`w-5 h-5 ${showFolders ? 'text-orange-500 dark:text-orange-400' : 'text-gray-400 dark:text-gray-500'}`}viewBox="0 0 24 24"@@ -177,7 +177,7 @@ const ItemFilterDropdown: React.FC<ItemFilterDropdownProps> = ({onClick={handleSelectRecentlyDeleted}className={`${itemRowClass(activeFilter === 'deleted')} flex items-center justify-between`}>- <span>{t('recentlyDeleted.title')}</span>+ <span>{t('items.recentlyDeleted.title')}</span>{recentlyDeletedCount > 0 && (<span className={activeFilter === 'deleted' ? 'text-orange-500 dark:text-orange-400' : 'text-gray-400 dark:text-gray-500'}>{recentlyDeletedCount}diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemNameInput.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemNameInput.tsxindex c1fc9c4f3..c42c7433c 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemNameInput.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemNameInput.tsx@@ -243,7 +243,7 @@ const ItemNameInput: React.FC<ItemNameInputProps> = ({</div>{/* Folder Selection Modal */}- <ModalWrapper isOpen={showFolderModal} onClose={handleCloseFolderModal} title={t('items.folder')} maxWidth="max-w-sm">+ <ModalWrapper isOpen={showFolderModal} onClose={handleCloseFolderModal} title={t('items.folders.folder')} maxWidth="max-w-sm">{/* Folder Options - Tree View */}<div className="space-y-1 max-h-64 overflow-y-auto">{/* No Folder Option */}diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemTypeSelector.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemTypeSelector.tsxindex 3a8c0269c..ae0ff0c0f 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemTypeSelector.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemTypeSelector.tsx@@ -46,7 +46,7 @@ const ITEM_TYPE_OPTIONS: ItemTypeOption[] = [},{type: ItemTypes.Note,- titleKey: 'itemTypes.note.title',+ titleKey: 'itemTypes.secureNote',iconSvg: (<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z" />diff --git a/apps/browser-extension/src/entrypoints/popup/components/LanguageSwitcher.tsx b/apps/browser-extension/src/entrypoints/popup/components/LanguageSwitcher.tsxindex 36c9cf02c..f9405e0a9 100644--- a/apps/browser-extension/src/entrypoints/popup/components/LanguageSwitcher.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/LanguageSwitcher.tsx@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next';import { StorageKeys } from '@/utils/constants/storageKeys';import { AVAILABLE_LANGUAGES, getLanguageConfig, type ILanguageConfig } from '../../../i18n/config';+import { ensureLanguageLoaded } from '../../../i18n/i18n';import { storage } from '#imports';@@ -50,6 +51,7 @@ const LanguageSwitcher: React.FC<LanguageSwitcherProps> = ({* @param lng - Language code to switch to*/const changeLanguage = async (lng: string): Promise<void> => {+ await ensureLanguageLoaded(lng);await i18n.changeLanguage(lng);await storage.setItem(StorageKeys.LANGUAGE, lng);diff --git a/apps/browser-extension/src/entrypoints/popup/components/Layout/BottomNav.tsx b/apps/browser-extension/src/entrypoints/popup/components/Layout/BottomNav.tsxindex 824ee6ae4..11366042c 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Layout/BottomNav.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Layout/BottomNav.tsx@@ -69,7 +69,7 @@ const BottomNav: React.FC = () => {<svg className="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M15 7a2 2 0 012 2m4 0a6 6 0 01-7.743 5.743L11 17H9v2H7v2H4a1 1 0 01-1-1v-2.586a1 1 0 01.293-.707l5.964-5.964A6 6 0 1121 9z" /></svg>- <span className="text-sm mt-1">{t('menu.vault')}</span>+ <span className="text-sm mt-1">{t('navigation.vault')}</span></button><buttononClick={() => handleTabChange('emails')}@@ -81,7 +81,7 @@ const BottomNav: React.FC = () => {<svg className="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" /></svg>- <span className="text-sm mt-1">{t('menu.emails')}</span>+ <span className="text-sm mt-1">{t('emails.title')}</span></button><buttononClick={() => handleTabChange('settings')}diff --git a/apps/browser-extension/src/entrypoints/popup/components/Layout/DefaultLayout.tsx b/apps/browser-extension/src/entrypoints/popup/components/Layout/DefaultLayout.tsxindex cc276f9d0..6fafaa3b8 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Layout/DefaultLayout.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Layout/DefaultLayout.tsx@@ -86,9 +86,9 @@ const DefaultLayout: React.FC<DefaultLayoutProps> = ({ routes, headerButtons, meisOpen={syncError !== null}onClose={clearSyncError}onConfirm={clearSyncError}- title={t('sync.syncErrorTitle')}+ title={t('sync.syncFailed')}message={syncError ?? ''}- confirmText={t('sync.syncErrorDismiss')}+ confirmText={t('common.dismiss')}variant="danger"/></div>diff --git a/apps/browser-extension/src/entrypoints/popup/components/Layout/ServerSyncIndicator.tsx b/apps/browser-extension/src/entrypoints/popup/components/Layout/ServerSyncIndicator.tsxindex 8e5ceb859..6f39644af 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Layout/ServerSyncIndicator.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Layout/ServerSyncIndicator.tsx@@ -199,7 +199,7 @@ const ServerSyncIndicator: React.FC = () => {return (<divclassName="flex items-center gap-1.5 mx-2 px-2 py-1 bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-400 rounded-md text-xs font-medium"- title={t('common.syncingVault')}+ title={t('vault.syncingVault')}><svg className="w-3.5 h-3.5 animate-spin" fill="none" stroke="currentColor" viewBox="0 0 24 24"><pathdiff --git a/apps/browser-extension/src/entrypoints/popup/components/ReloadButton.tsx b/apps/browser-extension/src/entrypoints/popup/components/ReloadButton.tsxindex ae7192a35..80756cfed 100644--- a/apps/browser-extension/src/entrypoints/popup/components/ReloadButton.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/ReloadButton.tsx@@ -1,4 +1,5 @@import React from 'react';+import { useTranslation } from 'react-i18next';/*** Reload button props.@@ -11,6 +12,7 @@ type ReloadButtonProps = {* Reload button component.*/const ReloadButton: React.FC<ReloadButtonProps> = ({ onClick }) => {+ const { t } = useTranslation();return (<divclassName="px-2 items-center"@@ -26,7 +28,7 @@ const ReloadButton: React.FC<ReloadButtonProps> = ({ onClick }) => {<path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill" /></svg></div>- <span className="sr-only">Loading...</span>+ <span className="sr-only">{t('common.loading')}</span></div>);};diff --git a/apps/browser-extension/src/entrypoints/popup/components/VaultErrorReport.tsx b/apps/browser-extension/src/entrypoints/popup/components/VaultErrorReport.tsxindex 2e3c5cce1..0d150428d 100644--- a/apps/browser-extension/src/entrypoints/popup/components/VaultErrorReport.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/VaultErrorReport.tsx@@ -94,7 +94,7 @@ const VaultErrorReport: React.FC<VaultErrorReportProps> = ({ error }) => {</>)}</svg>- {copied ? t('common.copied') : t('common.copyToClipboard')}+ {copied ? t('common.copiedShort') : t('common.copyToClipboard')}</button></>)}diff --git a/apps/browser-extension/src/entrypoints/popup/hooks/useVaultSync.ts b/apps/browser-extension/src/entrypoints/popup/hooks/useVaultSync.tsindex 1c95eb182..01e0ace57 100644--- a/apps/browser-extension/src/entrypoints/popup/hooks/useVaultSync.ts+++ b/apps/browser-extension/src/entrypoints/popup/hooks/useVaultSync.ts@@ -49,7 +49,7 @@ export const useVaultSync = (): { syncVault: (options?: VaultSyncOptions) => Proreturn false;}- onStatus?.(t('common.checkingVaultUpdates'));+ onStatus?.(t('vault.checkingForVaultUpdates'));/** Delegate to the background script for the full sync orchestration.@@ -98,7 +98,7 @@ export const useVaultSync = (): { syncVault: (options?: VaultSyncOptions) => Pro// If we got a new vault, reload database into memoryif (result.hasNewVault) {- onStatus?.(t('common.syncingUpdatedVault'));+ onStatus?.(t('vault.syncingUpdatedVault'));await dbContext.loadStoredDatabase();}diff --git a/apps/browser-extension/src/entrypoints/popup/pages/auth/AuthSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/auth/AuthSettings.tsxindex 35bd0ebf3..dd39cfee8 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/auth/AuthSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/auth/AuthSettings.tsx@@ -334,7 +334,7 @@ const AuthSettings: React.FC = () => {<div className="space-y-4 pb-6"><div><h2 className="text-lg font-semibold text-gray-900 dark:text-white mb-1">- {t('settings.languageSettings', 'Language')}+ {t('settings.language', 'Language')}</h2></div>diff --git a/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsx b/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsxindex 61fcc431a..cd7bfa917 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsx@@ -226,7 +226,7 @@ const Login: React.FC = () => {<><HeaderButtononClick={() => PopoutUtility.openInNewPopup()}- title="Open in new window"+ title={t('common.openInNewWindow')}iconType={HeaderIconType.EXPAND}/></>@@ -237,7 +237,7 @@ const Login: React.FC = () => {return () => {setHeaderButtons(null);};- }, [setHeaderButtons]);+ }, [setHeaderButtons, t]);/** Cross-window login sync: reload when another window unlocks/logs in.@@ -440,7 +440,7 @@ const Login: React.FC = () => {type="text"value={twoFactorCode}onChange={(e) => setTwoFactorCode(e.target.value)}- placeholder={t('auth.authCodePlaceholder')}+ placeholder={t('auth.enterAuthCode')}required/></div>@@ -471,7 +471,7 @@ const Login: React.FC = () => {</Button></div><p className="text-xs text-gray-500 dark:text-gray-400 mt-4 text-center">- {t('auth.twoFactorNote')}+ {t('auth.authCodeNote')}</p></form></div>@@ -550,7 +550,7 @@ const Login: React.FC = () => {<Button type="submit"><div className="flex items-center justify-center gap-2">- {t('auth.loginButton')}+ {t('auth.login')}</div></Button>@@ -567,14 +567,14 @@ const Login: React.FC = () => {</button><div className="text-center text-sm text-gray-500 dark:text-gray-400 mt-6">- {t('auth.noAccount')}{' '}+ {t('auth.noAccountYet')}{' '}<ahref={clientUrl ?? ''}target="_blank"rel="noopener noreferrer"className="text-orange-500 hover:text-orange-600 dark:text-orange-400 dark:hover:text-orange-500">- {t('auth.createVault')}+ {t('auth.createNewVault')}</a></div></form>diff --git a/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx b/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsxindex c053755f2..7e0eacb11 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx@@ -562,7 +562,7 @@ const Unlock: React.FC = () => {try {// Check if the approval belongs to the same account as the current session.if (authContext.username && result.username.toLowerCase() !== authContext.username.toLowerCase()) {- setError(t('common.apiErrors.USERNAME_MISMATCH'));+ setError(t('apiErrors.USERNAME_MISMATCH'));return;}@@ -724,7 +724,7 @@ const Unlock: React.FC = () => {onChange={(e) => handlePinChange(e.target.value.replace(/\D/g, ''))}className="w-0 h-0 opacity-0 absolute"autoFocus- aria-label="PIN input"+ aria-label={t('auth.pinInput')}/>{/* On-Screen Numpad */}@@ -755,7 +755,7 @@ const Unlock: React.FC = () => {type="button"onClick={handleBackspace}className="h-12 flex items-center justify-center bg-gray-100 hover:bg-gray-200 dark:bg-gray-700 dark:hover:bg-gray-600 text-gray-900 dark:text-white rounded-lg transition-colors active:scale-95"- aria-label="Backspace"+ aria-label={t('common.backspace')}><svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M12 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2M3 12l6.414 6.414a2 2 0 001.414.586H19a2 2 0 002-2V7a2 2 0 00-2-2h-8.172a2 2 0 00-1.414.586L3 12z" />diff --git a/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailDetails.tsx b/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailDetails.tsxindex 19a12da60..d37815430 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailDetails.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailDetails.tsx@@ -205,12 +205,12 @@ const EmailDetails: React.FC = (): React.ReactElement => {const handleDownloadParsedAttachment = async (attachment: ParsedEmailAttachment, index: number): Promise<void> => {try {if (!sourceBytes) {- setError('Email source not available');+ setError(t('common.errors.unknownError'));return;}if (!dbContext?.sqliteClient || !email) {- setError('Database context or email not available');+ setError(t('common.errors.unknownError'));return;}@@ -248,7 +248,7 @@ const EmailDetails: React.FC = (): React.ReactElement => {)}<HeaderButtononClick={() => setShowDeleteModal(true)}- title={t('emails.deleteEmailTitle')}+ title={t('emails.deleteEmail')}iconType={HeaderIconType.DELETE}variant="danger"/>@@ -289,7 +289,7 @@ const EmailDetails: React.FC = (): React.ReactElement => {setShowDeleteModal(false);void handleDelete();}}- title={t('emails.deleteEmailTitle')}+ title={t('emails.deleteEmail')}message={t('emails.deleteEmailConfirm')}confirmText={t('common.delete')}cancelText={t('common.cancel')}@@ -338,9 +338,9 @@ const EmailDetails: React.FC = (): React.ReactElement => {</div>{showMetadata && (<div className="space-y-1 text-sm text-gray-600 dark:text-gray-400 mt-2">- <p><span className="font-bold">{t('emails.from')}</span> <span title={email.fromLocal + "@" + email.fromDomain}>{email.fromDisplay}</span></p>- <p><span className="font-bold">{t('emails.to')}</span> <span title={email.toLocal + "@" + email.toDomain}>{email.toLocal}@{email.toDomain}</span></p>- <p><span className="font-bold">{t('emails.date')}</span> {new Date(email.dateSystem).toLocaleString()}</p>+ <p><span className="font-bold">{t('emails.fromColumn')}</span> <span title={email.fromLocal + "@" + email.fromDomain}>{email.fromDisplay}</span></p>+ <p><span className="font-bold">{t('emails.toColumn')}</span> <span title={email.toLocal + "@" + email.toDomain}>{email.toLocal}@{email.toDomain}</span></p>+ <p><span className="font-bold">{t('emails.dateColumn')}</span> {new Date(email.dateSystem).toLocaleString()}</p>{credential && (<p><span className="font-bold">{t('emails.item')}</span>{' '}diff --git a/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailsList.tsx b/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailsList.tsxindex bb45bd4f7..c7a54ce8d 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailsList.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailsList.tsx@@ -179,26 +179,26 @@ const EmailsList: React.FC = () => {const secondsAgo = Math.floor((now.getTime() - emailDate.getTime()) / 1000);if (secondsAgo < 60) {- return t('emails.dateFormat.justNow');+ return t('emails.time.justNow');} else if (secondsAgo < 3600) {// Less than 1 hour agoconst minutes = Math.floor(secondsAgo / 60);if (minutes === 1) {- return t('emails.dateFormat.minutesAgo_single', { count: minutes });+ return t('emails.time.minutesAgo_single', { count: minutes });} else {- return t('emails.dateFormat.minutesAgo_plural', { count: minutes });+ return t('emails.time.minutesAgo_plural', { count: minutes });}} else if (secondsAgo < 86400) {// Less than 24 hours agoconst hours = Math.floor(secondsAgo / 3600);if (hours === 1) {- return t('emails.dateFormat.hoursAgo_single', { count: hours });+ return t('emails.time.hoursAgo_single', { count: hours });} else {- return t('emails.dateFormat.hoursAgo_plural', { count: hours });+ return t('emails.time.hoursAgo_plural', { count: hours });}} else if (secondsAgo < 172800) {// Less than 48 hours ago- return t('emails.dateFormat.yesterday');+ return t('emails.time.yesterday');} else {// Older than 48 hoursreturn emailDate.toLocaleDateString('en-GB', {@@ -245,7 +245,7 @@ const EmailsList: React.FC = () => {</div><div className="text-gray-500 dark:text-gray-400 space-y-2"><p className="text-sm">- {t('emails.noEmailsDescription')}+ {t('emails.emptyMessage')}</p></div></div>diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsxindex 718b59acf..572a1873b 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx@@ -1121,7 +1121,7 @@ const ItemAddEdit: React.FC = () => {{isEditMode && (<HeaderButtononClick={() => setShowDeleteModal(true)}- title={t('items.deleteItemTitle')}+ title={t('items.deleteItem')}iconType={HeaderIconType.DELETE}variant="danger"disabled={isSaving}@@ -1610,8 +1610,8 @@ const ItemAddEdit: React.FC = () => {<ModalisOpen={showDeleteModal}onClose={() => setShowDeleteModal(false)}- title={t('items.deleteItemTitle')}- message={t('items.deleteItemConfirm')}+ title={t('items.deleteItem')}+ message={t('common.deleteItemConfirmDescription')}confirmText={t('common.delete')}cancelText={t('common.cancel')}onConfirm={handleDelete}diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemTypeSelector.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemTypeSelector.tsxindex 689da7edf..0fd8059f5 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemTypeSelector.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemTypeSelector.tsx@@ -49,7 +49,7 @@ const ITEM_TYPE_OPTIONS: ItemTypeOption[] = [},{type: 'Note',- titleKey: 'itemTypes.note.title',+ titleKey: 'itemTypes.secureNote',iconSvg: (<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z" />diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsxindex 992e959ce..d650036cc 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx@@ -898,7 +898,7 @@ const ItemsList: React.FC = () => {<div className="flex items-center gap-1 shrink-0"><buttononClick={() => setShowEditFolderModal(true)}- title={t('items.editFolder')}+ title={t('items.folders.editFolder')}className="p-1.5 text-gray-400 hover:text-orange-500 dark:text-gray-500 dark:hover:text-orange-400 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors"><svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">@@ -907,7 +907,7 @@ const ItemsList: React.FC = () => {</button><buttononClick={() => setShowDeleteFolderModal(true)}- title={t('items.deleteFolder')}+ title={t('items.folders.deleteFolder')}className="p-1.5 text-gray-400 hover:text-red-500 dark:text-gray-500 dark:hover:text-red-400 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors"><svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">@@ -983,7 +983,7 @@ const ItemsList: React.FC = () => {type="text"value={searchTerm}onChange={(e) => setSearchTerm(e.target.value)}- placeholder={`${t('content.searchVault')}`}+ placeholder={`${t('items.searchPlaceholder')}`}autoFocusrole="combobox"aria-controls="items-list"@@ -1098,7 +1098,7 @@ const ItemsList: React.FC = () => {</div>)}<div className="text-gray-500 dark:text-gray-400 text-sm">- <p>{t('items.allItemsInFolders')}</p>+ <p>{t('items.allItemsInFoldersClick')}</p></div></>) : (@@ -1140,7 +1140,7 @@ const ItemsList: React.FC = () => {* Only show text when there are no folders yet* if there are folders we hide the text to save on UI space*/- <span>{t('items.newFolder')}</span>+ <span>{t('items.folders.newFolder')}</span>)}</button>)}@@ -1216,8 +1216,8 @@ const ItemsList: React.FC = () => {isOpen={deleteItem !== null}onClose={() => setDeleteItem(null)}onConfirm={handleConfirmDeleteItem}- title={t('items.deleteItemTitle')}- message={t('items.deleteItemConfirm')}+ title={t('items.deleteItem')}+ message={t('common.deleteItemConfirmDescription')}confirmText={t('common.delete')}/>diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsxindex f87e17902..2c3396ed6 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx@@ -153,7 +153,7 @@ const RecentlyDeleted: React.FC = () => {<div><div className="flex justify-between items-center mb-4"><ItemFilterDropdown- title={t('recentlyDeleted.title')}+ title={t('items.recentlyDeleted.title')}count={items.length}activeFilter="deleted"recentlyDeletedCount={items.length}@@ -167,20 +167,20 @@ const RecentlyDeleted: React.FC = () => {onClick={() => setShowConfirmEmptyAll(true)}className="text-sm text-red-600 dark:text-red-400 hover:text-red-700 dark:hover:text-red-300">- {t('recentlyDeleted.emptyAll')}+ {t('items.recentlyDeleted.emptyAll')}</button>)}</div>{items.length === 0 ? (<div className="text-gray-500 dark:text-gray-400 space-y-2 mb-10">- <p>{t('recentlyDeleted.noItems')}</p>- <p className="text-sm">{t('recentlyDeleted.noItemsDescription', { days: TRASH_RETENTION_DEFAULT_DAYS })}</p>+ <p>{t('items.recentlyDeleted.noItems')}</p>+ <p className="text-sm">{t('items.recentlyDeleted.noItemsDescription', { days: TRASH_RETENTION_DEFAULT_DAYS })}</p></div>) : (<><p className="text-sm text-gray-500 dark:text-gray-400 mb-4">- {t('recentlyDeleted.description', { days: TRASH_RETENTION_DEFAULT_DAYS })}+ {t('items.recentlyDeleted.description', { days: TRASH_RETENTION_DEFAULT_DAYS })}</p><ul className="space-y-2">@@ -203,9 +203,9 @@ const RecentlyDeleted: React.FC = () => {</div><div className="text-xs text-gray-500 dark:text-gray-400 mt-1">{daysRemaining > 0 ? (- t('recentlyDeleted.daysRemaining', { count: daysRemaining })+ t('items.recentlyDeleted.daysRemaining', { count: daysRemaining })) : (- <span className="text-red-500">{t('recentlyDeleted.expiringSoon')}</span>+ <span className="text-red-500">{t('items.recentlyDeleted.expiringSoon')}</span>)}</div></div>@@ -216,7 +216,7 @@ const RecentlyDeleted: React.FC = () => {onClick={() => handleRestore(item)}className="px-3 py-1 text-sm bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-400 rounded hover:bg-green-200 dark:hover:bg-green-900/50">- {t('recentlyDeleted.restore')}+ {t('items.recentlyDeleted.restore')}</button><buttononClick={() => {@@ -242,9 +242,9 @@ const RecentlyDeleted: React.FC = () => {isOpen={showConfirmDelete && !!selectedItem}onClose={handleCloseDeleteModal}onConfirm={handlePermanentDelete}- title={t('recentlyDeleted.confirmDeleteTitle')}- message={t('recentlyDeleted.confirmDeleteMessage')}- confirmText={t('recentlyDeleted.deletePermanently')}+ title={t('items.recentlyDeleted.confirmDeleteTitle')}+ message={t('items.recentlyDeleted.confirmDeleteMessage')}+ confirmText={t('items.recentlyDeleted.deletePermanently')}/>{/* Confirm Empty All Modal */}@@ -252,9 +252,9 @@ const RecentlyDeleted: React.FC = () => {isOpen={showConfirmEmptyAll}onClose={() => setShowConfirmEmptyAll(false)}onConfirm={handleEmptyAll}- title={t('recentlyDeleted.confirmEmptyAllTitle')}- message={t('recentlyDeleted.confirmEmptyAllMessage', { count: items.length })}- confirmText={t('recentlyDeleted.emptyAll')}+ title={t('items.recentlyDeleted.confirmEmptyAllTitle')}+ message={t('items.recentlyDeleted.confirmEmptyAllMessage', { count: items.length })}+ confirmText={t('items.recentlyDeleted.emptyAll')}/></div>);diff --git a/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx b/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsxindex eaee5c121..2735ff69e 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx@@ -780,7 +780,7 @@ const PasskeyCreate: React.FC = () => {? t('passkeys.create.confirmReplace'): selectedItemToAttach? t('passkeys.create.attachPasskey')- : t('passkeys.create.createButton')}+ : t('passkeys.create.title')}</Button>{(existingPasskeys.length > 0 || matchingItems.length > 0) ? (diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/AutoLockSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/AutoLockSettings.tsxindex 87c363e46..41b11801a 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/AutoLockSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/AutoLockSettings.tsx@@ -41,15 +41,15 @@ const AutoLockSettings: React.FC = () => {return (<div className="space-y-6">- <PageTitle>{t('settings.autoLockTimeout')}</PageTitle>+ <PageTitle>{t('settings.autoLock')}</PageTitle><section><div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700"><div className="p-4"><div><div className="flex items-center mb-2">- <p className="font-medium text-gray-900 dark:text-white">{t('settings.autoLockTimeout')}</p>+ <p className="font-medium text-gray-900 dark:text-white">{t('settings.autoLock')}</p><HelpModal- title={t('settings.autoLockTimeout')}+ title={t('settings.autoLock')}content={t('settings.autoLockTimeoutHelp')}className="ml-2"/>@@ -60,17 +60,17 @@ const AutoLockSettings: React.FC = () => {onChange={(e) => setAutoLockTimeoutSetting(Number(e.target.value))}className="w-full px-3 py-2 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-md text-gray-900 dark:text-white focus:ring-primary-500 focus:border-primary-500">- <option value="0">{t('settings.autoLockNever')}</option>- <option value="15">{t('settings.autoLock15Seconds')}</option>- <option value="30">{t('settings.autoLock30Seconds')}</option>- <option value="60">{t('settings.autoLock1Minute')}</option>- <option value="300">{t('settings.autoLock5Minutes')}</option>- <option value="900">{t('settings.autoLock15Minutes')}</option>- <option value="1800">{t('settings.autoLock30Minutes')}</option>- <option value="3600">{t('settings.autoLock1Hour')}</option>- <option value="14400">{t('settings.autoLock4Hours')}</option>- <option value="28800">{t('settings.autoLock8Hours')}</option>- <option value="86400">{t('settings.autoLock24Hours')}</option>+ <option value="0">{t('common.never')}</option>+ <option value="15">{t('common.duration.15seconds')}</option>+ <option value="30">{t('common.duration.30seconds')}</option>+ <option value="60">{t('settings.autoLockOptions.1minute')}</option>+ <option value="300">{t('settings.autoLockOptions.5minutes')}</option>+ <option value="900">{t('settings.autoLockOptions.15minutes')}</option>+ <option value="1800">{t('settings.autoLockOptions.30minutes')}</option>+ <option value="3600">{t('settings.autoLockOptions.1hour')}</option>+ <option value="14400">{t('settings.autoLockOptions.4hours')}</option>+ <option value="28800">{t('settings.autoLockOptions.8hours')}</option>+ <option value="86400">{t('settings.autoLockOptions.24hours')}</option></select></div></div>diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsxindex 91dae8af1..493f79703 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx@@ -480,7 +480,7 @@ const FamilySharingSettings: React.FC = () => {}}className="w-full px-3 py-2 text-left text-sm text-gray-700 dark:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700">- {t('items.editFolder')}+ {t('items.folders.editFolder')}</button>)}<buttondiff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/IdentityGeneratorSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/IdentityGeneratorSettings.tsxindex 0de69103a..eca443dd2 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/IdentityGeneratorSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/IdentityGeneratorSettings.tsx@@ -1,5 +1,5 @@import * as RustCore from '@aliasvault/client/rust/RustCore';-import { getLanguageInfo } from '@aliasvault/models/defaults';+import { getLanguageInfo } from '@aliasvault/i18n/languages';import React, { useEffect, useState, useCallback } from 'react';import { useTranslation } from 'react-i18next';@@ -103,12 +103,12 @@ const IdentityGeneratorSettings: React.FC = () => {{/* Language Section */}<section><h3 className="text-md font-semibold text-gray-900 dark:text-white mb-3">- {t('settings.identityGeneratorSettings.languageSection')}+ {t('settings.language')}</h3><div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700"><div className="p-4"><p className="font-medium text-gray-900 dark:text-white mb-2">- {t('settings.identityGeneratorSettings.languageSection')}+ {t('settings.language')}</p><p className="text-sm text-gray-600 dark:text-gray-400 mb-3">{t('settings.identityGeneratorSettings.languageDescription')}@@ -134,12 +134,12 @@ const IdentityGeneratorSettings: React.FC = () => {{/* Gender Section */}<section><h3 className="text-md font-semibold text-gray-900 dark:text-white mb-3">- {t('settings.identityGeneratorSettings.genderSection')}+ {t('fieldLabels.alias.gender')}</h3><div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700"><div className="p-4"><p className="font-medium text-gray-900 dark:text-white mb-2">- {t('settings.identityGeneratorSettings.genderSection')}+ {t('fieldLabels.alias.gender')}</p><p className="text-sm text-gray-600 dark:text-gray-400 mb-3">{t('settings.identityGeneratorSettings.genderDescription')}diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsxindex fc3eeca20..076842a30 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx@@ -451,7 +451,7 @@ const Settings: React.FC = () => {<svg className="w-5 h-5 mr-3 text-gray-600 dark:text-gray-400" fill="none" stroke="currentColor" strokeWidth={2} viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" d="M7 20l4-16m2 16l4-16M6 9h14M4 15h14" /></svg>- <span className="text-gray-900 dark:text-white text-left">{t('settings.unlockMethod.title')}</span>+ <span className="text-gray-900 dark:text-white text-left">{t('settings.vaultUnlock')}</span></div><svgclassName="w-4 h-4 text-gray-400"@@ -483,7 +483,7 @@ const Settings: React.FC = () => {d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z"/></svg>- <span className="text-gray-900 dark:text-white text-left">{t('settings.autoLockTimeout')}</span>+ <span className="text-gray-900 dark:text-white text-left">{t('settings.autoLock')}</span></div><svgclassName="w-4 h-4 text-gray-400"@@ -673,7 +673,7 @@ const Settings: React.FC = () => {<svg className="w-5 h-5 mr-3 text-gray-600 dark:text-gray-400" fill="none" stroke="currentColor" strokeWidth={2} viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z" /></svg>- <span className="text-gray-900 dark:text-white text-left">{t('settings.securitySettings.title')}</span>+ <span className="text-gray-900 dark:text-white text-left">{t('settings.security')}</span></div><svgclassName="w-4 h-4 text-gray-400"@@ -764,7 +764,7 @@ const Settings: React.FC = () => {</section><div className="text-center text-[13px] text-gray-400 dark:text-gray-600">- <div><span className="font-bold">{t('settings.versionPrefix')}:</span> {AppInfo.VERSION}</div>+ <div><span className="font-bold">{t('settings.appVersion')}:</span> {AppInfo.VERSION}</div>{serverVersion && (<div><span className="font-bold">{t('settings.serverVersion')}:</span> {serverVersion} ({getDisplayUrl()})</div>)}diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/VaultUnlockSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/VaultUnlockSettings.tsxindex 7099f9333..3e34aa545 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/VaultUnlockSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/VaultUnlockSettings.tsx@@ -149,7 +149,7 @@ const VaultUnlockSettings: React.FC = () => {setPinSetupStep(1);setNewPin('');setConfirmPin('');- setSuccess(t('settings.unlockMethod.enableSuccess'));+ setSuccess(t('settings.vaultUnlockSettings.pinEnabled'));hideLoading();} catch (err: unknown) {logFailure('Failed to enable PIN', err);@@ -186,7 +186,7 @@ const VaultUnlockSettings: React.FC = () => {return (<>- <PageTitle>{t('settings.unlockMethod.title')}</PageTitle>+ <PageTitle>{t('settings.vaultUnlock')}</PageTitle><div className="flex items-start gap-2"><p className="text-sm text-gray-600 dark:text-gray-400">{t('settings.unlockMethod.introText')}@@ -217,7 +217,7 @@ const VaultUnlockSettings: React.FC = () => {</svg><div><div className="flex items-center">- <p className="font-medium text-gray-900 dark:text-white">{t('settings.unlockMethod.pin')}</p>+ <p className="font-medium text-gray-900 dark:text-white">{t('settings.vaultUnlockSettings.pin')}</p><HelpModaltitle={t('common.notice')}content={t('settings.unlockMethod.pinSecurityWarning')}@@ -256,7 +256,7 @@ const VaultUnlockSettings: React.FC = () => {<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z" /></svg><div>- <p className="font-medium text-gray-900 dark:text-white">{t('settings.unlockMethod.password')}</p>+ <p className="font-medium text-gray-900 dark:text-white">{t('auth.masterPassword')}</p></div></div><div className="px-4 py-2 rounded-md bg-green-500 text-white hover:bg-green-600 cursor-not-allowed">diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/security/ActiveSessionsSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/security/ActiveSessionsSettings.tsxindex 17ba95a7f..016d05fba 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/security/ActiveSessionsSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/security/ActiveSessionsSettings.tsx@@ -75,8 +75,8 @@ const ActiveSessionsSettings: React.FC = () => {<div className="space-y-6"><div>- <PageTitle>{t('settings.securitySettings.activeSessions.title')}</PageTitle>- <p className="text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.activeSessions.description')}</p>+ <PageTitle>{t('settings.securitySettings.activeSessionsTitle')}</PageTitle>+ <p className="text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.activeSessions.headerText')}</p></div>{error && <AlertMessage type="error" message={error} />}diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/security/AuthLogsSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/security/AuthLogsSettings.tsxindex c8cd2976f..572a8f520 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/security/AuthLogsSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/security/AuthLogsSettings.tsx@@ -39,8 +39,8 @@ const AuthLogsSettings: React.FC = () => {return (<div className="space-y-6"><div>- <PageTitle>{t('settings.securitySettings.authLogs.title')}</PageTitle>- <p className="text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.authLogs.description')}</p>+ <PageTitle>{t('settings.securitySettings.recentAuthLogs')}</PageTitle>+ <p className="text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.authLogs.headerText')}</p></div>{error && <AlertMessage type="error" message={error} />}diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/security/ChangePasswordSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/security/ChangePasswordSettings.tsxindex d12b39228..acbce5cb0 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/security/ChangePasswordSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/security/ChangePasswordSettings.tsx@@ -133,7 +133,7 @@ const ChangePasswordSettings: React.FC = () => {setCurrentPassword('');setNewPassword('');setConfirmPassword('');- setSuccess(t('settings.securitySettings.changePassword.success'));+ setSuccess(t('settings.securitySettings.changePassword.passwordChangedSuccessfully'));} catch (err) {logFailure('Password change failed', err);setError(errorMessage(err));@@ -148,7 +148,7 @@ const ChangePasswordSettings: React.FC = () => {return (<div className="space-y-6"><div>- <PageTitle>{t('settings.securitySettings.changePassword.title')}</PageTitle>+ <PageTitle>{t('settings.securitySettings.changePassword.changePassword')}</PageTitle><p className="text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.changePassword.description')}</p></div>@@ -166,7 +166,7 @@ const ChangePasswordSettings: React.FC = () => {<PasswordInput id="confirm-password" label={t('settings.securitySettings.changePassword.confirmNewPassword')} value={confirmPassword} setValue={setConfirmPassword} visible={showConfirmPassword} setVisible={setShowConfirmPassword} /><Button type="submit">- {t('settings.securitySettings.changePassword.title')}+ {t('settings.securitySettings.changePassword.changePassword')}</Button></form></div>diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/security/SecuritySettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/security/SecuritySettings.tsxindex a96ea656d..88f4fb298 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/security/SecuritySettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/security/SecuritySettings.tsx@@ -28,7 +28,7 @@ const SecuritySettings: React.FC = () => {const entries: SecurityMenuEntry[] = [{id: 'change-password-button',- label: t('settings.securitySettings.changePassword.title'),+ label: t('settings.securitySettings.changePassword.changePassword'),path: '/settings/security/change-password',disabled: dbContext.isOffline,disabledReason: t('common.errors.serverNotAvailable'),@@ -36,7 +36,7 @@ const SecuritySettings: React.FC = () => {},{id: 'active-sessions-button',- label: t('settings.securitySettings.activeSessions.title'),+ label: t('settings.securitySettings.activeSessionsTitle'),path: '/settings/security/active-sessions',disabled: dbContext.isOffline,disabledReason: t('common.errors.serverNotAvailable'),@@ -44,7 +44,7 @@ const SecuritySettings: React.FC = () => {},{id: 'auth-logs-button',- label: t('settings.securitySettings.authLogs.title'),+ label: t('settings.securitySettings.recentAuthLogs'),path: '/settings/security/auth-logs',disabled: dbContext.isOffline,disabledReason: t('common.errors.serverNotAvailable'),@@ -55,7 +55,7 @@ const SecuritySettings: React.FC = () => {return (<div className="space-y-6"><div>- <PageTitle>{t('settings.securitySettings.title')}</PageTitle>+ <PageTitle>{t('settings.security')}</PageTitle><p className="text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.description')}</p></div>diff --git a/apps/browser-extension/src/i18n/StandaloneI18n.ts b/apps/browser-extension/src/i18n/StandaloneI18n.tsindex da0487e91..6c259a731 100644--- a/apps/browser-extension/src/i18n/StandaloneI18n.ts+++ b/apps/browser-extension/src/i18n/StandaloneI18n.ts@@ -43,7 +43,7 @@ export async function getCurrentLanguage(): Promise<string> {/*** Translation function for non-React contexts*- * @param key - Translation key (supports nested keys like 'auth.loginButton' or 'common.errors.networkError')+ * @param key - Translation key (supports nested keys like 'auth.login' or 'common.errors.unknownError')* @param fallback - Fallback text if translation is not found* @returns Promise<string> - Translated text*/@@ -55,7 +55,7 @@ export async function t(const language = await getCurrentLanguage();const translations = await loadTranslations(language);- // Support nested keys like 'auth.loginButton' or 'common.errors.networkError'+ // Support nested keys like 'auth.login' or 'common.errors.unknownError'const value = getNestedValue(translations, key);if (value && typeof value === 'string') {diff --git a/apps/browser-extension/src/i18n/config.ts b/apps/browser-extension/src/i18n/config.tsindex cb359c84e..c69d96c30 100644--- a/apps/browser-extension/src/i18n/config.ts+++ b/apps/browser-extension/src/i18n/config.ts@@ -1,175 +1,68 @@/**- * Central configuration for i18n languages- * Add new languages here to make them available throughout the application+ * The UI languages of the browser extension. The translations live in core/i18n (@aliasvault/i18n).*/-import { getLanguageInfo } from '@aliasvault/models/defaults';+import { type TranslationTree } from '@aliasvault/i18n';+import { DEFAULT_LANGUAGE as CORE_DEFAULT_LANGUAGE, LANGUAGE_CODES as CORE_LANGUAGE_CODES, UI_LANGUAGES } from '@aliasvault/i18n/languages';-import daTranslations from './locales/da.json';-import deTranslations from './locales/de.json';-import enTranslations from './locales/en.json';-import esTranslations from './locales/es.json';-import fiTranslations from './locales/fi.json';-import frTranslations from './locales/fr.json';-import gaTranslations from './locales/ga.json';-import heTranslations from './locales/he.json';-import huTranslations from './locales/hu.json';-import idTranslations from './locales/id.json';-import itTranslations from './locales/it.json';-import nlTranslations from './locales/nl.json';-import plTranslations from './locales/pl.json';-import ptTranslations from './locales/pt.json';-import roTranslations from './locales/ro.json';-import ruTranslations from './locales/ru.json';-import svTranslations from './locales/sv.json';-import ukTranslations from './locales/uk.json';-import zhTranslations from './locales/zh.json';--/**- * Create a map of all available languages and their resources for i18n.- * When adding a new language, add the translation JSON file to the locales folder and add the language to the map here.- */-export const LANGUAGE_RESOURCES = {- da: {- translation: daTranslations- },- de: {- translation: deTranslations- },- en: {- translation: enTranslations- },- es: {- translation: esTranslations- },- fi: {- translation: fiTranslations- },- fr: {- translation: frTranslations- },- ga: {- translation: gaTranslations- },- he: {- translation: heTranslations- },- hu: {- translation: huTranslations- },- id: {- translation: idTranslations- },- it: {- translation: itTranslations- },- nl: {- translation: nlTranslations- },- pl: {- translation: plTranslations- },- pt: {- translation: ptTranslations- },- ro: {- translation: roTranslations- },- ru: {- translation: ruTranslations- },- sv: {- translation: svTranslations- },- uk: {- translation: ukTranslations- },- zh: {- translation: zhTranslations- },-};+export interface ILanguageConfig {+ code: string;+ nativeName: string;+ flag?: string;+ }/*** List of all available UI languages with their code, native name and flag.*/-export const AVAILABLE_LANGUAGES: ILanguageConfig[] =- (Object.keys(LANGUAGE_RESOURCES) as Array<keyof typeof LANGUAGE_RESOURCES>).map((code) => {- const info = getLanguageInfo(code);- return { code, nativeName: info.label, flag: info.flag };- });+export const AVAILABLE_LANGUAGES: ILanguageConfig[] = UI_LANGUAGES.map(({ code, label, flag }) => ({ code, nativeName: label, flag }));/*** Default language that is used when no language is set in the browser or when a localized string is not found for the current language.*/-export const DEFAULT_LANGUAGE = 'en';+export const DEFAULT_LANGUAGE = CORE_DEFAULT_LANGUAGE;-export const LANGUAGE_CODES = AVAILABLE_LANGUAGES.map(lang => lang.code);--export interface ILanguageConfig {- code: string;- nativeName: string;- flag?: string;- }+export const LANGUAGE_CODES: string[] = [...CORE_LANGUAGE_CODES];/*** Type for content translations*/-export type ContentTranslations = {- [key: string]: string | ContentTranslations;+export type ContentTranslations = TranslationTree;++/*+ * The background and content scripts cannot load code on demand and are injected into every page, so they bundle+ * the translations for the top-level namespaces they translate, for every language.+ */+const STANDALONE_NAMESPACES = {+ common: import.meta.glob<TranslationTree>('../../../../core/i18n/locales/*.json', { eager: true, import: 'common' }),+ content: import.meta.glob<TranslationTree>('../../../../core/i18n/locales/*.json', { eager: true, import: 'content' }),+ items: import.meta.glob<TranslationTree>('../../../../core/i18n/locales/*.json', { eager: true, import: 'items' }),+ apiErrors: import.meta.glob<TranslationTree>('../../../../core/i18n/locales/*.json', { eager: true, import: 'apiErrors' }),};/**- * Cache for loaded translations to avoid repeated file reads+ * Cache for loaded translations to avoid rebuilding them*/const translationCache = new Map<string, ContentTranslations>();/**- * Load translations for a specific language+ * Load the translations the background and content scripts use for a specific language*/export async function loadTranslations(language: string): Promise<ContentTranslations> {- const cacheKey = `all:${language}`;-- // Check cache first- if (translationCache.has(cacheKey)) {- return translationCache.get(cacheKey)!;- }-- // Get translations from pre-loaded resources- if (LANGUAGE_RESOURCES[language as keyof typeof LANGUAGE_RESOURCES]) {- const translationData = LANGUAGE_RESOURCES[language as keyof typeof LANGUAGE_RESOURCES].translation;- translationCache.set(cacheKey, translationData);- return translationData;- }-- // Fallback to English if available- if (language !== DEFAULT_LANGUAGE && LANGUAGE_RESOURCES[DEFAULT_LANGUAGE]) {- console.warn(`Translations not found for ${language}, falling back to ${DEFAULT_LANGUAGE}`);- const fallbackData = LANGUAGE_RESOURCES[DEFAULT_LANGUAGE].translation;- translationCache.set(cacheKey, fallbackData);- return fallbackData;+ const code = LANGUAGE_CODES.includes(language) ? language : DEFAULT_LANGUAGE;+ const cached = translationCache.get(code);+ if (cached) {+ return cached;}- // Return empty object as last resort- console.warn(`No translations found for ${language} and no fallback available`);- return {};-}--/**- * Load all available translations for i18next- */-export async function loadAllTranslations(): Promise<Record<string, { translation: ContentTranslations }>> {- const resources: Record<string, { translation: ContentTranslations }> = {};-- for (const language of AVAILABLE_LANGUAGES) {- try {- const translations = await loadTranslations(language.code);- resources[language.code] = { translation: translations };- } catch (error) {- console.warn(`Failed to load translations for ${language.code}:`, error);+ const translations: ContentTranslations = {};+ for (const [namespace, modules] of Object.entries(STANDALONE_NAMESPACES)) {+ const entry = Object.entries(modules).find(([file]) => file.endsWith(`/${code}.json`));+ if (entry) {+ translations[namespace] = entry[1];}}-- return resources;+ translationCache.set(code, translations);+ return translations;}/**diff --git a/apps/browser-extension/src/i18n/i18n.ts b/apps/browser-extension/src/i18n/i18n.tsindex bdb34e07a..ef8710a3b 100644--- a/apps/browser-extension/src/i18n/i18n.ts+++ b/apps/browser-extension/src/i18n/i18n.ts@@ -1,3 +1,4 @@+import { englishTranslations, loadTranslations, type TranslationTree } from '@aliasvault/i18n';import i18n from 'i18next';import { initReactI18next } from 'react-i18next';@@ -6,8 +7,7 @@ import { logFailure } from '@/utils/Diagnostics';import {DEFAULT_LANGUAGE,- LANGUAGE_CODES,- LANGUAGE_RESOURCES+ LANGUAGE_CODES} from './config';import { storage } from '#imports';@@ -28,16 +28,30 @@ const detectLanguage = async (): Promise<string> => {return LANGUAGE_CODES.includes(browserLang) ? browserLang : DEFAULT_LANGUAGE;};+/**+ * Load the translations of a language into i18next before switching to it. Each language is a separate chunk.+ * @param code - the language code+ */+export const ensureLanguageLoaded = async (code: string): Promise<void> => {+ if (!i18n.hasResourceBundle(code, 'translation')) {+ i18n.addResourceBundle(code, 'translation', await loadTranslations(code));+ }+};+/*** Initialize i18n with async language detection*/const initI18n = async (): Promise<void> => {const language = await detectLanguage();+ const resources: Record<string, { translation: TranslationTree }> = { [DEFAULT_LANGUAGE]: { translation: englishTranslations } };+ if (language !== DEFAULT_LANGUAGE) {+ resources[language] = { translation: await loadTranslations(language) };+ }await i18n.use(initReactI18next).init({- resources: LANGUAGE_RESOURCES,+ resources,lng: language,fallbackLng: DEFAULT_LANGUAGE,diff --git a/apps/browser-extension/src/utils/ApiErrors.ts b/apps/browser-extension/src/utils/ApiErrors.tsindex 156e6bf77..542eac341 100644--- a/apps/browser-extension/src/utils/ApiErrors.ts+++ b/apps/browser-extension/src/utils/ApiErrors.ts@@ -11,7 +11,7 @@ import type { TFunction } from 'i18next';export function apiErrorMessage(error: unknown, t: TFunction, fallback: string): string {const code = apiErrorCodeOf(error);if (code) {- const key = `common.apiErrors.${code}`;+ const key = `apiErrors.${code}`;const translated = t(key);return translated === key ? fallback : translated;}diff --git a/apps/browser-extension/src/utils/formDetector/TranslationPatterns.ts b/apps/browser-extension/src/utils/formDetector/TranslationPatterns.tsindex d92f9b93b..ce14df6f7 100644--- a/apps/browser-extension/src/utils/formDetector/TranslationPatterns.ts+++ b/apps/browser-extension/src/utils/formDetector/TranslationPatterns.ts@@ -3,21 +3,19 @@* It looks at common.email, common.username, and common.password translations* across all supported languages to help detect form fields in any language.*- * This module dynamically imports all translation files, so adding a new language- * automatically extends form detection support without any code changes.+ * It imports the common namespace of every shared translation file (core/i18n), so adding a new+ * language automatically extends form detection support without any code changes.*//**- * Dynamically import all translation JSON files from the locales directory+ * The common namespace of every language in the shared translation files; only that namespace is bundled.*/-const translationModules = import.meta.glob('../../i18n/locales/*.json', { eager: true });+const translationModules = import.meta.glob('../../../../../core/i18n/locales/*.json', { eager: true, import: 'common' });/**- * Extract all translation objects from the imported modules+ * All translation objects, shaped like a locale file (only common is present).*/-const allTranslations = Object.values(translationModules).map((module: unknown) => {- return (module as { default: unknown }).default;-});+const allTranslations = Object.values(translationModules).map((common: unknown) => ({ common }));/*** Extract unique, lowercase field patterns from all translationsdiff --git a/apps/browser-extension/wxt.config.ts b/apps/browser-extension/wxt.config.tsindex bc4c7c217..1d186847b 100644--- a/apps/browser-extension/wxt.config.ts+++ b/apps/browser-extension/wxt.config.ts@@ -152,6 +152,7 @@ export default defineConfig({includeSources: ['apps/browser-extension/**/*','core/client/**/*',+ 'core/i18n/**/*','core/models/**/*','core/vault/**/*','core/scripts/**/*',