refactor: Improve i18n for settings alias preferences

public/locales/en-US/common.json

@@ -52,7 +52,8 @@
     "yesLabel": "Yes",
     "noLabel": "No",
     "continueLabel": "Continue",
-    "unavailableValue": "Unavailable"
+    "unavailableValue": "Unavailable",
+    "experimentalFeatureExplanation": "This is an experimental feature."
   },
   "noSearchResults": {
     "title": "Nothing found",

public/locales/en-US/settings-preferences.json

@@ -0,0 +1,5 @@
+{
+  "title": "Alias Preferences",
+  "description": "Select default values for your aliases. This only affects aliases you haven't set a custom value for.",
+  "continueActionLabel": "Save preferences"
+}

public/locales/en-US/settings.json

@@ -0,0 +1,7 @@
+{
+  "title": "Settings",
+  "actions": {
+    "enable2fa": "Two-Factor-Authentication",
+    "aliasPreferences": "Alias Preferences"
+  }
+}

public/locales/en-US/translation.json

@@ -90,18 +90,10 @@
             }
         },
         "SettingsRoute": {
-            "title": "Settings",
             "forms": {
                 "aliasPreferences": {
-                    "title": "Alias Preferences",
-                    "description": "Select default values for your aliases. This only affects aliases you haven't set a custom value for.",
-                    "saveAction": "Save preferences"
                 }
             },
-            "actions": {
-                "enable2fa": "Two-Factor-Authentication",
-                "aliasPreferences": "Alias Preferences"
-            },
             "2fa": {
                 "title": "Two-Factor-Authentication",
                 "alreadyEnabled": "You have successfully enabled 2FA!",

src/routes/SettingsAliasPreferencesRoute.tsx

@@ -44,30 +44,26 @@ interface Form {
 }
 
 export default function SettingsAliasPreferencesRoute(): ReactElement {
+	const {t} = useTranslation(["aliases", "settings-preferences", "common"])
 	const {_updateUser} = useContext(AuthContext)
 	const user = useUser()
 	const {showError, showSuccess} = useErrorSuccessSnacks()
-	const {t} = useTranslation()
 
 	const schema = yup.object().shape({
-		removeTrackers: yup.boolean().label(t("relations.alias.settings.removeTrackers.label")),
+		removeTrackers: yup.boolean().label(t("settings.fields.removeTrackers.label")),
-		createMailReport: yup
+		createMailReport: yup.boolean().label(t("settings.fields.createMailReport.label")),
-			.boolean()
+		proxyImages: yup.boolean().label(t("settings.fields.proxyImages.label")),
-			.label(t("relations.alias.settings.createMailReports.label")),
-		proxyImages: yup.boolean().label(t("relations.alias.settings.proxyImages.label")),
 		imageProxyFormat: yup
 			.mixed<ImageProxyFormatType>()
 			.oneOf(Object.values(ImageProxyFormatType))
 			.required()
-			.label(t("relations.alias.settings.imageProxyFormat.label")),
+			.label(t("settings.fields.imageProxyFormat.label")),
 		proxyUserAgent: yup
 			.mixed<ProxyUserAgentType>()
 			.oneOf(Object.values(ProxyUserAgentType))
 			.required()
-			.label(t("relations.alias.settings.proxyUserAgent.label")),
+			.label(t("settings.fields.proxyUserAgent.label")),
-		expandUrlShorteners: yup
+		expandUrlShorteners: yup.boolean().label(t("settings.fields.expandUrlShorteners.label")),
-			.boolean()
-			.label(t("relations.alias.settings.expandUrlShorteners.label")),
 	})
 
 	const {mutateAsync} = useMutation<SimpleDetailResponse, AxiosError, UpdatePreferencesData>(
@@ -121,8 +117,8 @@ export default function SettingsAliasPreferencesRoute(): ReactElement {
 
 	return (
 		<SimplePageBuilder.Page
-			title={t("routes.SettingsRoute.forms.aliasPreferences.title")}
+			title={t("title", {ns: "settings-preferences"})}
-			description={t("routes.SettingsRoute.forms.aliasPreferences.description")}
+			description={t("description", {ns: "settings-preferences"})}
 		>
 			<form onSubmit={formik.handleSubmit}>
 				<Grid
@@ -146,7 +142,7 @@ export default function SettingsAliasPreferencesRoute(): ReactElement {
 									/>
 								}
 								labelPlacement="start"
-								label={t("relations.alias.settings.removeTrackers.label")}
+								label={t("settings.fields.removeTrackers.label")}
 							/>
 							<FormHelperText
 								error={Boolean(
@@ -156,7 +152,7 @@ export default function SettingsAliasPreferencesRoute(): ReactElement {
 							>
 								{(formik.touched.createMailReport &&
 									formik.errors.createMailReport) ||
-									t("relations.alias.settings.removeTrackers.helperText")}
+									t("settings.fields.removeTrackers.helperText")}
 							</FormHelperText>
 						</FormGroup>
 					</Grid>
@@ -174,7 +170,7 @@ export default function SettingsAliasPreferencesRoute(): ReactElement {
 									/>
 								}
 								labelPlacement="start"
-								label={t("relations.alias.settings.createMailReports.label")}
+								label={t("settings.fields.createMailReport.label")}
 							/>
 							<FormHelperText
 								error={Boolean(
@@ -184,7 +180,7 @@ export default function SettingsAliasPreferencesRoute(): ReactElement {
 							>
 								{(formik.touched.createMailReport &&
 									formik.errors.createMailReport) ||
-									t("relations.alias.settings.createMailReports.helperText")}
+									t("settings.fields.createMailReport.helperText")}
 							</FormHelperText>
 						</FormGroup>
 					</Grid>
@@ -202,7 +198,7 @@ export default function SettingsAliasPreferencesRoute(): ReactElement {
 									/>
 								}
 								labelPlacement="start"
-								label={t("relations.alias.settings.proxyImages.label")}
+								label={t("settings.fields.proxyImages.label")}
 							/>
 							<FormHelperText
 								error={Boolean(
@@ -210,13 +206,13 @@ export default function SettingsAliasPreferencesRoute(): ReactElement {
 								)}
 							>
 								{(formik.touched.proxyImages && formik.errors.proxyImages) ||
-									t("relations.alias.settings.proxyImages.helperText")}
+									t("settings.fields.proxyImages.helperText")}
 							</FormHelperText>
 							<Alert
 								sx={{width: "fit-content", alignSelf: "end", marginTop: 1}}
 								severity="warning"
 							>
-								{t("general.experimentalFeature")}
+								{t("general.experimentalFeatureExplanation", {ns: "common"})}
 							</Alert>
 						</FormGroup>
 						<Collapse in={formik.values.proxyImages}>
@@ -242,9 +238,7 @@ export default function SettingsAliasPreferencesRoute(): ReactElement {
 											}}
 											name="imageProxyFormat"
 											id="imageProxyFormat"
-											label={t(
+											label={t("settings.fields.imageProxyFormat.label")}
-												"relations.alias.settings.imageProxyFormat.label",
-											)}
 											value={formik.values.imageProxyFormat}
 											onChange={formik.handleChange}
 											disabled={formik.isSubmitting}
@@ -286,7 +280,7 @@ export default function SettingsAliasPreferencesRoute(): ReactElement {
 								select
 								name="proxyUserAgent"
 								id="proxyUserAgent"
-								label={t("relations.alias.settings.proxyUserAgent.label")}
+								label={t("settings.fields.proxyUserAgent.label")}
 								value={formik.values.proxyUserAgent}
 								onChange={formik.handleChange}
 								disabled={formik.isSubmitting}
@@ -312,7 +306,7 @@ export default function SettingsAliasPreferencesRoute(): ReactElement {
 								)}
 							>
 								{(formik.touched.proxyUserAgent && formik.errors.proxyUserAgent) ||
-									t("relations.alias.settings.proxyUserAgent.helperText")}
+									t("settings.fields.proxyUserAgent.helperText")}
 							</FormHelperText>
 						</FormGroup>
 					</Grid>
@@ -330,7 +324,7 @@ export default function SettingsAliasPreferencesRoute(): ReactElement {
 									/>
 								}
 								labelPlacement="start"
-								label={t("relations.alias.settings.expandUrlShorteners.label")}
+								label={t("settings.fields.expandUrlShorteners.label")}
 							/>
 							<FormHelperText
 								error={Boolean(
@@ -340,13 +334,13 @@ export default function SettingsAliasPreferencesRoute(): ReactElement {
 							>
 								{(formik.touched.expandUrlShorteners &&
 									formik.errors.expandUrlShorteners) ||
-									t("relations.alias.settings.expandUrlShorteners.helperText")}
+									t("settings.fields.expandUrlShorteners.helperText")}
 							</FormHelperText>
 							<Alert
 								sx={{width: "fit-content", alignSelf: "end", marginTop: 1}}
 								severity="warning"
 							>
-								{t("general.experimentalFeature")}
+								{t("general.experimentalFeatureExplanation", {ns: "common"})}
 							</Alert>
 						</FormGroup>
 					</Grid>
@@ -357,7 +351,7 @@ export default function SettingsAliasPreferencesRoute(): ReactElement {
 					type="submit"
 					startIcon={<MdCheckCircle />}
 				>
-					{t("routes.SettingsRoute.forms.aliasPreferences.saveAction")}
+					{t("continueActionLabel", {ns: "settings-preferences"})}
 				</LoadingButton>
 			</form>
 		</SimplePageBuilder.Page>

src/routes/SettingsRoute.tsx

@@ -9,22 +9,22 @@ import {List, ListItemButton, ListItemIcon, ListItemText} from "@mui/material"
 import {SimplePageBuilder} from "~/components"
 
 export default function SettingsRoute(): ReactElement {
-	const {t} = useTranslation()
+	const {t} = useTranslation("settings")
 
 	return (
-		<SimplePageBuilder.Page title={t("routes.SettingsRoute.title")}>
+		<SimplePageBuilder.Page title={t("title")}>
 			<List>
 				<ListItemButton component={Link} to="/settings/alias-preferences">
 					<ListItemIcon>
 						<GoSettings />
 					</ListItemIcon>
-					<ListItemText primary={t("routes.SettingsRoute.actions.aliasPreferences")} />
+					<ListItemText primary={t("actions.aliasPreferences")} />
 				</ListItemButton>
 				<ListItemButton component={Link} to="/settings/2fa">
 					<ListItemIcon>
 						<BsShieldLockFill />
 					</ListItemIcon>
-					<ListItemText primary={t("routes.SettingsRoute.actions.enable2fa")} />
+					<ListItemText primary={t("actions.enable2fa")} />
 				</ListItemButton>
 			</List>
 		</SimplePageBuilder.Page>