Skip to content

armgit / lyftr

Public Imported from GitHub
0

Self-hosted fitness tracker. Log workouts, track nutrition, and monitor progress. Docker deployment, mobile-friendly.

Polish the localization: real bugs, Spanish wording, layout, tidier catalog keys (#201)

Carter8983a4f278d5
diff --git a/mobile/app/(tabs)/index.tsx b/mobile/app/(tabs)/index.tsx
index 5466a1f..616840a 100644
--- a/mobile/app/(tabs)/index.tsx
+++ b/mobile/app/(tabs)/index.tsx
@@ -130,7 +130,7 @@ export default function Dashboard() {
}
const absent: Record<string, UiMessage> = {}
const note = (what: string, err: unknown) => {
- absent[what] = { key: 'settings.unknownError', cause: err }
+ absent[what] = { key: 'errors.unknown', cause: err }
}
const [ws, ps, fs, wl, wst] = await Promise.all([
// Uncaught on purpose, mirroring web: this is the primary request, and it is
@@ -158,7 +158,7 @@ export default function Dashboard() {
useEffect(() => {
fetchSettings()
load()
- .catch((err) => setError({ key: 'settings.unknownError', cause: err }))
+ .catch((err) => setError({ key: 'errors.unknown', cause: err }))
.finally(() => setLoading(false))
}, [fetchSettings, load])
@@ -201,7 +201,7 @@ export default function Dashboard() {
onRetry={() => {
setError(null)
setLoading(true)
- load().catch((err) => setError({ key: 'settings.unknownError', cause: err })).finally(() => setLoading(false))
+ load().catch((err) => setError({ key: 'errors.unknown', cause: err })).finally(() => setLoading(false))
}}
/>
</Screen>
@@ -381,7 +381,7 @@ export default function Dashboard() {
{dayLabel(upNext.day, upNext.day.order_index)}
</Text>
<AppText variant="caption" color="muted" className="mt-0.5">
- {t('home.upNext.exercises', { count: (upNext.day.exercises ?? []).length })}
+ {t('common.count.exercises', { count: (upNext.day.exercises ?? []).length })}
</AppText>
</View>
<ChevronRight size={16} color={colors.txMuted} />
@@ -399,7 +399,7 @@ export default function Dashboard() {
// here the screen reads as an account with no routine, which is a claim we
// cannot make from a request that never answered.
<Card>
- <ErrorState title={t('home.upNext.loadFailed')} message={uiMessage(missing['your programs'])} onRetry={onRefresh} />
+ <ErrorState title={t('programs.list.loadFailed')} message={uiMessage(missing['your programs'])} onRetry={onRefresh} />
</Card>
) : null}
@@ -541,7 +541,7 @@ export default function Dashboard() {
{[
formatDay(workoutDay(lastWorkout), 'monthDay'),
mins > 0 && t('home.lastWorkout.minutes', { mins }),
- totalSets > 0 && t('home.lastWorkout.sets', { count: totalSets }),
+ totalSets > 0 && t('common.count.sets', { count: totalSets }),
totalVolume > 0 && `${totalVolume.toLocaleString()} ${wUnit}`,
].filter(Boolean).join(' · ')}
</AppText>
@@ -653,9 +653,9 @@ export default function Dashboard() {
<ProgressBar pct={calPct} color="#00b8d9" className="mb-4" />
<View className="gap-3">
{[
- { id: 'protein', label: t('home.macro.protein'), val: food.total_protein, target: settings.protein_target, pct: protPct, color: '#3b82f6' },
+ { id: 'protein', label: t('food.macro.protein'), val: food.total_protein, target: settings.protein_target, pct: protPct, color: '#3b82f6' },
{ id: 'carbs', label: t('home.macro.carbs'), val: food.total_carbs, target: settings.carb_target, pct: carbsPct, color: '#f59e0b' },
- { id: 'fat', label: t('home.macro.fat'), val: food.total_fat, target: settings.fat_target, pct: fatPct, color: '#8b5cf6' },
+ { id: 'fat', label: t('food.macro.fat'), val: food.total_fat, target: settings.fat_target, pct: fatPct, color: '#8b5cf6' },
].map((m) => (
<View key={m.id}>
<View className="mb-1 flex-row items-center justify-between">
diff --git a/mobile/app/(tabs)/nutrition/[id].tsx b/mobile/app/(tabs)/nutrition/[id].tsx
index 1309828..4bacf76 100644
--- a/mobile/app/(tabs)/nutrition/[id].tsx
+++ b/mobile/app/(tabs)/nutrition/[id].tsx
@@ -42,7 +42,7 @@ export default function NutritionDetail() {
.then(setEntry)
.catch((err) => {
setGone(isNotFound(err))
- setError({ key: 'settings.unknownError', cause: err })
+ setError({ key: 'errors.unknown', cause: err })
})
.finally(() => setLoading(false))
}, [id, retryKey])
@@ -221,7 +221,7 @@ export default function NutritionDetail() {
</ScrollView>
<ConfirmSheet
- {...deleteConfirmProps({ title: t('food.entry.deleteTitle'), subject: `"${entry.name}"` })}
+ {...deleteConfirmProps({ title: t('food.entry.deleteTitle'), name: entry.name })}
open={confirming}
busy={remove.busy}
error={remove.error}
diff --git a/mobile/app/(tabs)/nutrition/index.tsx b/mobile/app/(tabs)/nutrition/index.tsx
index 127d56f..5577657 100644
--- a/mobile/app/(tabs)/nutrition/index.tsx
+++ b/mobile/app/(tabs)/nutrition/index.tsx
@@ -13,7 +13,7 @@ import {
import { MacroRing, MacroHistoryChart, type MacroHistoryPoint } from '../../../src/components/nutrition/NutritionCharts'
import { FoodEntryRow } from '../../../src/components/nutrition/FoodEntryRow'
import { NutritionSkeleton } from '../../../src/components/nutrition/NutritionSkeleton'
-import { MACRO_COLORS, MEALS, type Meal } from '../../../src/components/nutrition/nutritionMeta'
+import { MACRO_COLORS, MEALS, mealMessage, type Meal } from '../../../src/components/nutrition/nutritionMeta'
import { client, useSettingsStore } from '../../../src/lib/lyftr'
import { useTheme } from '../../../src/theme/useTheme'
@@ -53,7 +53,7 @@ export default function Nutrition() {
const { width: windowWidth } = useWindowDimensions()
const settings = useSettingsStore((s) => s.settings)
const fetchSettings = useSettingsStore((s) => s.fetch)
- // One-shot courier from the log flow: ?logged=<meal label> | 'Updated' → success toast.
+ // One-shot courier from the log flow: ?logged=<meal slug> | 'Updated' → success toast.
const params = useLocalSearchParams<{ logged?: string }>()
const [toast, setToast] = useState<UiMessage | null>(null)
@@ -119,7 +119,7 @@ export default function Nutrition() {
// rendered as 0 kcal, which is what "hasn't eaten yet" looks like.
.then((st) => (isDailyStats(st) ? st : Promise.reject(new Error('unreadable'))))
.catch((err) => {
- statsMessage = { key: 'settings.unknownError', cause: err }
+ statsMessage = { key: 'errors.unknown', cause: err }
return defaultStats
}),
])
@@ -130,7 +130,7 @@ export default function Nutrition() {
setLoadedDate(date)
} catch (err: any) {
if (id !== dayRequest.current) return
- setError({ key: 'settings.unknownError', cause: err })
+ setError({ key: 'errors.unknown', cause: err })
} finally {
if (id === dayRequest.current) hasLoadedRef.current = true
}
@@ -154,7 +154,7 @@ export default function Nutrition() {
setHistoryDataPeriod(historyPeriod)
setHistoryError(null)
})
- .catch((err) => { if (id === historyRequest.current) setHistoryError({ key: 'settings.unknownError', cause: err }) })
+ .catch((err) => { if (id === historyRequest.current) setHistoryError({ key: 'errors.unknown', cause: err }) })
.finally(() => { if (id === historyRequest.current) setHistoryLoading(false) })
}, [historyPeriod])
useEffect(() => { loadHistory() }, [loadHistory])
@@ -205,14 +205,14 @@ export default function Nutrition() {
})
.catch((err) => {
if (day !== selectedDateRef.current) return
- setStatsError({ key: 'settings.unknownError', cause: err })
+ setStatsError({ key: 'errors.unknown', cause: err })
})
}, [selectedDate])
if (!hasLoadedRef.current) return <NutritionSkeleton />
const toastView = toast ? (
- <Toast variant="success" icon={CheckCircle2} title={uiMessage(toast)} onDismiss={() => setToast(null)} />
+ <Toast variant="success" icon={CheckCircle2} title={mealMessage(toast)} onDismiss={() => setToast(null)} />
) : null
// Rings at 0 kcal and four empty meal sections say "you have eaten nothing today",
diff --git a/mobile/app/(tabs)/nutrition/log.tsx b/mobile/app/(tabs)/nutrition/log.tsx
index b72885b..aa37417 100644
--- a/mobile/app/(tabs)/nutrition/log.tsx
+++ b/mobile/app/(tabs)/nutrition/log.tsx
@@ -195,7 +195,7 @@ export default function LogFood() {
// unreachable upstream is not an answer, and saying "not found" for it sent
// people to type in a product that does exist.
if (isNotFound(err)) enterManually()
- else setLookup({ code, error: { key: 'food.log.lookupFailed', cause: err } })
+ else setLookup({ code, error: { key: 'food.log.lookupFailedHint', cause: err } })
}
}
@@ -217,8 +217,8 @@ export default function LogFood() {
}
Haptics.notificationAsync(Haptics.NotificationFeedbackType.Success).catch(() => {})
// Courier the confirmation to the dashboard toast: which meal (new) or 'Updated'.
- router.replace(`/nutrition?logged=${editId ? 'Updated' : encodeURIComponent(mealLabel(meal))}`)
- }, t('food.log.saveFailed'))
+ router.replace(`/nutrition?logged=${editId ? 'Updated' : meal}`)
+ }, t('common.saveFailed'))
const handleLog = async () => {
if (!selected || save.busy) return
@@ -357,7 +357,7 @@ export default function LogFood() {
// what failed, and both ways forward keep the code already scanned.
<Card>
<ErrorState
- title={t('food.log.lookupFailedTitle')}
+ title={t('food.log.lookupFailed')}
message={uiMessage(lookup.error)}
onRetry={() => lookUpBarcode(lookup.code)}
secondary={<Button title={t('food.log.enterManually')} variant="secondary" onPress={enterManually} />}
diff --git a/mobile/app/(tabs)/programs/[id].tsx b/mobile/app/(tabs)/programs/[id].tsx
index 753e7eb..82ea1ef 100644
--- a/mobile/app/(tabs)/programs/[id].tsx
+++ b/mobile/app/(tabs)/programs/[id].tsx
@@ -152,7 +152,7 @@ export default function ProgramDetail() {
loadedRef.current = true
}
} catch (err) {
- if (!cancelled && !loadedRef.current) setError({ key: 'settings.unknownError', cause: err })
+ if (!cancelled && !loadedRef.current) setError({ key: 'errors.unknown', cause: err })
} finally {
if (!cancelled) setLoading(false)
}
@@ -229,7 +229,7 @@ export default function ProgramDetail() {
newLabel = targetWeightLabel(sw, wUnit)
} else {
oldLabel = `${s.target_reps}`
- newLabel = t('programs.count.reps', { count: sr })
+ newLabel = t('common.count.reps', { count: sr })
}
return {
setId: s.id as number,
@@ -292,7 +292,7 @@ export default function ProgramDetail() {
</View>
<ConfirmSheet
- {...deleteConfirmProps({ title: t('programs.deleteConfirmTitle'), subject: `"${program.name}"` })}
+ {...deleteConfirmProps({ title: t('programs.deleteConfirmTitle'), name: program.name })}
open={confirming}
busy={remove.busy}
error={remove.error}
@@ -463,7 +463,7 @@ export default function ProgramDetail() {
distinguishable by shape/text (a11y) and reads as decoration. */}
{isToday ? (
<View className={`rounded-full px-1.5 py-0.5 ${isSelected ? 'bg-white/20' : 'bg-brand-500/15'}`}>
- <AppText variant="caption" style={{ color: isSelected ? '#ffffff' : accent, letterSpacing: 0.5 }}>{t('programs.detail.todayChip')}</AppText>
+ <AppText variant="caption" style={{ color: isSelected ? '#ffffff' : accent, letterSpacing: 0.5 }}>{t('common.todayChip')}</AppText>
</View>
) : null}
</Pressable>
@@ -486,7 +486,7 @@ export default function ProgramDetail() {
{!restOn && (
<View className="flex-row items-center gap-1.5 px-1">
<TimerOff size={13} color={colors.txMuted} />
- <AppText variant="caption" color="muted">{t('workouts.detail.restOff')}</AppText>
+ <AppText variant="caption" color="muted">{t('common.rest.timerOff')}</AppText>
</View>
)}
<View className="gap-3">
@@ -500,7 +500,7 @@ export default function ProgramDetail() {
const maxTargetLbs = sets.length > 0 ? Math.max(...sets.map((s) => s.target_weight || 0)) : 0
const maxTarget = displayWeight(maxTargetLbs, wUnit)
const setsSummary = [
- t('programs.count.sets', { count: sets.length }),
+ t('common.count.sets', { count: sets.length }),
...(maxTarget > 0 ? [t('programs.detail.target', { weight: maxTarget, unit: wUnit })] : []),
].join(' · ')
@@ -534,7 +534,7 @@ export default function ProgramDetail() {
</View>
{restOn && (
ex.rest_seconds === 0 ? (
- <AppText variant="caption" color="muted">{t('workouts.detail.noRest')}</AppText>
+ <AppText variant="caption" color="muted">{t('common.rest.none')}</AppText>
) : (
<View className="flex-row items-center gap-1">
<Pause size={13} color={colors.txMuted} />
diff --git a/mobile/app/(tabs)/programs/[id]/edit.tsx b/mobile/app/(tabs)/programs/[id]/edit.tsx
index d46d027..6827818 100644
--- a/mobile/app/(tabs)/programs/[id]/edit.tsx
+++ b/mobile/app/(tabs)/programs/[id]/edit.tsx
@@ -86,7 +86,7 @@ export default function EditProgram() {
})),
})
})
- .catch((err) => { if (!cancelled) setLoadError({ key: 'settings.unknownError', cause: err }) })
+ .catch((err) => { if (!cancelled) setLoadError({ key: 'errors.unknown', cause: err }) })
.finally(() => { if (!cancelled) setInitialLoading(false) })
return () => { cancelled = true }
// eslint-disable-next-line react-hooks/exhaustive-deps
@@ -127,8 +127,12 @@ export default function EditProgram() {
}, t('programs.form.updateFailed'))
useEffect(() => {
- if (error || save.error) scrollRef.current?.scrollTo({ y: 0, animated: true })
- }, [error, save.failureKey])
+ if (error) scrollRef.current?.scrollTo({ y: 0, animated: true })
+ }, [error])
+
+ useEffect(() => {
+ if (save.failureKey) scrollRef.current?.scrollTo({ y: 0, animated: true })
+ }, [save.failureKey])
const handleSubmit = async () => {
if (!formData.name.trim()) { setError({ key: 'programs.form.errors.nameRequired' }); return }
@@ -174,7 +178,7 @@ export default function EditProgram() {
<View>
<AppText variant="title">{t('programs.form.editTitle')}</AppText>
<AppText variant="caption" color="muted">
- {t('programs.form.summary', { days: t('programs.count.days', { count: formData.days.length }), exercises: t('programs.count.exercises', { count: totalExercises }), sets: t('programs.count.sets', { count: totalSets }) })}
+ {t('programs.form.summary', { days: t('common.count.days', { count: formData.days.length }), exercises: t('common.count.exercises', { count: totalExercises }), sets: t('common.count.sets', { count: totalSets }) })}
</AppText>
</View>
</View>
@@ -195,7 +199,7 @@ export default function EditProgram() {
</View>
<View>
- <FieldHeader icon={FileText} label={t('workouts.form.notes')} />
+ <FieldHeader icon={FileText} label={t('common.notes')} />
<Field
value={formData.notes}
onChangeText={(text) => setFormData((prev) => ({ ...prev, notes: text }))}
@@ -225,7 +229,7 @@ export default function EditProgram() {
<View className="-mx-5 flex-row gap-3 border-t border-surface-border bg-surface-base px-5 pb-2 pt-3">
<Button title={t('common.cancel')} variant="secondary" className="flex-1" onPress={goBack} />
- <Button title={t('workouts.form.saveChanges')} className="flex-1" onPress={handleSubmit} loading={save.busy} />
+ <Button title={t('common.saveChanges')} className="flex-1" onPress={handleSubmit} loading={save.busy} />
</View>
<KeyboardDoneBar nativeID={KEYPAD_DONE_ID} />
diff --git a/mobile/app/(tabs)/programs/index.tsx b/mobile/app/(tabs)/programs/index.tsx
index 0e84a01..55d59c5 100644
--- a/mobile/app/(tabs)/programs/index.tsx
+++ b/mobile/app/(tabs)/programs/index.tsx
@@ -187,7 +187,7 @@ export default function Programs() {
<EmptyState
icon={BookOpen}
title={t('programs.list.empty.title')}
- subtitle={search ? t('programs.list.empty.searchHint') : t('programs.list.empty.startHint')}
+ subtitle={search ? t('common.tryDifferentSearch') : t('programs.list.empty.startHint')}
/>
)
}
diff --git a/mobile/app/(tabs)/programs/new.tsx b/mobile/app/(tabs)/programs/new.tsx
index 2c0d19e..17f4519 100644
--- a/mobile/app/(tabs)/programs/new.tsx
+++ b/mobile/app/(tabs)/programs/new.tsx
@@ -81,8 +81,12 @@ export default function AddProgram() {
}, t('programs.form.createFailed'))
useEffect(() => {
- if (error || save.error) scrollRef.current?.scrollTo({ y: 0, animated: true })
- }, [error, save.failureKey])
+ if (error) scrollRef.current?.scrollTo({ y: 0, animated: true })
+ }, [error])
+
+ useEffect(() => {
+ if (save.failureKey) scrollRef.current?.scrollTo({ y: 0, animated: true })
+ }, [save.failureKey])
const handleSubmit = async () => {
if (!formData.name.trim()) { setError({ key: 'programs.form.errors.nameRequired' }); return }
@@ -112,7 +116,7 @@ export default function AddProgram() {
<View>
<AppText variant="title">{t('programs.form.newTitle')}</AppText>
<AppText variant="caption" color="muted">
- {t('programs.form.summary', { days: t('programs.count.days', { count: formData.days.length }), exercises: t('programs.count.exercises', { count: totalExercises }), sets: t('programs.count.sets', { count: totalSets }) })}
+ {t('programs.form.summary', { days: t('common.count.days', { count: formData.days.length }), exercises: t('common.count.exercises', { count: totalExercises }), sets: t('common.count.sets', { count: totalSets }) })}
</AppText>
</View>
</View>
@@ -125,7 +129,7 @@ export default function AddProgram() {
) : null}
<View>
- <FieldHeader icon={BookOpen} label={t('programs.form.name')} hint={t('programs.form.required')} />
+ <FieldHeader icon={BookOpen} label={t('programs.form.name')} hint={t('common.required')} />
<Field
value={formData.name}
onChangeText={(text) => setFormData((prev) => ({ ...prev, name: text }))}
@@ -134,7 +138,7 @@ export default function AddProgram() {
</View>
<View>
- <FieldHeader icon={FileText} label={t('workouts.form.notes')} />
+ <FieldHeader icon={FileText} label={t('common.notes')} />
<Field
value={formData.notes}
onChangeText={(text) => setFormData((prev) => ({ ...prev, notes: text }))}
diff --git a/mobile/app/(tabs)/settings/email.tsx b/mobile/app/(tabs)/settings/email.tsx
index f262d02..8fc1f89 100644
--- a/mobile/app/(tabs)/settings/email.tsx
+++ b/mobile/app/(tabs)/settings/email.tsx
@@ -39,7 +39,7 @@ export default function ChangeEmailScreen() {
setCurrent('')
setCaseOnly(onlyCase)
setChangedTo(updated.email)
- }, t('settings.account.email.failedFallback'))
+ }, t('settings.account.email.changeFailed'))
const ready = emailChanged(email, user?.email) && !!current
diff --git a/mobile/app/(tabs)/settings/index.tsx b/mobile/app/(tabs)/settings/index.tsx
index 48beb9e..e320bea 100644
--- a/mobile/app/(tabs)/settings/index.tsx
+++ b/mobile/app/(tabs)/settings/index.tsx
@@ -152,7 +152,7 @@ export default function SettingsScreen() {
// back now; this is what says why.
const changeUnit = useAsyncAction(async (unit: 'lbs' | 'kg') => {
await updateSettings({ weight_unit: unit })
- }, t('settings.targets.weightUnit.changeFailedFallback'))
+ }, t('settings.targets.weightUnit.changeFailedShort'))
const saveServer = async () => {
setTesting(true)
@@ -198,9 +198,9 @@ export default function SettingsScreen() {
}, [deleteAccount.failureKey])
const toastView: { variant: ToastVariant; title: string; description?: string } | null =
- toast === 'saved' ? { variant: 'success', title: t('settings.unitsTargets.saved') }
+ toast === 'saved' ? { variant: 'success', title: t('settings.targets.saved') }
: toast === 'saveTargets' ? { variant: 'error', title: t('settings.targets.saveFailed'), description: saveTargets.error }
- : toast === 'changeUnit' ? { variant: 'error', title: t('settings.unitsTargets.changeUnitFailedTitle'), description: changeUnit.error }
+ : toast === 'changeUnit' ? { variant: 'error', title: t('settings.targets.weightUnit.changeFailedTitle'), description: changeUnit.error }
: toast === 'deleteAccount' ? { variant: 'error', title: t('settings.deleteAccount.failed'), description: deleteAccount.error }
: null
@@ -326,7 +326,7 @@ export default function SettingsScreen() {
}}
options={[
...REST_PRESETS.map((s) => ({ value: String(s), label: t('settings.workout.defaultRest.preset', { seconds: s }) })),
- { value: 'custom', label: restIsCustom ? t('settings.workout.defaultRest.preset', { seconds: restCur }) : t('settings.workout.defaultRest.custom') },
+ { value: 'custom', label: restIsCustom ? t('settings.workout.defaultRest.preset', { seconds: restCur }) : t('workouts.rest.custom') },
]}
/>
{restCustomActive ? (
@@ -370,16 +370,16 @@ export default function SettingsScreen() {
2000/150/250/65 so the rest of the app keeps working, and Save would PUT
those straight over the user's real targets. */}
{settingsLoadFailed ? (
- <SettingsGroup title={t('settings.unitsTargets.title')}>
+ <SettingsGroup title={t('settings.targets.title')}>
<ErrorState
size="section"
- title={t('settings.targets.loadFailedTitle')}
- message={t('settings.unitsTargets.loadFailedMessage')}
+ title={t('settings.targets.loadFailed')}
+ message={t('settings.targets.loadFailedHint')}
onRetry={() => { void fetchSettings() }}
/>
</SettingsGroup>
) : (
- <SettingsGroup title={t('settings.unitsTargets.title')} footnote={t('settings.unitsTargets.footnote')}>
+ <SettingsGroup title={t('settings.targets.title')} footnote={t('settings.targets.footnote')}>
<SettingsRow
icon={Scale}
label={t('settings.targets.weightUnit.label')}
@@ -513,7 +513,7 @@ export default function SettingsScreen() {
title={t('settings.deleteAccount.sheetTitle')}
message={t('settings.deleteAccount.sheetMessage')}
confirmLabel={t('settings.deleteAccount.confirm')}
- busyLabel={t('settings.deleteAccount.busy')}
+ busyLabel={t('common.deleting')}
busy={deleteAccount.busy}
onConfirm={() => { void deleteAccount.run() }}
onCancel={() => setConfirmDelete(false)}
diff --git a/mobile/app/(tabs)/settings/name.tsx b/mobile/app/(tabs)/settings/name.tsx
index 56b9058..ce4e99f 100644
--- a/mobile/app/(tabs)/settings/name.tsx
+++ b/mobile/app/(tabs)/settings/name.tsx
@@ -49,7 +49,7 @@ export default function ChangeNameScreen() {
const save = useAsyncAction(async () => {
await updateSettings({ display_name: name.trim() })
back()
- }, t('settings.account.name.saveFailedFallback'))
+ }, t('settings.account.name.saveFailedRetry'))
return (
<Screen>
@@ -93,7 +93,7 @@ export default function ChangeNameScreen() {
<View className="flex-row gap-2">
<Button
- title={t('settings.account.name.save')}
+ title={t('common.save')}
onPress={() => void save.run()}
loading={save.busy}
disabled={name.trim() === (settings.display_name ?? '')}
diff --git a/mobile/app/(tabs)/settings/password.tsx b/mobile/app/(tabs)/settings/password.tsx
index b6dc4c1..3eb390c 100644
--- a/mobile/app/(tabs)/settings/password.tsx
+++ b/mobile/app/(tabs)/settings/password.tsx
@@ -43,7 +43,7 @@ export default function ChangePasswordScreen() {
await client.userAPI.changePassword({ current_password: current, new_password: next })
setCurrent(''); setNext(''); setConfirm('')
setDone(true)
- }, t('settings.account.password.failedFallback'))
+ }, t('settings.account.password.changeFailed'))
const submit = async () => {
// The rules render under the fields as the user types and the button stays disabled
diff --git a/mobile/app/(tabs)/weight/[id].tsx b/mobile/app/(tabs)/weight/[id].tsx
index 30507a3..6f3aab3 100644
--- a/mobile/app/(tabs)/weight/[id].tsx
+++ b/mobile/app/(tabs)/weight/[id].tsx
@@ -50,7 +50,7 @@ export default function WeightDetail() {
})
.catch((err) => {
setGone(isNotFound(err))
- setError({ key: 'settings.unknownError', cause: err })
+ setError({ key: 'errors.unknown', cause: err })
})
.finally(() => setLoading(false))
// eslint-disable-next-line react-hooks/exhaustive-deps
@@ -76,7 +76,7 @@ export default function WeightDetail() {
Haptics.notificationAsync(Haptics.NotificationFeedbackType.Success).catch(() => {})
setLog(updated)
setEditing(false)
- }, t('weight.detail.saveFailed'))
+ }, t('common.saveFailed'))
// `badWeight` is what this screen can say about the value in the box; the hook carries
// what the server said. The entry is passed to run() because the guard above is what
@@ -196,8 +196,8 @@ export default function WeightDetail() {
<StepperTile
icon={Scale}
- label={t('weight.log.weightLabel', { unit: wUnit })}
- name={t('weight.log.weightName')}
+ label={t('common.weightWithUnit', { unit: wUnit })}
+ name={t('common.weightName')}
step={BODYWEIGHT_STEP}
onStep={(d) => setEditWeight(String(clampStep(parseFloat(editWeight) || 0, d, { min: 0, max: maxWeight(unit) })))}
>
@@ -217,7 +217,7 @@ export default function WeightDetail() {
label={t('weight.detail.notesOptionalPlain')}
value={editNotes}
onChangeText={setEditNotes}
- placeholder={t('weight.detail.notePlaceholder')}
+ placeholder={t('weight.notePlaceholder')}
maxLength={200}
/>
diff --git a/mobile/app/(tabs)/weight/index.tsx b/mobile/app/(tabs)/weight/index.tsx
index 70a2b93..431eda6 100644
--- a/mobile/app/(tabs)/weight/index.tsx
+++ b/mobile/app/(tabs)/weight/index.tsx
@@ -349,8 +349,8 @@ export default function Weight() {
<View className="gap-3">
<StepperTile
icon={Scale}
- label={t('weight.log.weightLabel', { unit: wUnit })}
- name={t('weight.log.weightName')}
+ label={t('common.weightWithUnit', { unit: wUnit })}
+ name={t('common.weightName')}
step={BODYWEIGHT_STEP}
onStep={(d) => setNewWeight(String(clampStep(parseFloat(newWeight) || 0, d, { min: 0, max: maxWeight(unit) })))}
>
@@ -400,7 +400,7 @@ export default function Weight() {
actions={[
{ label: t('common.cancel'), onPress: () => setShowDuplicateWarning(false) },
{
- label: t('weight.log.logAnyway'),
+ label: t('weight.logAnyway'),
primary: true,
onPress: () => {
duplicateWarningDismissedRef.current = true
diff --git a/mobile/app/(tabs)/workouts/[id].tsx b/mobile/app/(tabs)/workouts/[id].tsx
index f4373b6..c8beb9e 100644
--- a/mobile/app/(tabs)/workouts/[id].tsx
+++ b/mobile/app/(tabs)/workouts/[id].tsx
@@ -78,7 +78,7 @@ export default function WorkoutDetail() {
const data = await client.workoutAPI.get(Number(id))
if (!cancelled) setWorkout(data)
} catch (err) {
- if (!cancelled) setError({ key: 'settings.unknownError', cause: err })
+ if (!cancelled) setError({ key: 'errors.unknown', cause: err })
} finally {
if (!cancelled) setLoading(false)
}
@@ -164,7 +164,7 @@ export default function WorkoutDetail() {
{/* Delete confirm — slide-up bottom sheet (mirrors web's portal sheet). */}
<ConfirmSheet
- {...deleteConfirmProps({ title: t('workouts.deleteConfirmTitle'), subject: `"${workout.name}"` })}
+ {...deleteConfirmProps({ title: t('workouts.deleteConfirmTitle'), name: workout.name })}
open={confirming}
busy={remove.busy}
error={remove.error}
@@ -226,7 +226,7 @@ export default function WorkoutDetail() {
{!restOn && (
<View className="flex-row items-center gap-1.5 px-1">
<TimerOff size={13} color={colors.txMuted} />
- <AppText variant="caption" color="muted">{t('workouts.detail.restOff')}</AppText>
+ <AppText variant="caption" color="muted">{t('common.rest.timerOff')}</AppText>
</View>
)}
<View className="gap-3">
@@ -236,7 +236,7 @@ export default function WorkoutDetail() {
const maxWeight = displayWeight(maxWeightLbs, wUnit)
const exVol = displayVolume(exerciseVolume(sets), wUnit)
const setsSummary = [
- t('workouts.detail.setCount', { count: sets.length }),
+ t('common.count.sets', { count: sets.length }),
...(exVol > 0 ? [`${exVol.toLocaleString()} ${wUnit}`] : []),
].join(' · ')
@@ -281,7 +281,7 @@ export default function WorkoutDetail() {
</View>
{restOn && (
ex.rest_seconds === 0 ? (
- <AppText variant="caption" color="muted">{t('workouts.detail.noRest')}</AppText>
+ <AppText variant="caption" color="muted">{t('common.rest.none')}</AppText>
) : (
<View className="flex-row items-center gap-1">
<Pause size={13} color={colors.txMuted} />
diff --git a/mobile/app/(tabs)/workouts/[id]/edit.tsx b/mobile/app/(tabs)/workouts/[id]/edit.tsx
index d2f7360..f9ecb01 100644
--- a/mobile/app/(tabs)/workouts/[id]/edit.tsx
+++ b/mobile/app/(tabs)/workouts/[id]/edit.tsx
@@ -114,7 +114,7 @@ export default function EditWorkout() {
})),
})
})
- .catch((err) => setLoadError({ key: 'settings.unknownError', cause: err }))
+ .catch((err) => setLoadError({ key: 'errors.unknown', cause: err }))
.finally(() => setInitialLoading(false))
// Web effect deps: [id] only — settings are fetched before a user can navigate here.
// eslint-disable-next-line react-hooks/exhaustive-deps
@@ -206,8 +206,12 @@ export default function EditWorkout() {
}, t('workouts.form.updateFailed'))
useEffect(() => {
- if (error || save.error) scrollRef.current?.scrollTo({ y: 0, animated: true })
- }, [error, save.failureKey])
+ if (error) scrollRef.current?.scrollTo({ y: 0, animated: true })
+ }, [error])
+
+ useEffect(() => {
+ if (save.failureKey) scrollRef.current?.scrollTo({ y: 0, animated: true })
+ }, [save.failureKey])
const handleSubmit = async () => {
if (!formData.name.trim()) { setError({ key: 'workouts.form.errors.nameRequired' }); return }
@@ -240,8 +244,8 @@ export default function EditWorkout() {
0
)
const counts = {
- exercises: t('workouts.form.exerciseCount', { count: formData.exercises.length }),
- sets: t('workouts.form.setCount', { count: totalSets }),
+ exercises: t('common.count.exercises', { count: formData.exercises.length }),
+ sets: t('common.count.sets', { count: totalSets }),
}
const summary = totalWeight > 0
? t('workouts.form.summaryWithWeight', { ...counts, weight: Math.round(totalWeight), unit: wUnit })
@@ -306,7 +310,7 @@ export default function EditWorkout() {
</View>
<View>
- <FieldHeader icon={FileText} label={t('workouts.form.notes')} />
+ <FieldHeader icon={FileText} label={t('common.notes')} />
<Field
value={formData.notes}
onChangeText={(text) => setFormData((prev) => ({ ...prev, notes: text }))}
@@ -327,7 +331,7 @@ export default function EditWorkout() {
className="flex-row items-center gap-1.5 rounded-lg bg-brand-500 px-3 py-2 active:scale-95"
>
<Plus size={13} color="#ffffff" />
- <Text className="font-sans-semibold text-xs text-white">{t('workouts.form.addExercise')}</Text>
+ <Text className="font-sans-semibold text-xs text-white">{t('common.addExercise')}</Text>
</Pressable>
</View>
@@ -372,7 +376,7 @@ export default function EditWorkout() {
className="h-11 flex-row items-center justify-center gap-1.5 rounded-2xl border border-dashed border-surface-border active:opacity-60"
>
<Plus size={14} color={accent} />
- <Text className="font-sans-semibold text-xs" style={{ color: accent }}>{t('workouts.form.addExercise')}</Text>
+ <Text className="font-sans-semibold text-xs" style={{ color: accent }}>{t('common.addExercise')}</Text>
</Pressable>
)}
</View>
@@ -385,7 +389,7 @@ export default function EditWorkout() {
-mx-5 lets the divider span edge-to-edge past Screen's px-5. */}
<View className="-mx-5 flex-row gap-3 border-t border-surface-border bg-surface-base px-5 pb-2 pt-3">
<Button title={t('common.cancel')} variant="secondary" className="flex-1" onPress={goBack} />
- <Button title={t('workouts.form.saveChanges')} className="flex-1" onPress={handleSubmit} loading={save.busy} />
+ <Button title={t('common.saveChanges')} className="flex-1" onPress={handleSubmit} loading={save.busy} />
</View>
{/* iOS-only Done bar docked above the numeric keypads (they have no return key). */}
diff --git a/mobile/app/(tabs)/workouts/index.tsx b/mobile/app/(tabs)/workouts/index.tsx
index dd130fd..839ba0e 100644
--- a/mobile/app/(tabs)/workouts/index.tsx
+++ b/mobile/app/(tabs)/workouts/index.tsx
@@ -283,7 +283,7 @@ export default function Workouts() {
<EmptyState
icon={Dumbbell}
title={t('workouts.list.empty.title')}
- subtitle={search ? t('workouts.list.empty.searchHint') : t('workouts.list.empty.startHint')}
+ subtitle={search ? t('common.tryDifferentSearch') : t('workouts.list.empty.startHint')}
/>
)
}
diff --git a/mobile/app/(tabs)/workouts/new.tsx b/mobile/app/(tabs)/workouts/new.tsx
index add3bdb..1a6186b 100644
--- a/mobile/app/(tabs)/workouts/new.tsx
+++ b/mobile/app/(tabs)/workouts/new.tsx
@@ -181,8 +181,12 @@ export default function AddWorkout() {
// Web scrolls the window to top on error; here the ScrollView.
useEffect(() => {
- if (error || save.error) scrollRef.current?.scrollTo({ y: 0, animated: true })
- }, [error, save.failureKey])
+ if (error) scrollRef.current?.scrollTo({ y: 0, animated: true })
+ }, [error])
+
+ useEffect(() => {
+ if (save.failureKey) scrollRef.current?.scrollTo({ y: 0, animated: true })
+ }, [save.failureKey])
const handleSubmit = async () => {
if (!formData.name.trim()) { setError({ key: 'workouts.form.errors.nameRequired' }); return }
@@ -198,8 +202,8 @@ export default function AddWorkout() {
0
)
const counts = {
- exercises: t('workouts.form.exerciseCount', { count: formData.exercises.length }),
- sets: t('workouts.form.setCount', { count: totalSets }),
+ exercises: t('common.count.exercises', { count: formData.exercises.length }),
+ sets: t('common.count.sets', { count: totalSets }),
}
const summary = totalWeight > 0
? t('workouts.form.summaryWithWeight', { ...counts, weight: Math.round(totalWeight), unit: wUnit })
@@ -236,7 +240,7 @@ export default function AddWorkout() {
) : null}
<View>
- <FieldHeader icon={Dumbbell} label={t('workouts.form.name')} hint={t('workouts.form.required')} />
+ <FieldHeader icon={Dumbbell} label={t('workouts.form.name')} hint={t('common.required')} />
<Field
value={formData.name}
onChangeText={(text) => setFormData((prev) => ({ ...prev, name: text }))}
@@ -269,7 +273,7 @@ export default function AddWorkout() {
</View>
<View>
- <FieldHeader icon={FileText} label={t('workouts.form.notes')} />
+ <FieldHeader icon={FileText} label={t('common.notes')} />
<Field
value={formData.notes}
onChangeText={(text) => setFormData((prev) => ({ ...prev, notes: text }))}
@@ -288,7 +292,7 @@ export default function AddWorkout() {
<View className="mb-2.5 flex-row items-center gap-2">
<Zap size={14} color={accent} strokeWidth={2.2} />
<Label>{t('workouts.form.exercises')}</Label>
- <AppText variant="caption" color="muted">{t('workouts.form.required')}</AppText>
+ <AppText variant="caption" color="muted">{t('common.required')}</AppText>
</View>
<View className="flex-row items-center gap-2">
<Pressable
@@ -305,7 +309,7 @@ export default function AddWorkout() {
className="flex-1 flex-row items-center justify-center gap-1.5 rounded-lg bg-brand-500 px-3 py-2.5 active:scale-95"
>
<Plus size={13} color="#ffffff" />
- <Text className="font-sans-semibold text-xs text-white">{t('workouts.form.addExercise')}</Text>
+ <Text className="font-sans-semibold text-xs text-white">{t('common.addExercise')}</Text>
</Pressable>
</View>
</View>
@@ -351,7 +355,7 @@ export default function AddWorkout() {
className="h-11 flex-row items-center justify-center gap-1.5 rounded-2xl border border-dashed border-surface-border active:opacity-60"
>
<Plus size={14} color={accent} />
- <Text className="font-sans-semibold text-xs" style={{ color: accent }}>{t('workouts.form.addExercise')}</Text>
+ <Text className="font-sans-semibold text-xs" style={{ color: accent }}>{t('common.addExercise')}</Text>
</Pressable>
)}
</View>
diff --git a/mobile/app/(tabs)/workouts/start.tsx b/mobile/app/(tabs)/workouts/start.tsx
index 92912c9..764d5a6 100644
--- a/mobile/app/(tabs)/workouts/start.tsx
+++ b/mobile/app/(tabs)/workouts/start.tsx
@@ -31,7 +31,7 @@ export default function StartWorkout() {
client.programAPI
.list()
.then((data) => setPrograms(data || []))
- .catch((err) => setError({ key: 'settings.unknownError', cause: err }))
+ .catch((err) => setError({ key: 'errors.unknown', cause: err }))
.finally(() => setLoading(false))
}, [retryKey])
@@ -115,7 +115,7 @@ export default function StartWorkout() {
{error ? (
<ErrorState
size="section"
- title={t('workouts.start.programsLoadFailed')}
+ title={t('programs.list.loadFailed')}
message={uiMessage(error)}
onRetry={() => { setError(null); setRetryKey((k) => k + 1) }}
/>
@@ -157,7 +157,7 @@ export default function StartWorkout() {
<View className="flex-1">
<AppText variant="bodySemibold" numberOfLines={1}>{p.name}</AppText>
<AppText variant="caption" color="muted" className="mt-0.5">
- {dayCount > 0 ? t('workouts.start.days', { count: dayCount }) : t('workouts.start.noDays')}
+ {dayCount > 0 ? t('common.count.days', { count: dayCount }) : t('workouts.start.noDays')}
</AppText>
</View>
<Play size={16} color={accent} />
diff --git a/mobile/src/components/dashboard/QuickWeighInSheet.tsx b/mobile/src/components/dashboard/QuickWeighInSheet.tsx
index 55b422d..d0984ef 100644
--- a/mobile/src/components/dashboard/QuickWeighInSheet.tsx
+++ b/mobile/src/components/dashboard/QuickWeighInSheet.tsx
@@ -61,7 +61,7 @@ export function QuickWeighInSheet({ open, lastValue, lastLog, onClose, onSuccess
Haptics.notificationAsync(Haptics.NotificationFeedbackType.Success).catch(() => {})
onSuccess(log)
onClose()
- }, t('home.quickWeighIn.saveFailed'))
+ }, t('common.saveFailed'))
const error = rejected === null ? '' : weightError(rejected, unit) ?? ''
@@ -109,7 +109,7 @@ export function QuickWeighInSheet({ open, lastValue, lastLog, onClose, onSuccess
actions={[
{ label: t('common.cancel'), onPress: () => setShowDuplicateWarning(false) },
{
- label: t('home.quickWeighIn.logAnyway'),
+ label: t('weight.logAnyway'),
primary: true,
onPress: () => { setDupDismissed(true); setShowDuplicateWarning(false); submit(true) },
},
@@ -121,8 +121,8 @@ export function QuickWeighInSheet({ open, lastValue, lastLog, onClose, onSuccess
<StepperTile
icon={Scale}
- label={t('home.quickWeighIn.weightWithUnit', { unit: wUnit })}
- name={t('home.quickWeighIn.weightName')}
+ label={t('common.weightWithUnit', { unit: wUnit })}
+ name={t('common.weightName')}
step={BODYWEIGHT_STEP}
onStep={(d) => setValue(String(clampStep(parseFloat(value) || 0, d, { min: 0, max: maxWeight(unit) })))}
>
@@ -147,7 +147,7 @@ export function QuickWeighInSheet({ open, lastValue, lastLog, onClose, onSuccess
label={t('home.quickWeighIn.noteOptional')}
value={notes}
onChangeText={setNotes}
- placeholder={t('home.quickWeighIn.notePlaceholder')}
+ placeholder={t('weight.notePlaceholder')}
maxLength={200}
/>
</View>
diff --git a/mobile/src/components/nutrition/FoodEntryRow.tsx b/mobile/src/components/nutrition/FoodEntryRow.tsx
index aba7719..55c0ec5 100644
--- a/mobile/src/components/nutrition/FoodEntryRow.tsx
+++ b/mobile/src/components/nutrition/FoodEntryRow.tsx
@@ -126,7 +126,7 @@ export function FoodEntryRow({ entry, first, onPress, onEdit, onDeleted }: Props
/>
<ConfirmSheet
- {...deleteConfirmProps({ title: t('food.entry.deleteTitle'), subject: `"${entry.name}"` })}
+ {...deleteConfirmProps({ title: t('food.entry.deleteTitle'), name: entry.name })}
open={confirming}
busy={remove.busy}
error={remove.error}
diff --git a/mobile/src/components/nutrition/FoodResultRow.test.tsx b/mobile/src/components/nutrition/FoodResultRow.test.tsx
index 7fcd1ea..54ae8f3 100644
--- a/mobile/src/components/nutrition/FoodResultRow.test.tsx
+++ b/mobile/src/components/nutrition/FoodResultRow.test.tsx
@@ -37,7 +37,7 @@ describe('FoodResultRow copy', () => {
await i18n.changeLanguage('es')
const view = render(<FoodResultRow item={item()} onPress={() => {}} favorited={false} onToggleFavorite={() => {}} />)
try {
- expect(screen.getByLabelText('Añadir Chicken Breast a Favoritos')).toBeTruthy()
+ expect(screen.getByLabelText('Agregar Chicken Breast a favoritos')).toBeTruthy()
expect(screen.getByText('31g P')).toBeTruthy()
expect(screen.getByText('4g G')).toBeTruthy()
expect(screen.queryByLabelText(ADD)).toBeNull()
diff --git a/mobile/src/components/nutrition/nutritionMeta.test.ts b/mobile/src/components/nutrition/nutritionMeta.test.ts
index 374e440..fad8df9 100644
--- a/mobile/src/components/nutrition/nutritionMeta.test.ts
+++ b/mobile/src/components/nutrition/nutritionMeta.test.ts
@@ -1,5 +1,5 @@
import { i18n } from '@lyftr/shared'
-import { MACRO_TEXT, MEAL_COLORS, MEALS, mealLabel } from './nutritionMeta'
+import { MACRO_TEXT, MEAL_COLORS, MEALS, mealLabel, mealMessage } from './nutritionMeta'
// This suite also acts as a canary: nutritionMeta imports lucide-react-native (ESM), so
// a green run here proves jest.config's transformIgnorePatterns whitelist is correct.
@@ -15,6 +15,17 @@ describe('nutritionMeta', () => {
expect(MEALS.map(mealLabel)).toEqual(['Desayuno', 'Almuerzo', 'Cena', 'Snacks'])
})
+ it('renders an unknown meal blank, not as its catalog key', () => {
+ expect(mealLabel('xyz' as never)).toBe('')
+ })
+
+ it('words the added-to toast at render, so a language switch re-translates it', async () => {
+ const toast = { key: 'food.diary.addedTo' as const, params: { meal: 'lunch' } }
+ expect(mealMessage(toast)).toBe('Added to Lunch')
+ await i18n.changeLanguage('es')
+ expect(mealMessage(toast)).toBe('Agregado a Almuerzo')
+ })
+
it('has a color for every meal', () => {
for (const meal of MEALS) {
expect(MEAL_COLORS[meal]).toMatch(/^#[0-9a-f]{6}$/i)
diff --git a/mobile/src/components/nutrition/nutritionMeta.ts b/mobile/src/components/nutrition/nutritionMeta.ts
index 50b68aa..15e72bd 100644
--- a/mobile/src/components/nutrition/nutritionMeta.ts
+++ b/mobile/src/components/nutrition/nutritionMeta.ts
@@ -1,5 +1,5 @@
import { Coffee, Cookie, Moon, Sun, type LucideIcon } from 'lucide-react-native'
-import { i18n, type FoodLog } from '@lyftr/shared'
+import { i18n, uiMessage, type FoodLog, type UiMessage } from '@lyftr/shared'
// Meal + macro presentation constants, ported 1:1 from web (Food.tsx / LogFood.tsx +
// utils/macroColors.ts). Web expressed colors as Tailwind text-* classes; on native
@@ -10,7 +10,13 @@ export type Meal = FoodLog['meal']
export const MEALS: readonly Meal[] = ['breakfast', 'lunch', 'dinner', 'snacks']
-export const mealLabel = (meal: Meal): string => i18n.t(`food.meal.${meal}`)
+// A meal outside the list renders blank, not as the raw catalog key.
+export const mealLabel = (meal: Meal): string => (MEALS.includes(meal) ? i18n.t(`food.meal.${meal}`) : '')
+
+// A toast that names a meal carries the slug in params.meal and is worded here, at render,
+// so a language switch while it is on screen re-translates it.
+export const mealMessage = (m: UiMessage): string =>
+ uiMessage(m.params?.meal ? { ...m, params: { ...m.params, meal: mealLabel(m.params.meal as Meal) } } : m)
export const MEAL_ICONS: Record<Meal, LucideIcon> = {
breakfast: Coffee,
diff --git a/mobile/src/components/programs/DayExercisesEditor.tsx b/mobile/src/components/programs/DayExercisesEditor.tsx
index aeec3fe..9ec111e 100644
--- a/mobile/src/components/programs/DayExercisesEditor.tsx
+++ b/mobile/src/components/programs/DayExercisesEditor.tsx
@@ -83,7 +83,7 @@ export function DayExercisesEditor({
className="mb-3 flex-row items-center justify-center gap-1.5 rounded-lg bg-brand-500 px-3 py-2.5 active:scale-95"
>
<Plus size={13} color="#ffffff" />
- <Text className="font-sans-semibold text-xs text-white">{t('workouts.form.addExercise')}</Text>
+ <Text className="font-sans-semibold text-xs text-white">{t('common.addExercise')}</Text>
</Pressable>
{exercises.length === 0 ? (
@@ -117,7 +117,7 @@ export function DayExercisesEditor({
className="h-11 flex-row items-center justify-center gap-1.5 rounded-2xl border border-dashed border-surface-border active:opacity-60"
>
<Plus size={14} color={accent} />
- <Text className="font-sans-semibold text-xs" style={{ color: accent }}>{t('workouts.form.addExercise')}</Text>
+ <Text className="font-sans-semibold text-xs" style={{ color: accent }}>{t('common.addExercise')}</Text>
</Pressable>
</View>
)}
diff --git a/mobile/src/components/programs/DayPickerSheet.tsx b/mobile/src/components/programs/DayPickerSheet.tsx
index b81f843..1961013 100644
--- a/mobile/src/components/programs/DayPickerSheet.tsx
+++ b/mobile/src/components/programs/DayPickerSheet.tsx
@@ -57,12 +57,12 @@ export function DayPickerSheet({ program, onSelect, onClose }: Props) {
<AppText variant="bodySemibold">{dayLabel(day, day.order_index)}</AppText>
{day.id === todayId ? (
<View className="rounded-full bg-brand-500/15 px-1.5 py-0.5">
- <AppText variant="caption" style={{ color: accent }}>{t('programs.detail.todayChip')}</AppText>
+ <AppText variant="caption" style={{ color: accent }}>{t('common.todayChip')}</AppText>
</View>
) : null}
</View>
}
- secondary={t('programs.count.exercises', { count: (day.exercises ?? []).length })}
+ secondary={t('common.count.exercises', { count: (day.exercises ?? []).length })}
right={<Dumbbell size={16} color={accent} />}
onPress={() => onSelect(program, day)}
/>
diff --git a/mobile/src/components/programs/ProgramCard.tsx b/mobile/src/components/programs/ProgramCard.tsx
index ee3ca7e..8734c45 100644
--- a/mobile/src/components/programs/ProgramCard.tsx
+++ b/mobile/src/components/programs/ProgramCard.tsx
@@ -87,12 +87,12 @@ export function ProgramCard({ program, onPress, onDeleted }: Props) {
<View className="mt-0.5 flex-row items-center gap-x-2 flex-wrap">
<View className="flex-row items-center gap-1">
<Dumbbell size={12} color={colors.txMuted} />
- <AppText variant="caption" color="muted" numberOfLines={1}>{t('programs.count.exercises', { count: exCount })}</AppText>
+ <AppText variant="caption" color="muted" numberOfLines={1}>{t('common.count.exercises', { count: exCount })}</AppText>
</View>
<AppText variant="caption" color="muted">·</AppText>
<View className="flex-row items-center gap-1">
<Layers size={12} color={colors.txMuted} />
- <AppText variant="caption" color="muted" numberOfLines={1}>{t('programs.count.sets', { count: totalSets })}</AppText>
+ <AppText variant="caption" color="muted" numberOfLines={1}>{t('common.count.sets', { count: totalSets })}</AppText>
</View>
{dayCount > 1 && today ? (
<>
@@ -149,8 +149,8 @@ export function ProgramCard({ program, onPress, onDeleted }: Props) {
<AppText variant="subheading" numberOfLines={1}>{program.name}</AppText>
<AppText variant="caption" color="muted" numberOfLines={1} className="mt-0.5">
{t('programs.card.summary', {
- exercises: t('programs.count.exercises', { count: exCount }),
- sets: t('programs.count.sets', { count: totalSets }),
+ exercises: t('common.count.exercises', { count: exCount }),
+ sets: t('common.count.sets', { count: totalSets }),
})}
</AppText>
</View>
@@ -163,7 +163,7 @@ export function ProgramCard({ program, onPress, onDeleted }: Props) {
/>
<ConfirmSheet
- {...deleteConfirmProps({ title: t('programs.deleteConfirmTitle'), subject: `"${program.name}"` })}
+ {...deleteConfirmProps({ title: t('programs.deleteConfirmTitle'), name: program.name })}
open={confirming}
busy={remove.busy}
error={remove.error}
diff --git a/mobile/src/components/programs/ProgramDaysEditor.test.tsx b/mobile/src/components/programs/ProgramDaysEditor.test.tsx
index 541d079..9773963 100644
--- a/mobile/src/components/programs/ProgramDaysEditor.test.tsx
+++ b/mobile/src/components/programs/ProgramDaysEditor.test.tsx
@@ -52,8 +52,8 @@ describe('ProgramDaysEditor', () => {
/>
)
try {
- expect(screen.getByText('Agregar día de entrenamiento')).toBeTruthy()
- expect(screen.getByText('Agregar día de descanso')).toBeTruthy()
+ expect(screen.getByText('Día de entrenamiento')).toBeTruthy()
+ expect(screen.getByText('Día de descanso')).toBeTruthy()
expect(screen.getByText('1 ejercicio')).toBeTruthy()
expect(screen.getAllByLabelText('Quitar día')).toHaveLength(2)
expect(screen.getByLabelText('Subir el día 1')).toBeTruthy()
diff --git a/mobile/src/components/programs/ProgramDaysEditor.tsx b/mobile/src/components/programs/ProgramDaysEditor.tsx
index 96d5ebf..a30437a 100644
--- a/mobile/src/components/programs/ProgramDaysEditor.tsx
+++ b/mobile/src/components/programs/ProgramDaysEditor.tsx
@@ -112,7 +112,7 @@ export function ProgramDaysEditor({
className="flex-row items-center justify-between border-t border-surface-border/60 px-3 py-2.5 active:bg-surface-muted/40"
>
<AppText variant="caption" color="muted">
- {t('programs.count.exercises', { count: day.exercises.length })}
+ {t('common.count.exercises', { count: day.exercises.length })}
</AppText>
{isOpen ? <ChevronDown size={14} color={colors.txMuted} /> : <ChevronRight size={14} color={colors.txMuted} />}
</Pressable>
diff --git a/mobile/src/components/settings/LanguageSheet.test.tsx b/mobile/src/components/settings/LanguageSheet.test.tsx
index 136269c..6bcc321 100644
--- a/mobile/src/components/settings/LanguageSheet.test.tsx
+++ b/mobile/src/components/settings/LanguageSheet.test.tsx
@@ -72,3 +72,16 @@ describe('filterLanguages', () => {
expect(filterLanguages(LANGUAGE_ORDER, q)).toEqual(want)
})
})
+
+describe('filterLanguages without String.prototype.normalize', () => {
+ it('falls back to a plain lowercase match instead of throwing', () => {
+ const spy = jest.spyOn(String.prototype, 'normalize').mockImplementation(() => {
+ throw new RangeError('unsupported')
+ })
+ try {
+ expect(filterLanguages(LANGUAGE_ORDER, 'ESP')).toEqual(['es'])
+ } finally {
+ spy.mockRestore()
+ }
+ })
+})
diff --git a/mobile/src/components/settings/LanguageSheet.tsx b/mobile/src/components/settings/LanguageSheet.tsx
index 659b554..d437e9e 100644
--- a/mobile/src/components/settings/LanguageSheet.tsx
+++ b/mobile/src/components/settings/LanguageSheet.tsx
@@ -16,7 +16,15 @@ import { useTheme } from '../../theme/useTheme'
// About 7 rows of ~48px fit in the 360px list below; search appears once the list stops fitting.
export const LANGUAGE_SEARCH_FROM = 8
-const fold = (s: string) => s.normalize('NFD').replace(/[̀-ͯ]/g, '').toLowerCase()
+// normalize() is missing or throws on some Hermes builds; plain lowercase still matches
+// every unaccented query.
+const fold = (s: string) => {
+ try {
+ return s.normalize('NFD').replace(/[̀-ͯ]/g, '').toLowerCase()
+ } catch {
+ return s.toLowerCase()
+ }
+}
export function filterLanguages(codes: readonly Language[], query: string): Language[] {
const q = fold(query.trim())
diff --git a/mobile/src/components/ui/sheetActions.ts b/mobile/src/components/ui/sheetActions.ts
index 20d8150..70d709b 100644
--- a/mobile/src/components/ui/sheetActions.ts
+++ b/mobile/src/components/ui/sheetActions.ts
@@ -18,16 +18,19 @@ export function deleteAction(onPress: () => void, label = i18n.t('common.delete'
}
// The static half of a delete ConfirmSheet — red trash badge, "Delete" / "Deleting…"
-// labels, and the standard "<subject> will be permanently deleted." message. Spread it
+// labels, and the standard "<subject> will be permanently deleted." message (pass a
+// `name` instead of a `subject` and the catalog puts the quotes around it). Spread it
// and add the stateful props (open / busy / onConfirm / onCancel):
-// <ConfirmSheet {...deleteConfirmProps({ title: 'Delete Workout?', subject: `"${name}"` })}
+// <ConfirmSheet {...deleteConfirmProps({ title: 'Delete Workout?', name })}
// open={confirming} busy={deleting} onConfirm={handleDelete} onCancel={close} />
export function deleteConfirmProps(
- { title, subject }: { title: string; subject: string },
+ { title, ...who }: { title: string } & ({ subject: string } | { name: string }),
): Pick<ConfirmSheetProps, 'title' | 'message' | 'confirmLabel' | 'busyLabel' | 'destructive' | 'icon'> {
return {
title,
- message: i18n.t('common.deleteConfirmMessage', { subject }),
+ message: 'name' in who
+ ? i18n.t('common.deleteNamedConfirmMessage', { name: who.name })
+ : i18n.t('common.deleteConfirmMessage', { subject: who.subject }),
confirmLabel: i18n.t('common.delete'),
busyLabel: i18n.t('common.deleting'),
destructive: true,
diff --git a/mobile/src/components/workouts/ActiveExerciseCard.tsx b/mobile/src/components/workouts/ActiveExerciseCard.tsx
index 5b28d3a..af4a0a0 100644
--- a/mobile/src/components/workouts/ActiveExerciseCard.tsx
+++ b/mobile/src/components/workouts/ActiveExerciseCard.tsx
@@ -141,7 +141,7 @@ function ActiveExerciseCardBase({
<View className="flex-row items-center gap-2 px-1">
<View className="w-8 items-center"><AppText variant="caption" color="muted">{t('workouts.active.columns.set')}</AppText></View>
<View className="flex-1 items-center"><AppText variant="caption" color="muted">{t('workouts.active.columns.reps')}</AppText></View>
- <View className="flex-1 items-center"><AppText variant="caption" color="muted">{t('workouts.active.columns.weightUnit', { unit: wUnit })}</AppText></View>
+ <View className="flex-1 items-center"><AppText variant="caption" color="muted">{t('common.weightWithUnit', { unit: wUnit })}</AppText></View>
<View className="w-12 items-center"><AppText variant="caption" color="muted">{t('workouts.active.columns.done')}</AppText></View>
<View className="w-7" />
</View>
diff --git a/mobile/src/components/workouts/ExerciseDetailScreen.tsx b/mobile/src/components/workouts/ExerciseDetailScreen.tsx
index 85304d1..c32a12f 100644
--- a/mobile/src/components/workouts/ExerciseDetailScreen.tsx
+++ b/mobile/src/components/workouts/ExerciseDetailScreen.tsx
@@ -127,7 +127,7 @@ export function ExerciseDetailScreen({ backFallback }: { backFallback: Href }) {
setPR(prData)
setHistory(histData || [])
})
- .catch((err) => { if (!cancelled) setError({ key: 'settings.unknownError', cause: err }) })
+ .catch((err) => { if (!cancelled) setError({ key: 'errors.unknown', cause: err }) })
.finally(() => { if (!cancelled) setLoading(false) })
return () => { cancelled = true }
// eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/mobile/src/components/workouts/ExerciseFormCard.tsx b/mobile/src/components/workouts/ExerciseFormCard.tsx
index 7abe054..6a1d243 100644
--- a/mobile/src/components/workouts/ExerciseFormCard.tsx
+++ b/mobile/src/components/workouts/ExerciseFormCard.tsx
@@ -146,7 +146,7 @@ function ExerciseFormCardBase({
<View className="flex-row items-center gap-2">
<View className={`${COL_SET} items-center`}><Label>{t('workouts.form.set')}</Label></View>
<View className="flex-1 items-center"><Label>{t('workouts.form.reps')}</Label></View>
- <View className="flex-1 items-center"><Label>{t('workouts.form.weightWithUnit', { unit })}</Label></View>
+ <View className="flex-1 items-center"><Label>{t('common.weightWithUnit', { unit })}</Label></View>
<View className={COL_DELETE} />
</View>
{sets.map((set, setIdx) => (
diff --git a/mobile/src/components/workouts/ExercisePicker.tsx b/mobile/src/components/workouts/ExercisePicker.tsx
index 1cef848..7c14c06 100644
--- a/mobile/src/components/workouts/ExercisePicker.tsx
+++ b/mobile/src/components/workouts/ExercisePicker.tsx
@@ -178,7 +178,7 @@ export function ExercisePicker({ selectedIds, onSelect, onClose }: Props) {
) : hasMore && available.length > 0 ? (
<View className="flex-row items-center justify-center gap-2 py-4">
<ActivityIndicator color={accent} />
- <AppText variant="caption" color="muted">{t('exercises.picker.loadingMore')}</AppText>
+ <AppText variant="caption" color="muted">{t('common.loadingMore')}</AppText>
</View>
) : null
}
diff --git a/mobile/src/components/workouts/GymModeWorkout.tsx b/mobile/src/components/workouts/GymModeWorkout.tsx
index fd5bee0..e288a9a 100644
--- a/mobile/src/components/workouts/GymModeWorkout.tsx
+++ b/mobile/src/components/workouts/GymModeWorkout.tsx
@@ -288,7 +288,7 @@ export function GymModeWorkout() {
<AppText variant="bodySemibold" numberOfLines={1}>{ex.exercise.name}</AppText>
<View className="mt-0.5 flex-row items-center gap-2">
<MuscleBadge muscle={ex.exercise.muscle_group} small />
- <AppText variant="caption" color="muted">{t('workouts.detail.setCount', { count: ex.sets.length })}</AppText>
+ <AppText variant="caption" color="muted">{t('common.count.sets', { count: ex.sets.length })}</AppText>
</View>
</View>
{done ? <CheckCircle2 size={16} color={accent} /> : null}
@@ -517,7 +517,7 @@ export function GymModeWorkout() {
{/* target reference */}
{set.target_reps > 0 || set.target_weight > 0 ? (
<AppText variant="body" color="muted" className="text-center">
- {t('gym.target.label')}{' '}<Text className="font-sans-semibold" style={{ color: colors.txSecondary, fontVariant: ['tabular-nums'] }}>{set.target_reps > 0 ? t('gym.target.reps', { count: set.target_reps }) : t('gym.target.repsUnknown')}</Text>
+ {t('gym.target.label')}{' '}<Text className="font-sans-semibold" style={{ color: colors.txSecondary, fontVariant: ['tabular-nums'] }}>{set.target_reps > 0 ? t('common.count.reps', { count: set.target_reps }) : t('gym.target.repsUnknown')}</Text>
{set.target_weight > 0 ? <Text> · <Text className="font-sans-semibold" style={{ color: colors.txSecondary, fontVariant: ['tabular-nums'] }}>{displayWeight(set.target_weight, wUnit)} {wUnit}</Text></Text> : null}
</AppText>
) : null}
@@ -530,7 +530,7 @@ export function GymModeWorkout() {
</StepperTile>
</View>
<View className="flex-1">
- <StepperTile icon={Dumbbell} label={t('workouts.form.weightWithUnit', { unit: wUnit })} name={t('weight.log.weightName')} step={PLATE_STEP} disabled={set.completed} onStep={(d) => updateSet(activeIdx, clampedSetIdx, 'actual_weight', displayToLbs(clampStep(displayWeight(set.actual_weight, wUnit), d, { min: 0 }), settings.weight_unit))}>
+ <StepperTile icon={Dumbbell} label={t('common.weightWithUnit', { unit: wUnit })} name={t('common.weightName')} step={PLATE_STEP} disabled={set.completed} onStep={(d) => updateSet(activeIdx, clampedSetIdx, 'actual_weight', displayToLbs(clampStep(displayWeight(set.actual_weight, wUnit), d, { min: 0 }), settings.weight_unit))}>
<NumberField key={`wt-${activeIdx}-${clampedSetIdx}`} inputMode="decimal" value={set.actual_weight ? String(displayWeight(set.actual_weight, wUnit)) : ''} onChange={(v) => updateSet(activeIdx, clampedSetIdx, 'actual_weight', displayToLbs(clampValue(v), settings.weight_unit))} placeholder={set.target_weight > 0 ? String(displayWeight(set.target_weight, wUnit)) : '0'} disabled={set.completed} accessibilityLabel={t('gym.labels.weight')} inputAccessoryViewID={NUMERIC_ACCESSORY_ID} />
</StepperTile>
</View>
diff --git a/mobile/src/components/workouts/ProgramPicker.tsx b/mobile/src/components/workouts/ProgramPicker.tsx
index d91c36b..b326702 100644
--- a/mobile/src/components/workouts/ProgramPicker.tsx
+++ b/mobile/src/components/workouts/ProgramPicker.tsx
@@ -88,12 +88,12 @@ export function ProgramPicker({ onSelect, onClose }: Props) {
<AppText variant="subheading" numberOfLines={1}>{dayLabel(day, day.order_index)}</AppText>
{isToday ? (
<View className="rounded-full bg-brand-500/15 px-1.5 py-0.5">
- <AppText variant="caption" style={{ color: accent }}>{t('workouts.form.programPicker.today')}</AppText>
+ <AppText variant="caption" style={{ color: accent }}>{t('common.todayChip')}</AppText>
</View>
) : null}
</View>
<AppText variant="caption" color="muted" numberOfLines={1} className="mt-0.5">
- {t('workouts.form.exerciseCount', { count: (day.exercises ?? []).length })}
+ {t('common.count.exercises', { count: (day.exercises ?? []).length })}
</AppText>
</View>
<ChevronRight size={16} color={colors.txMuted} />
@@ -107,7 +107,7 @@ export function ProgramPicker({ onSelect, onClose }: Props) {
<Field
value={query}
onChangeText={setQuery}
- placeholder={t('workouts.form.programPicker.searchPlaceholder')}
+ placeholder={t('programs.list.searchPlaceholder')}
autoCapitalize="none"
autoCorrect={false}
returnKeyType="search"
@@ -121,7 +121,7 @@ export function ProgramPicker({ onSelect, onClose }: Props) {
</View>
) : error ? (
<ErrorState
- title={t('workouts.start.programsLoadFailed')}
+ title={t('programs.list.loadFailed')}
message={uiMessage(error)}
onRetry={() => setRetryKey((k) => k + 1)}
/>
@@ -130,7 +130,7 @@ export function ProgramPicker({ onSelect, onClose }: Props) {
compact
icon={BookOpen}
title={query ? t('workouts.form.programPicker.noMatches') : t('workouts.start.noPrograms')}
- subtitle={query ? t('workouts.list.empty.searchHint') : t('workouts.form.programPicker.createFirst')}
+ subtitle={query ? t('common.tryDifferentSearch') : t('workouts.form.programPicker.createFirst')}
/>
) : (
<FlatList
diff --git a/mobile/src/components/workouts/SessionPill.tsx b/mobile/src/components/workouts/SessionPill.tsx
index 40309b6..56b2e64 100644
--- a/mobile/src/components/workouts/SessionPill.tsx
+++ b/mobile/src/components/workouts/SessionPill.tsx
@@ -46,11 +46,11 @@ export function SessionPill() {
</View>
<View>
<Text className="font-sans-bold text-xs text-white" numberOfLines={1} style={{ maxWidth: 140 }}>{session.name}</Text>
- <Text className="text-[11px] text-white/70">{t('nav.session.sets', { done: completedSets, total: totalSets })} · {formatElapsed(elapsed)}</Text>
+ <Text className="text-[11px] text-white/70">{t('workouts.active.setProgress', { done: completedSets, total: totalSets })} · {formatElapsed(elapsed)}</Text>
</View>
{resting ? (
<View className="flex-row items-center gap-1.5 rounded-full bg-white/15 py-1 pl-2.5 pr-1">
- <Text className="text-[10px] font-sans-semibold uppercase text-white/70">{done ? t('nav.session.restOver') : paused ? t('nav.session.paused') : t('nav.session.rest')}</Text>
+ <Text className="text-[10px] font-sans-semibold uppercase text-white/70">{done ? t('workouts.rest.label.over') : paused ? t('workouts.rest.label.paused') : t('nav.session.rest')}</Text>
{!done ? <Text className="font-sans-bold text-xs text-white" style={{ fontVariant: ['tabular-nums'] }}>{fmtClock(left)}</Text> : null}
</View>
) : null}
diff --git a/mobile/src/components/workouts/WorkoutCard.tsx b/mobile/src/components/workouts/WorkoutCard.tsx
index aa51d24..f997090 100644
--- a/mobile/src/components/workouts/WorkoutCard.tsx
+++ b/mobile/src/components/workouts/WorkoutCard.tsx
@@ -39,7 +39,7 @@ export function WorkoutCard({ workout, unit, onPress, onDeleted }: Props) {
unit
)
- const exerciseCount = t('workouts.card.exercises', { count: workout.exercises?.length || 0 })
+ const exerciseCount = t('common.count.exercises', { count: workout.exercises?.length || 0 })
const headerMeta = [
formatDay(workoutDay(workout), 'monthDayYear'),
...(durationMin > 0 ? [t('workouts.card.minutes', { minutes: durationMin })] : []),
@@ -141,7 +141,7 @@ export function WorkoutCard({ workout, unit, onPress, onDeleted }: Props) {
/>
<ConfirmSheet
- {...deleteConfirmProps({ title: t('workouts.deleteConfirmTitle'), subject: `"${workout.name}"` })}
+ {...deleteConfirmProps({ title: t('workouts.deleteConfirmTitle'), name: workout.name })}
open={confirming}
busy={remove.busy}
error={remove.error}
diff --git a/packages/shared/src/i18n/locales/README.md b/packages/shared/src/i18n/locales/README.md
index 66fea3d..0be7669 100644
--- a/packages/shared/src/i18n/locales/README.md
+++ b/packages/shared/src/i18n/locales/README.md
@@ -35,7 +35,7 @@ Use the same word for the same thing everywhere, so the app reads as one voice:
| Rest | descanso |
| Rest day | día de descanso |
| Gym Mode | Modo gimnasio |
-| countdown | cuenta atrás |
+| countdown | cuenta regresiva |
| Program | programa |
| Exercise | ejercicio |
| Food, a meal | comida (a food item: alimento) |
diff --git a/packages/shared/src/i18n/locales/en.json b/packages/shared/src/i18n/locales/en.json
index b53a5bf..125abc0 100644
--- a/packages/shared/src/i18n/locales/en.json
+++ b/packages/shared/src/i18n/locales/en.json
@@ -4,7 +4,6 @@
"subtitle": "Preferences and account configuration",
"back": "Home",
"saved": "Settings saved successfully",
- "unknownError": "The server didn't say what went wrong.",
"language": {
"label": "Language",
"description": "Defaults to your device language",
@@ -19,12 +18,10 @@
"description": "The name the app greets you by. Leave it empty and we'll use your email instead.",
"loadFailed": "Couldn't load your name, so we won't offer to overwrite it.",
"saveFailed": "Couldn't save your name.",
- "save": "Save",
- "saving": "Saving…",
"title": "Name",
"subtitle": "The name the app greets you by.",
"emptyHint": "Leave it empty and we'll use your email instead.",
- "saveFailedFallback": "Couldn't save your name. Please try again."
+ "saveFailedRetry": "Couldn't save your name. Please try again."
},
"email": {
"label": "Email",
@@ -36,12 +33,12 @@
"current": "Current email",
"new": "New email",
"submit": "Update email",
- "failedFallback": "Couldn't change your email. Please try again.",
"changedTitle": "Email changed",
"signInWith": "Sign in with <email>{{email}}</email> from now on.",
"signInWithPlain": "Sign in with {{email}} from now on.",
"caseOnly": "Only the letter case changed, so your other devices stay signed in.",
- "signedOutElsewhere": "You stay signed in here; your other devices are signed out."
+ "signedOutElsewhere": "You stay signed in here; your other devices are signed out.",
+ "changeFailed": "Couldn't change your email. Please try again."
},
"memberSince": {
"label": "Member since"
@@ -56,9 +53,9 @@
"pageTitle": "Change password",
"pageSubtitle": "You will stay signed in here. Every other device is signed out.",
"submit": "Update password",
- "failedFallback": "Couldn't change your password. Please try again.",
"changedTitle": "Password changed",
- "changedBody": "You are still signed in here. Every other device has been signed out and will need the new password."
+ "changedBody": "You are still signed in here. Every other device has been signed out and will need the new password.",
+ "changeFailed": "Couldn't change your password. Please try again."
},
"backLink": "Settings",
"backToSettings": "Back to settings",
@@ -100,33 +97,18 @@
"label": "Default rest",
"description": "Seeds new exercises · per-exercise rest overrides it",
"preset": "{{seconds}}s",
- "custom": "Custom",
"customLabel": "Custom rest seconds",
- "secondsUnit": "sec",
- "minusFive": "−5 seconds",
- "plusFive": "+5 seconds",
"decrease": "Decrease rest by 5 seconds",
"increase": "Increase rest by 5 seconds"
}
},
- "goalsUnits": {
- "title": "Goals & Units",
- "loadFailedMessage": "These are your saved targets and units, so we won't guess at them. Everything else on this page still works."
- },
- "unitsTargets": {
- "title": "Units & Targets",
- "footnote": "Weight unit applies instantly across the app. Nutrition targets power the dashboard rings.",
- "loadFailedMessage": "These are your saved targets and units, so we won't guess at them. Everything else here still works.",
- "saved": "Targets saved",
- "changeUnitFailedTitle": "Could not change units"
- },
"targets": {
- "loadFailedTitle": "Couldn't load your goals",
"weightUnit": {
"label": "Weight unit",
"description": "Changes apply immediately across the app",
"changeFailed": "Couldn't change the weight unit.",
- "changeFailedFallback": "Could not change the weight unit"
+ "changeFailedTitle": "Could not change units",
+ "changeFailedShort": "Could not change the weight unit"
},
"calorie": {
"label": "Calorie target",
@@ -146,9 +128,15 @@
},
"saveHint": "Save calorie and macro targets",
"save": "Save targets",
- "saving": "Saving...",
- "saveFailedFallback": "Failed to save settings",
- "saveFailed": "Could not save targets"
+ "saving": "Saving…",
+ "saveFailed": "Could not save targets",
+ "titleWeb": "Goals & Units",
+ "loadFailedHintWeb": "These are your saved targets and units, so we won't guess at them. Everything else on this page still works.",
+ "title": "Units & Targets",
+ "footnote": "Weight unit applies instantly across the app. Nutrition targets power the dashboard rings.",
+ "loadFailedHint": "These are your saved targets and units, so we won't guess at them. Everything else here still works.",
+ "saved": "Targets saved",
+ "loadFailed": "Couldn't load your goals"
},
"server": {
"title": "Server",
@@ -194,10 +182,10 @@
"cleared_one": "Cleared {{amount}} unused exercise",
"cleared_other": "Cleared {{amount}} unused exercises",
"refresh": "Refresh cached",
- "refreshing": "Refreshing...",
+ "refreshing": "Refreshing…",
"refreshFailed": "Couldn't refresh the cache.",
"clear": "Clear unused",
- "clearing": "Clearing...",
+ "clearing": "Clearing…",
"clearFailed": "Couldn't clear the cache."
},
"danger": {
@@ -212,16 +200,14 @@
"deleteAccount": {
"label": "Delete account",
"description": "Permanently delete all your data",
- "button": "Delete",
"sheetTitle": "Delete account?",
"sheetMessage": "This permanently deletes your account and all of your data. This can't be undone.",
"confirm": "Delete account",
- "busy": "Deleting…",
"failed": "Could not delete account"
- }
+ },
+ "saveFailed": "Failed to save settings"
},
"common": {
- "there": "there",
"duration": {
"seconds": "{{value}}s",
"minutes": "{{value}}m"
@@ -255,6 +241,7 @@
"delete": "Delete",
"deleting": "Deleting…",
"deleteConfirmMessage": "{{subject}} will be permanently deleted.",
+ "deleteNamedConfirmMessage": "\"{{name}}\" will be permanently deleted.",
"dismiss": "Dismiss",
"done": "Done",
"dismissKeyboard": "Dismiss keyboard",
@@ -273,7 +260,38 @@
"back": "Back",
"goBack": "Go back",
"save": "Save",
- "saving": "Saving…"
+ "saving": "Saving…",
+ "count": {
+ "exercises_one": "{{count}} exercise",
+ "exercises_other": "{{count}} exercises",
+ "sets_one": "{{count}} set",
+ "sets_other": "{{count}} sets",
+ "reps_one": "{{count}} rep",
+ "reps_other": "{{count}} reps",
+ "days_one": "{{count}} day",
+ "days_other": "{{count}} days"
+ },
+ "weightWithUnit": "Weight ({{unit}})",
+ "weightName": "weight",
+ "loadingMore": "Loading more…",
+ "tryDifferentSearch": "Try a different search",
+ "required": "(required)",
+ "saveFailed": "Failed to save",
+ "todayChip": "TODAY",
+ "card": {
+ "deleteNamed": "Delete \"{{name}}\"?",
+ "cannotUndo": "This cannot be undone"
+ },
+ "rest": {
+ "decrease5": "−5 seconds",
+ "increase5": "+5 seconds",
+ "timerOff": "Rest timer is off — turn it on in Settings",
+ "none": "No rest"
+ },
+ "anonymousName": "there",
+ "notes": "Notes",
+ "saveChanges": "Save Changes",
+ "addExercise": "Add Exercise"
},
"errors": {
"api": {
@@ -311,7 +329,8 @@
"title": "Couldn't show {{subject}}",
"thisPage": "this page",
"message": "Something went wrong on our side. Try again, and if it keeps happening reload the page."
- }
+ },
+ "unknown": "The server didn't say what went wrong."
},
"server": {
"insecureWarning": "Not encrypted — anyone on this network can read your login and stay signed in as you. Use https:// if you can.",
@@ -422,14 +441,11 @@
"log": {
"title": "Log Weight",
"last": "last: {{weight}} {{unit}}",
- "weightLabel": "Weight ({{unit}})",
"weightField": "Weight",
- "weightName": "weight",
"dateAndNote": "Date & note",
"collapse": "Collapse",
"notePlaceholder": "Note — e.g. morning, post-run",
"addDateAndNote": "Add date & note",
- "logAnyway": "Log Anyway",
"submit": "Log Weight",
"submitting": "Logging…",
"tip": "Best logged in the morning, after the bathroom",
@@ -484,7 +500,6 @@
"history": {
"title": "History",
"subject": "your weight history",
- "loadingMore": "Loading more…",
"loadMoreFailed": "Couldn't load more entries"
},
"detail": {
@@ -499,13 +514,13 @@
"editTitle": "Edit Entry",
"date": "Date",
"notesOptional": "Notes <hint>(optional)</hint>",
- "notesOptionalPlain": "Notes (optional)",
- "notePlaceholder": "e.g., morning, post-workout",
- "saveFailed": "Failed to save"
+ "notesOptionalPlain": "Notes (optional)"
},
"row": {
"options": "{{weight}} {{unit}} options"
- }
+ },
+ "notePlaceholder": "e.g., morning, post-workout",
+ "logAnyway": "Log Anyway"
},
"programs": {
"day": {
@@ -519,26 +534,14 @@
"startWorkout": "Start Workout",
"deleteConfirmTitle": "Delete Program?",
"deleteFailed": "Failed to delete program",
- "count": {
- "exercises_one": "{{count}} exercise",
- "exercises_other": "{{count}} exercises",
- "sets_one": "{{count}} set",
- "sets_other": "{{count}} sets",
- "reps_one": "{{count}} rep",
- "reps_other": "{{count}} reps",
- "days_one": "{{count}} day",
- "days_other": "{{count}} days"
- },
"list": {
"searchPlaceholder": "Search programs…",
"empty": {
"title": "No programs found",
- "searchHint": "Try a different search",
"startHint": "Create a program to get started"
},
"loadFailed": "Couldn't load your programs",
- "errorSubject": "your programs",
- "loadingMore": "Loading more…"
+ "errorSubject": "your programs"
},
"stats": {
"total": "Total",
@@ -549,8 +552,6 @@
"perProgram": "per program"
},
"card": {
- "deleteTitle": "Delete \"{{name}}\"?",
- "cannotUndo": "This cannot be undone",
"summary": "{{exercises}} · {{sets}}",
"restToday": "Rest today",
"today": "Today: {{day}}",
@@ -594,7 +595,6 @@
},
"noDays": "No days yet",
"addDay": "Add a day →",
- "todayChip": "TODAY",
"restDayHint": "No exercises scheduled — recover and come back stronger.",
"noExercises": "No exercises on this day yet",
"target": "target {{weight}} {{unit}}"
@@ -611,7 +611,6 @@
"createFailed": "Failed to create program",
"updateFailed": "Failed to update program",
"name": "Program Name",
- "required": "(required)",
"namePlaceholder": "e.g., Push Pull Legs, Upper Lower",
"notesPlaceholder": "Program description or goals…",
"days": "Days",
@@ -680,7 +679,6 @@
"left": "{{amount}} left",
"goal": "{{amount}} kcal goal",
"totalsFailed": "Couldn't load today's totals",
- "totalsFailedMessage": "Something went wrong on our end.",
"items_one": "{{count}} item",
"items_other": "{{count}} items",
"filteredCount": "{{shown}} of {{total}}",
@@ -691,7 +689,8 @@
"hint": "Tap to log your first meal"
},
"entryUpdated": "Entry updated",
- "addedTo": "Added to {{meal}}"
+ "addedTo": "Added to {{meal}}",
+ "totalsFailedHint": "Something went wrong on our end."
},
"entry": {
"logged": "Logged",
@@ -749,7 +748,6 @@
"backToFood": "Back to food",
"submit": "Log Food",
"saveChanges": "Save Changes",
- "saveFailed": "Failed to save",
"editLoadFailed": "Couldn't load that entry.",
"searchPlaceholder": "Search food…",
"scan": "Scan",
@@ -761,8 +759,6 @@
},
"rateLimited": "Too many requests — wait a moment and try again",
"searchUnavailable": "Food search unavailable — enter details manually",
- "lookupFailedTitle": "Couldn't look up this barcode",
- "lookupFailed": "Couldn't look up that barcode.",
"enterManually": "Enter it manually",
"rereadFailed": "Couldn't re-read this product.",
"quickAdd": "Quick add {{kcal}} kcal",
@@ -796,7 +792,9 @@
"enterAmountIn": "Enter an amount in {{unit}} to log this",
"servingsOf_one": "{{count}} serving of {{serving}}",
"servingsOf_other": "{{count}} servings of {{serving}}",
- "when": "When"
+ "when": "When",
+ "lookupFailedHint": "Couldn't look up that barcode.",
+ "lookupFailed": "Couldn't look up this barcode"
},
"scan": {
"title": "Scan barcode",
@@ -838,12 +836,10 @@
"searchPlaceholder": "Search workouts…",
"empty": {
"title": "No workouts found",
- "searchHint": "Try a different search",
"startHint": "Log a workout to get started"
},
"loadFailed": "Couldn't load your workouts",
- "errorSubject": "your workouts",
- "loadingMore": "Loading more…"
+ "errorSubject": "your workouts"
},
"deleteFailed": "Failed to delete workout",
"deleteConfirmTitle": "Delete Workout?",
@@ -858,11 +854,7 @@
"tapToUndo": "Tap to undo"
},
"card": {
- "deleteTitle": "Delete \"{{name}}\"?",
- "cannotUndo": "This cannot be undone",
"minutes": "{{minutes}} min",
- "exercises_one": "{{count}} exercise",
- "exercises_other": "{{count}} exercises",
"options": "Options",
"optionsNamed": "{{name}} options",
"menuHeading": "Workout",
@@ -882,11 +874,7 @@
"minutesUnit": "min",
"sets": "Sets",
"volume": "Volume",
- "restOff": "Rest timer is off — turn it on in Settings",
- "setCount_one": "{{count}} set",
- "setCount_other": "{{count}} sets",
- "best": "best",
- "noRest": "No rest"
+ "best": "best"
},
"start": {
"title": "Start Workout",
@@ -897,12 +885,9 @@
"quickHint": "Start blank, add exercises as you go",
"fromProgram": "Start from Program",
"fromProgramHint": "Load a saved routine's day",
- "programsLoadFailed": "Couldn't load your programs",
"loadingPrograms": "Loading programs…",
"noPrograms": "No programs yet",
"createFirst": "Create your first program →",
- "days_one": "{{count}} day",
- "days_other": "{{count}} days",
"noDays": "No days yet"
},
"form": {
@@ -910,10 +895,6 @@
"editTitle": "Edit Workout",
"summary": "{{exercises}} • {{sets}}",
"summaryWithWeight": "{{exercises}} • {{sets}} • {{weight}} {{unit}}",
- "exerciseCount_one": "{{count}} exercise",
- "exerciseCount_other": "{{count}} exercises",
- "setCount_one": "{{count}} set",
- "setCount_other": "{{count}} sets",
"errors": {
"nameRequired": "Workout name required",
"noExercises": "Add at least one exercise"
@@ -921,19 +902,16 @@
"createFailed": "Failed to create workout",
"updateFailed": "Failed to update workout",
"name": "Workout Name",
- "required": "(required)",
"namePlaceholder": "e.g., Leg Day, Push Day",
"date": "Date",
"durationMinutes": "Duration (minutes)",
"duration": "Duration",
"durationHm": "{{hours}}h {{minutes}}m",
- "notes": "Notes",
"notesPlaceholder": "How did it feel? Any PRs?",
"totalUnit": "Total {{unit}}",
"exercises": "Exercises",
"sets": "Sets",
"loadProgram": "Load Program",
- "addExercise": "Add Exercise",
"addExerciseLabel": "Add exercise",
"removeExercise": "Remove exercise",
"removeNamed": "Remove {{name}}",
@@ -943,7 +921,6 @@
"set": "Set",
"reps": "Reps",
"weight": "Weight",
- "weightWithUnit": "Weight ({{unit}})",
"setWeightLabel": "Set weight",
"setRepsLabel": "Set reps",
"addSet": "Add Set",
@@ -953,7 +930,6 @@
"removeNoteLabel": "Remove note",
"exerciseNotesLabel": "Exercise notes",
"saveWorkout": "Save Workout",
- "saveChanges": "Save Changes",
"empty": {
"createTitle": "No exercises yet",
"createHint": "Add an exercise or load a program to start",
@@ -972,14 +948,12 @@
"pickDay": "Pick a day to pre-fill exercises",
"loadFailed": "Couldn't load your programs.",
"back": "← Back to programs",
- "today": "TODAY",
"workoutDays_one": "{{count}} workout day",
"workoutDays_other": "{{count}} workout days",
"noExercises": "No exercises yet",
"restDays": "rest days",
"createFirst": "Create a program first",
"close": "Close program picker",
- "searchPlaceholder": "Search programs…",
"noMatches": "No matching programs"
}
},
@@ -1009,10 +983,8 @@
"set": "Set",
"reps": "Reps",
"weight": "Weight",
- "weightUnit": "Weight ({{unit}})",
"done": "Done"
},
- "completeSetWeb": "Set {{number}}, mark done",
"completeSet": "Complete set {{number}}, {{name}}",
"completedSet": "Completed set {{number}}, {{name}}",
"repsLabel": "Reps, set {{number}}, {{name}}",
@@ -1032,14 +1004,13 @@
"cancelConfirm": {
"title": "Cancel Workout?",
"message": "All progress will be lost."
- }
+ },
+ "markSetDone": "Set {{number}}, mark done"
},
"rest": {
"off": "Off",
"custom": "Custom",
- "stepDown5": "−5 seconds",
"stepDown5Spoken": "Minus 5 seconds",
- "stepUp5": "+5 seconds",
"stepUp5Spoken": "Plus 5 seconds",
"secondsLabel": "Rest seconds",
"secondsUnit": "sec",
@@ -1099,8 +1070,6 @@
},
"target": {
"label": "Target",
- "reps_one": "{{count}} rep",
- "reps_other": "{{count}} reps",
"repsUnknown": "— reps"
},
"completeSet": "Complete Set",
@@ -1174,7 +1143,6 @@
"search": "Search exercises…",
"loading": "Loading exercises…",
"loadingShort": "Loading…",
- "loadingMore": "Loading more…",
"loadMore": "Load more",
"empty": "No exercises found",
"errorSubject": "these exercises",
@@ -1236,10 +1204,7 @@
"upNext": {
"label": "Up next · {{name}}",
"viewRoutine": "View {{name}} routine",
- "start": "Start {{name}}",
- "exercises_one": "{{count}} exercise",
- "exercises_other": "{{count}} exercises",
- "loadFailed": "Couldn't load your programs"
+ "start": "Start {{name}}"
},
"kpi": {
"week": "Week",
@@ -1267,9 +1232,7 @@
"title": "Last workout",
"all": "All",
"minutes": "{{mins}} min",
- "sets_one": "{{count}} set",
- "sets_other": "{{count}} sets",
- "moreExercises_one": "+{{count}} more exercises",
+ "moreExercises_one": "+{{count}} more exercise",
"moreExercises_other": "+{{count}} more exercises",
"empty": "No workouts logged yet",
"startFirst": "Start your first workout →"
@@ -1280,9 +1243,7 @@
"loadFailed": "Couldn't load today's food"
},
"macro": {
- "protein": "Protein",
- "carbs": "Carbs",
- "fat": "Fat"
+ "carbs": "Carbs"
},
"muscle": {
"title": "Muscle Balance",
@@ -1346,17 +1307,12 @@
"quickWeighIn": {
"title": "Log Weight",
"duplicateToday": "Already logged today ({{weight}} {{unit}}). Log again anyway?",
- "logAnyway": "Log Anyway",
- "weightWithUnit": "Weight ({{unit}})",
"weight": "Weight",
- "weightName": "weight",
"changeDateOrNote": "+ Change date or add a note",
"date": "Date",
"note": "Note",
"optional": "(optional)",
- "noteOptional": "Note (optional)",
- "notePlaceholder": "e.g., morning, post-workout",
- "saveFailed": "Failed to save"
+ "noteOptional": "Note (optional)"
}
},
"nav": {
@@ -1372,9 +1328,6 @@
"darkMode": "Dark mode",
"signOut": "Sign out",
"session": {
- "sets": "{{done}}/{{total}} sets",
- "restOver": "Rest over",
- "paused": "Paused",
"rest": "Rest"
}
},
diff --git a/packages/shared/src/i18n/locales/es.json b/packages/shared/src/i18n/locales/es.json
index 49ffab6..2650c53 100644
--- a/packages/shared/src/i18n/locales/es.json
+++ b/packages/shared/src/i18n/locales/es.json
@@ -4,7 +4,6 @@
"subtitle": "Preferencias y configuración de la cuenta",
"back": "Inicio",
"saved": "Ajustes guardados correctamente",
- "unknownError": "El servidor no indicó qué salió mal.",
"language": {
"label": "Idioma",
"description": "Por defecto, el idioma de tu dispositivo",
@@ -19,12 +18,10 @@
"description": "El nombre con el que te saluda la app. Si lo dejas vacío, usaremos tu correo.",
"loadFailed": "No se pudo cargar tu nombre, así que no te ofreceremos sobrescribirlo.",
"saveFailed": "No se pudo guardar tu nombre.",
- "save": "Guardar",
- "saving": "Guardando…",
"title": "Nombre",
"subtitle": "El nombre con el que te saluda la app.",
"emptyHint": "Si lo dejas vacío, usaremos tu correo.",
- "saveFailedFallback": "No se pudo guardar tu nombre. Inténtalo de nuevo."
+ "saveFailedRetry": "No se pudo guardar tu nombre. Inténtalo de nuevo."
},
"email": {
"label": "Correo",
@@ -36,12 +33,12 @@
"current": "Correo actual",
"new": "Correo nuevo",
"submit": "Actualizar correo",
- "failedFallback": "No se pudo cambiar tu correo. Inténtalo de nuevo.",
"changedTitle": "Correo cambiado",
"signInWith": "De ahora en adelante, inicia sesión con <email>{{email}}</email>.",
"signInWithPlain": "De ahora en adelante, inicia sesión con {{email}}.",
"caseOnly": "Solo cambiaron las mayúsculas y minúsculas, así que tus otros dispositivos siguen con la sesión iniciada.",
- "signedOutElsewhere": "Aquí sigues con la sesión iniciada; en tus otros dispositivos se cerró la sesión."
+ "signedOutElsewhere": "Aquí sigues con la sesión iniciada; en tus otros dispositivos se cerró la sesión.",
+ "changeFailed": "No se pudo cambiar tu correo. Inténtalo de nuevo."
},
"memberSince": {
"label": "Miembro desde"
@@ -52,16 +49,16 @@
"change": "Cambiar",
"current": "Contraseña actual",
"new": "Contraseña nueva",
- "confirmNew": "Confirma la contraseña nueva",
+ "confirmNew": "Confirmar contraseña nueva",
"pageTitle": "Cambiar contraseña",
"pageSubtitle": "Seguirás con la sesión iniciada aquí. Se cierra la sesión en todos los demás dispositivos.",
"submit": "Actualizar contraseña",
- "failedFallback": "No se pudo cambiar tu contraseña. Inténtalo de nuevo.",
"changedTitle": "Contraseña cambiada",
- "changedBody": "Sigues con la sesión iniciada aquí. Se cerró la sesión en todos los demás dispositivos y necesitarán la contraseña nueva."
+ "changedBody": "Sigues con la sesión iniciada aquí. Se cerró la sesión en todos los demás dispositivos y necesitarán la contraseña nueva.",
+ "changeFailed": "No se pudo cambiar tu contraseña. Inténtalo de nuevo."
},
"backLink": "Ajustes",
- "backToSettings": "Volver a ajustes",
+ "backToSettings": "Volver a Ajustes",
"saving": "Guardando"
},
"appearance": {
@@ -91,8 +88,8 @@
},
"restTimer": {
"label": "Temporizador de descanso",
- "description": "Inicia una cuenta atrás entre series",
- "gymDescription": "Inicia una cuenta atrás entre series en el modo gimnasio",
+ "description": "Inicia automáticamente una cuenta regresiva entre series",
+ "gymDescription": "Inicia automáticamente una cuenta regresiva entre series en el modo gimnasio",
"off": "No",
"on": "Sí"
},
@@ -100,60 +97,51 @@
"label": "Descanso predeterminado",
"description": "Se aplica a los ejercicios nuevos · el descanso de cada ejercicio lo reemplaza",
"preset": "{{seconds}} s",
- "custom": "Otro",
"customLabel": "Segundos de descanso personalizados",
- "secondsUnit": "s",
- "minusFive": "−5 segundos",
- "plusFive": "+5 segundos",
"decrease": "Reducir el descanso en 5 segundos",
"increase": "Aumentar el descanso en 5 segundos"
}
},
- "goalsUnits": {
- "title": "Objetivos y unidades",
- "loadFailedMessage": "Son tus objetivos y unidades guardados, así que no los adivinaremos. Todo lo demás de esta página sigue funcionando."
- },
- "unitsTargets": {
- "title": "Unidades y objetivos",
- "footnote": "La unidad de peso se aplica al instante en toda la app. Los objetivos de nutrición alimentan los anillos del panel.",
- "loadFailedMessage": "Son tus objetivos y unidades guardados, así que no los adivinaremos. Todo lo demás aquí sigue funcionando.",
- "saved": "Objetivos guardados",
- "changeUnitFailedTitle": "No se pudieron cambiar las unidades"
- },
"targets": {
- "loadFailedTitle": "No se pudieron cargar tus objetivos",
"weightUnit": {
"label": "Unidad de peso",
"description": "Los cambios se aplican de inmediato en toda la app",
"changeFailed": "No se pudo cambiar la unidad de peso.",
- "changeFailedFallback": "No se pudo cambiar la unidad de peso"
+ "changeFailedTitle": "No se pudieron cambiar las unidades",
+ "changeFailedShort": "No se pudo cambiar la unidad de peso"
},
"calorie": {
"label": "Objetivo de calorías",
- "description": "Meta diaria de calorías"
+ "description": "Objetivo diario de calorías"
},
"protein": {
"label": "Objetivo de proteína",
- "description": "Meta diaria de proteína"
+ "description": "Objetivo diario de proteína"
},
"carb": {
"label": "Objetivo de carbohidratos",
- "description": "Meta diaria de carbohidratos"
+ "description": "Objetivo diario de carbohidratos"
},
"fat": {
"label": "Objetivo de grasa",
- "description": "Meta diaria de grasa"
+ "description": "Objetivo diario de grasa"
},
"saveHint": "Guardar los objetivos de calorías y macros",
"save": "Guardar objetivos",
- "saving": "Guardando...",
- "saveFailedFallback": "No se pudieron guardar los ajustes",
- "saveFailed": "No se pudieron guardar los objetivos"
+ "saving": "Guardando…",
+ "saveFailed": "No se pudieron guardar los objetivos",
+ "titleWeb": "Objetivos y unidades",
+ "loadFailedHintWeb": "Son tus objetivos y unidades guardados, así que no los adivinaremos. Todo lo demás de esta página sigue funcionando.",
+ "title": "Unidades y objetivos",
+ "footnote": "La unidad de peso se aplica al instante en toda la app. Los objetivos de nutrición determinan los anillos del panel.",
+ "loadFailedHint": "Son tus objetivos y unidades guardados, así que no los adivinaremos. Todo lo demás aquí sigue funcionando.",
+ "saved": "Objetivos guardados",
+ "loadFailed": "No se pudieron cargar tus objetivos"
},
"server": {
"title": "Servidor",
"webTitle": "Instancia autoalojada",
- "footnote": "El backend autoalojado con el que habla esta app. Deja la URL en blanco para usar el predeterminado.",
+ "footnote": "El backend autoalojado al que se conecta esta app. Deja la URL en blanco para usar el predeterminado.",
"api": {
"label": "Servidor de API",
"description": "Servidor backend al que está conectado este cliente",
@@ -166,7 +154,7 @@
"url": {
"label": "URL del servidor",
"placeholder": "https://your-server.example.com",
- "invalid": "Introduce una URL completa que incluya http:// o https://",
+ "invalid": "Ingresa una URL completa que incluya http:// o https://",
"testAndSave": "Probar y guardar"
},
"connected": "Conectado · {{name}} v{{version}}",
@@ -197,10 +185,10 @@
"cleared_many": "Se eliminaron {{amount}} de ejercicios sin usar",
"cleared_other": "Se eliminaron {{amount}} ejercicios sin usar",
"refresh": "Actualizar caché",
- "refreshing": "Actualizando...",
+ "refreshing": "Actualizando…",
"refreshFailed": "No se pudo actualizar la caché.",
- "clear": "Borrar sin usar",
- "clearing": "Borrando...",
+ "clear": "Eliminar no usados",
+ "clearing": "Eliminando…",
"clearFailed": "No se pudo borrar la caché."
},
"danger": {
@@ -215,16 +203,14 @@
"deleteAccount": {
"label": "Eliminar cuenta",
"description": "Elimina permanentemente todos tus datos",
- "button": "Eliminar",
"sheetTitle": "¿Eliminar la cuenta?",
"sheetMessage": "Esto elimina permanentemente tu cuenta y todos tus datos. No se puede deshacer.",
"confirm": "Eliminar cuenta",
- "busy": "Eliminando…",
"failed": "No se pudo eliminar la cuenta"
- }
+ },
+ "saveFailed": "No se pudieron guardar los ajustes"
},
"common": {
- "there": "usuario",
"duration": {
"seconds": "{{value}} s",
"minutes": "{{value}} min"
@@ -258,6 +244,7 @@
"delete": "Eliminar",
"deleting": "Eliminando…",
"deleteConfirmMessage": "{{subject}} se eliminará de forma permanente.",
+ "deleteNamedConfirmMessage": "\"{{name}}\" se eliminará de forma permanente.",
"dismiss": "Descartar",
"done": "Listo",
"dismissKeyboard": "Cerrar teclado",
@@ -276,7 +263,42 @@
"back": "Atrás",
"goBack": "Volver",
"save": "Guardar",
- "saving": "Guardando…"
+ "saving": "Guardando…",
+ "count": {
+ "exercises_one": "{{count}} ejercicio",
+ "exercises_other": "{{count}} ejercicios",
+ "exercises_many": "{{count}} de ejercicios",
+ "sets_one": "{{count}} serie",
+ "sets_other": "{{count}} series",
+ "sets_many": "{{count}} de series",
+ "reps_one": "{{count}} rep",
+ "reps_other": "{{count}} reps",
+ "reps_many": "{{count}} de reps",
+ "days_one": "{{count}} día",
+ "days_other": "{{count}} días",
+ "days_many": "{{count}} de días"
+ },
+ "weightWithUnit": "Peso ({{unit}})",
+ "weightName": "peso",
+ "loadingMore": "Cargando más…",
+ "tryDifferentSearch": "Prueba con otra búsqueda",
+ "required": "(obligatorio)",
+ "saveFailed": "No se pudo guardar",
+ "todayChip": "HOY",
+ "card": {
+ "deleteNamed": "¿Eliminar \"{{name}}\"?",
+ "cannotUndo": "Esto no se puede deshacer"
+ },
+ "rest": {
+ "decrease5": "−5 segundos",
+ "increase5": "+5 segundos",
+ "timerOff": "El temporizador de descanso está desactivado: actívalo en Ajustes",
+ "none": "Sin descanso"
+ },
+ "anonymousName": "usuario",
+ "notes": "Notas",
+ "saveChanges": "Guardar cambios",
+ "addExercise": "Agregar ejercicio"
},
"errors": {
"api": {
@@ -291,14 +313,14 @@
"certificateUntrusted": "Este dispositivo no confía en el certificado del servidor. Revisa los ajustes del servidor.",
"hostnameMismatch": "El certificado del servidor no cubre esta dirección. Revisa los ajustes del servidor.",
"timeout": "El servidor no respondió a tiempo. Inténtalo de nuevo en un momento.",
- "unreachable": "No se pudo conectar con el servidor. Comprueba que esté en marcha.",
+ "unreachable": "No se pudo conectar con el servidor. Revisa que esté en marcha.",
"unknown": "No se puede conectar con el servidor en este momento."
},
"full": {
"cleartextBlocked": "Este dispositivo bloqueó la conexión porque la URL usa http:// sin cifrar. Cambia el servidor a https:// — un proxy inverso puede emitir un certificado para un nombre de host de red local sin abrir puertos.",
- "certificateUntrusted": "Este dispositivo no confía en el certificado del servidor. La mejor solución: dale al servidor un certificado real — un proxy inverso puede emitir uno para un nombre de host de red local sin abrir puertos. O instala tu propia CA en Ajustes → Seguridad → Cifrado y credenciales, con lo que todas las apps del dispositivo confiarán en ella, no solo Lyftr.",
+ "certificateUntrusted": "Este dispositivo no confía en el certificado del servidor. La mejor solución: dale al servidor un certificado real — un proxy inverso puede emitir uno para un nombre de host de red local sin abrir puertos. O instala tu propia CA en Configuración → Seguridad → Encriptación y credenciales, con lo que todas las apps del dispositivo confiarán en ella, no solo Lyftr.",
"hostnameMismatch": "El certificado del servidor no cubre esta dirección. Vuelve a emitirlo con este nombre de host o esta IP en el Nombre alternativo del sujeto (SAN) del certificado.",
- "timeout": "El servidor no respondió a tiempo. Comprueba que esté en marcha y accesible desde este dispositivo.",
+ "timeout": "El servidor no respondió a tiempo. Revisa que esté en marcha y accesible desde este dispositivo.",
"unreachable": "No se pudo conectar con el servidor. Revisa la URL y que el backend esté en marcha.",
"unknownWeb": "No se puede conectar con el servidor. Revisa la URL, que el backend esté en marcha y que permita el origen de esta app (CORS).",
"unknownNative": "No se puede conectar con el servidor. Revisa la URL y que el backend esté en marcha y accesible desde este dispositivo.",
@@ -314,7 +336,8 @@
"title": "Error al mostrar {{subject}}",
"thisPage": "esta página",
"message": "Algo salió mal de nuestro lado. Inténtalo de nuevo y, si sigue pasando, recarga la página."
- }
+ },
+ "unknown": "El servidor no indicó qué salió mal."
},
"server": {
"insecureWarning": "Sin cifrar — cualquiera en esta red puede leer tu inicio de sesión y mantener la sesión abierta como si fuera tú. Usa https:// si puedes.",
@@ -344,15 +367,15 @@
"auth": {
"passwordRules": {
"minLength_one": "Al menos {{count}} carácter",
- "minLength_many": "Al menos {{count}} caracteres",
+ "minLength_many": "Al menos {{count}} de caracteres",
"minLength_other": "Al menos {{count}} caracteres",
- "maxBytes_one": "Máximo {{count}} carácter (los acentos y los emoji cuentan como más)",
- "maxBytes_many": "Máximo {{count}} caracteres (los acentos y los emoji cuentan como más)",
- "maxBytes_other": "Máximo {{count}} caracteres (los acentos y los emoji cuentan como más)",
+ "maxBytes_one": "Máximo {{count}} carácter (los acentos y emojis ocupan más)",
+ "maxBytes_many": "Máximo {{count}} de caracteres (los acentos y emojis ocupan más)",
+ "maxBytes_other": "Máximo {{count}} caracteres (los acentos y emojis ocupan más)",
"different": "Distinta de tu contraseña actual",
"match": "Las contraseñas coinciden",
"mismatch": "Las contraseñas no coinciden",
- "repeat": "Repite la nueva contraseña"
+ "repeat": "Repite la contraseña nueva"
},
"divider": {
"or": "O",
@@ -416,10 +439,10 @@
"trendFailed": "No se pudo cargar tu tendencia de peso.",
"statsFailed": "No se pudieron cargar tus estadísticas de peso."
},
- "bodyweightShort": "PC",
- "duplicateWarning": "Ya registraste el {{date}} ({{weight}} {{unit}}). ¿Registrar de nuevo de todos modos?",
+ "bodyweightShort": "P. corp.",
+ "duplicateWarning": "Ya registraste tu peso el {{date}} ({{weight}} {{unit}}). ¿Registrar de nuevo de todos modos?",
"title": "Peso",
- "subtitle": "Sigue tu peso corporal a lo largo del tiempo",
+ "subtitle": "Registra la evolución de tu peso corporal",
"loadFailed": "No se pudo cargar tu peso",
"deleteTitle": "¿Eliminar registro?",
"deleteSubject": "{{date}} · {{weight}} {{unit}}",
@@ -427,14 +450,11 @@
"log": {
"title": "Registrar peso",
"last": "último: {{weight}} {{unit}}",
- "weightLabel": "Peso ({{unit}})",
"weightField": "Peso",
- "weightName": "peso",
"dateAndNote": "Fecha y nota",
"collapse": "Contraer",
"notePlaceholder": "Nota — p. ej., por la mañana, después de correr",
"addDateAndNote": "Agregar fecha y nota",
- "logAnyway": "Registrar de todos modos",
"submit": "Registrar peso",
"submitting": "Registrando…",
"tip": "Mejor registrarlo por la mañana, después de ir al baño",
@@ -442,7 +462,7 @@
},
"hero": {
"current": "Peso actual",
- "empty": "La báscula aún no sabe que existes. Arregla eso.",
+ "empty": "La báscula aún no sabe que existes. Arréglalo.",
"changeGained": "Ganaste {{amount}} {{unit}} {{period}}",
"changeLost": "Perdiste {{amount}} {{unit}} {{period}}",
"changeNone": "{{amount}} {{unit}}, sin cambios {{period}}"
@@ -455,9 +475,9 @@
"All": "Todo"
},
"span": {
- "7d": "en 7 d",
- "30d": "en 30 d",
- "90d": "en 90 d",
+ "7d": "en 7 días",
+ "30d": "en 30 días",
+ "90d": "en 90 días",
"All": "en todo el historial"
}
},
@@ -489,7 +509,6 @@
"history": {
"title": "Historial",
"subject": "tu historial de peso",
- "loadingMore": "Cargando más…",
"loadMoreFailed": "No se pudieron cargar más registros"
},
"detail": {
@@ -504,13 +523,13 @@
"editTitle": "Editar registro",
"date": "Fecha",
"notesOptional": "Notas <hint>(opcional)</hint>",
- "notesOptionalPlain": "Notas (opcional)",
- "notePlaceholder": "p. ej., por la mañana, después de entrenar",
- "saveFailed": "No se pudo guardar"
+ "notesOptionalPlain": "Notas (opcional)"
},
"row": {
"options": "Opciones de {{weight}} {{unit}}"
- }
+ },
+ "notePlaceholder": "p. ej., por la mañana, después de entrenar",
+ "logAnyway": "Registrar igual"
},
"programs": {
"day": {
@@ -521,33 +540,17 @@
"title": "Programas",
"subtitle": "Plantillas de entrenamiento reutilizables",
"newProgram": "Nuevo programa",
- "startWorkout": "Iniciar entrenamiento",
+ "startWorkout": "Empezar entrenamiento",
"deleteConfirmTitle": "¿Eliminar programa?",
"deleteFailed": "No se pudo eliminar el programa",
- "count": {
- "exercises_one": "{{count}} ejercicio",
- "exercises_other": "{{count}} ejercicios",
- "sets_one": "{{count}} serie",
- "sets_other": "{{count}} series",
- "reps_one": "{{count}} rep",
- "reps_other": "{{count}} reps",
- "exercises_many": "{{count}} ejercicios",
- "sets_many": "{{count}} series",
- "reps_many": "{{count}} reps",
- "days_one": "{{count}} día",
- "days_other": "{{count}} días",
- "days_many": "{{count}} días"
- },
"list": {
"searchPlaceholder": "Buscar programas…",
"empty": {
"title": "No se encontraron programas",
- "searchHint": "Prueba con otra búsqueda",
"startHint": "Crea un programa para empezar"
},
"loadFailed": "No se pudieron cargar tus programas",
- "errorSubject": "tus programas",
- "loadingMore": "Cargando más…"
+ "errorSubject": "tus programas"
},
"stats": {
"total": "Total",
@@ -558,21 +561,19 @@
"perProgram": "por programa"
},
"card": {
- "deleteTitle": "¿Eliminar \"{{name}}\"?",
- "cannotUndo": "Esto no se puede deshacer",
"summary": "{{exercises}} · {{sets}}",
"restToday": "Descanso hoy",
"today": "Hoy: {{day}}",
"options": "Opciones",
"optionsNamed": "Opciones de {{name}}",
"menuHeading": "Programa",
- "startTitle": "Iniciar entrenamiento",
+ "startTitle": "Empezar entrenamiento",
"restDayTitle": "Hoy es día de descanso: abrir programa",
"viewProgram": "Ver programa",
"editProgram": "Editar programa",
"deleteProgram": "Eliminar programa",
"editNamed": "Editar {{name}}",
- "startNamed": "Iniciar {{name}}"
+ "startNamed": "Empezar {{name}}"
},
"detail": {
"loadFailed": "No se pudo cargar este programa",
@@ -580,8 +581,8 @@
"backToPrograms": "Volver a programas",
"back": "Programas",
"restDayTitle": "Día de descanso: no hay nada que iniciar",
- "start": "Iniciar",
- "startLabel": "Iniciar entrenamiento",
+ "start": "Empezar",
+ "startLabel": "Empezar entrenamiento",
"editLabel": "Editar programa",
"deleteLabel": "Eliminar programa",
"suggestions": {
@@ -603,7 +604,6 @@
},
"noDays": "Aún no hay días",
"addDay": "Agregar un día →",
- "todayChip": "HOY",
"restDayHint": "No hay ejercicios programados: recupérate y vuelve más fuerte.",
"noExercises": "Aún no hay ejercicios en este día",
"target": "objetivo {{weight}} {{unit}}"
@@ -613,14 +613,13 @@
"editTitle": "Editar programa",
"summary": "{{days}} • {{exercises}} • {{sets}}",
"errors": {
- "nameRequired": "Falta el nombre del programa",
+ "nameRequired": "El nombre del programa es obligatorio",
"noDays": "Agrega al menos un día",
"noExercises": "Agrega al menos un ejercicio a un día de entrenamiento"
},
"createFailed": "No se pudo crear el programa",
"updateFailed": "No se pudo actualizar el programa",
"name": "Nombre del programa",
- "required": "(obligatorio)",
"namePlaceholder": "p. ej., Empuje-Tirón-Pierna, Torso-Pierna",
"notesPlaceholder": "Descripción u objetivos del programa…",
"days": "Días",
@@ -648,8 +647,8 @@
"collapse": "Contraer día",
"expand": "Expandir día",
"remove": "Quitar día",
- "addWorkoutDay": "Agregar día de entrenamiento",
- "addRestDay": "Agregar día de descanso"
+ "addWorkoutDay": "Día de entrenamiento",
+ "addRestDay": "Día de descanso"
},
"dayPicker": {
"title": "Elige un día"
@@ -658,14 +657,14 @@
},
"food": {
"servings_one": "{{count}} porción",
- "servings_many": "{{count}} porciones",
+ "servings_many": "{{count}} de porciones",
"servings_other": "{{count}} porciones",
"customEntry": "Registro personalizado",
"limitHint": "Un registro admite como máximo {{amount}}",
"favorites": {
- "addFailed": "No se pudo añadir {{name}} a Favoritos.",
+ "addFailed": "No se pudo agregar {{name}} a favoritos.",
"removeFailed": "No se pudo quitar {{name}} de Favoritos.",
- "add": "Añadir {{name}} a Favoritos",
+ "add": "Agregar {{name}} a favoritos",
"remove": "Quitar {{name}} de Favoritos",
"subject": "tus favoritos",
"loadFailed": "No se pudieron cargar tus favoritos.",
@@ -688,21 +687,21 @@
"calories": "Calorías",
"over": "{{amount}} de más",
"left": "{{amount}} restantes",
- "goal": "Meta de {{amount}} kcal",
+ "goal": "Objetivo: {{amount}} kcal",
"totalsFailed": "No se pudieron cargar los totales de hoy",
- "totalsFailedMessage": "Algo salió mal de nuestro lado.",
"items_one": "{{count}} registro",
- "items_many": "{{count}} registros",
+ "items_many": "{{count}} de registros",
"items_other": "{{count}} registros",
"filteredCount": "{{shown}} de {{total}}",
- "searchPlaceholder": "Buscar en la comida de este día…",
+ "searchPlaceholder": "Buscar en los alimentos de este día…",
"noMatches": "Sin resultados para “{{query}}”",
"empty": {
"title": "Aún no hay comida registrada",
"hint": "Toca para registrar tu primera comida"
},
"entryUpdated": "Registro actualizado",
- "addedTo": "Agregado a {{meal}}"
+ "addedTo": "Agregado a {{meal}}",
+ "totalsFailedHint": "Algo salió mal de nuestro lado."
},
"entry": {
"logged": "Registrado",
@@ -731,7 +730,7 @@
},
"macro": {
"protein": "Proteína",
- "carbs": "Carbos",
+ "carbs": "Carbohid.",
"fat": "Grasa",
"fiber": "Fibra",
"proteinInitial": "P",
@@ -760,9 +759,8 @@
"backToFood": "Volver a comida",
"submit": "Registrar comida",
"saveChanges": "Guardar cambios",
- "saveFailed": "No se pudo guardar",
"editLoadFailed": "No se pudo cargar ese registro.",
- "searchPlaceholder": "Buscar comida…",
+ "searchPlaceholder": "Buscar alimentos…",
"scan": "Escanear",
"scanLabel": "Escanear código de barras",
"tab": {
@@ -771,12 +769,10 @@
"search": "Buscar"
},
"rateLimited": "Demasiadas solicitudes — espera un momento e inténtalo de nuevo",
- "searchUnavailable": "Búsqueda de comida no disponible — ingresa los datos manualmente",
- "lookupFailedTitle": "No se pudo buscar este código de barras",
- "lookupFailed": "No se pudo buscar ese código de barras.",
+ "searchUnavailable": "Búsqueda de alimentos no disponible — ingresa los datos manualmente",
"enterManually": "Ingrésalo manualmente",
"rereadFailed": "No se pudo volver a leer este producto.",
- "quickAdd": "Agregar {{kcal}} kcal rápido",
+ "quickAdd": "Agregar rápido {{kcal}} kcal",
"noMacroBreakdown": "Sin desglose de macros",
"recent": {
"subject": "lo que registraste hoy",
@@ -806,9 +802,11 @@
"enterAmount": "Ingresa una cantidad para registrarlo",
"enterAmountIn": "Ingresa una cantidad en {{unit}} para registrarlo",
"servingsOf_one": "{{count}} porción de {{serving}}",
- "servingsOf_many": "{{count}} porciones de {{serving}}",
+ "servingsOf_many": "{{count}} de porciones de {{serving}}",
"servingsOf_other": "{{count}} porciones de {{serving}}",
- "when": "Cuándo"
+ "when": "Cuándo",
+ "lookupFailedHint": "No se pudo buscar ese código de barras.",
+ "lookupFailed": "No se pudo buscar este código de barras"
},
"scan": {
"title": "Escanear código de barras",
@@ -827,7 +825,7 @@
},
"lookup": {
"looking": "Buscando este producto…",
- "slow": "Sigo buscando. Esto puede tardar unos segundos."
+ "slow": "Seguimos buscando. Esto puede tardar unos segundos."
}
},
"workouts": {
@@ -846,16 +844,14 @@
"list": {
"title": "Entrenamientos",
"subtitle": "Registra y revisa tus sesiones de entrenamiento",
- "logWorkout": "Registrar entreno",
+ "logWorkout": "Registrar entrenamiento",
"searchPlaceholder": "Buscar entrenamientos…",
"empty": {
"title": "No se encontraron entrenamientos",
- "searchHint": "Prueba con otra búsqueda",
"startHint": "Registra un entrenamiento para empezar"
},
"loadFailed": "No se pudieron cargar tus entrenamientos",
- "errorSubject": "tus entrenamientos",
- "loadingMore": "Cargando más…"
+ "errorSubject": "tus entrenamientos"
},
"deleteFailed": "No se pudo eliminar el entrenamiento",
"deleteConfirmTitle": "¿Eliminar entrenamiento?",
@@ -864,19 +860,14 @@
"newTargets": "Nuevos objetivos en {{name}}",
"reviewUpdates_one": "Toca para revisar {{count}} actualización",
"reviewUpdates_other": "Toca para revisar {{count}} actualizaciones",
- "reviewUpdates_many": "Toca para revisar {{count}} actualizaciones",
+ "reviewUpdates_many": "Toca para revisar {{count}} de actualizaciones",
"saved": "Entrenamiento guardado",
"tapToView": "Toca para ver",
"discarded": "Entrenamiento descartado",
"tapToUndo": "Toca para deshacer"
},
"card": {
- "deleteTitle": "¿Eliminar \"{{name}}\"?",
- "cannotUndo": "Esto no se puede deshacer",
"minutes": "{{minutes}} min",
- "exercises_one": "{{count}} ejercicio",
- "exercises_other": "{{count}} ejercicios",
- "exercises_many": "{{count}} ejercicios",
"options": "Opciones",
"optionsNamed": "Opciones de {{name}}",
"menuHeading": "Entrenamiento",
@@ -896,29 +887,20 @@
"minutesUnit": "min",
"sets": "Series",
"volume": "Volumen",
- "restOff": "El temporizador de descanso está desactivado: actívalo en Ajustes",
- "setCount_one": "{{count}} serie",
- "setCount_other": "{{count}} series",
- "setCount_many": "{{count}} series",
- "best": "mejor",
- "noRest": "Sin descanso"
+ "best": "mejor"
},
"start": {
"title": "Empezar entrenamiento",
"inProgress": "Entrenamiento en curso",
- "resume": "Reanudar",
+ "resume": "Continuar",
"discard": "Descartar",
"quick": "Inicio rápido",
"quickHint": "Empieza en blanco y agrega ejercicios sobre la marcha",
"fromProgram": "Empezar desde un programa",
- "fromProgramHint": "Carga un día de una rutina guardada",
- "programsLoadFailed": "No se pudieron cargar tus programas",
+ "fromProgramHint": "Carga un día de un programa guardado",
"loadingPrograms": "Cargando programas…",
"noPrograms": "Aún no hay programas",
"createFirst": "Crea tu primer programa →",
- "days_one": "{{count}} día",
- "days_other": "{{count}} días",
- "days_many": "{{count}} días",
"noDays": "Aún no hay días"
},
"form": {
@@ -926,12 +908,6 @@
"editTitle": "Editar entrenamiento",
"summary": "{{exercises}} • {{sets}}",
"summaryWithWeight": "{{exercises}} • {{sets}} • {{weight}} {{unit}}",
- "exerciseCount_one": "{{count}} ejercicio",
- "exerciseCount_other": "{{count}} ejercicios",
- "exerciseCount_many": "{{count}} ejercicios",
- "setCount_one": "{{count}} serie",
- "setCount_other": "{{count}} series",
- "setCount_many": "{{count}} series",
"errors": {
"nameRequired": "El nombre del entrenamiento es obligatorio",
"noExercises": "Agrega al menos un ejercicio"
@@ -939,29 +915,25 @@
"createFailed": "No se pudo crear el entrenamiento",
"updateFailed": "No se pudo actualizar el entrenamiento",
"name": "Nombre del entrenamiento",
- "required": "(obligatorio)",
"namePlaceholder": "p. ej., Día de piernas, Día de empuje",
"date": "Fecha",
"durationMinutes": "Duración (minutos)",
"duration": "Duración",
"durationHm": "{{hours}} h {{minutes}} min",
- "notes": "Notas",
"notesPlaceholder": "¿Cómo te sentiste? ¿Algún récord?",
"totalUnit": "Total {{unit}}",
"exercises": "Ejercicios",
"sets": "Series",
"loadProgram": "Cargar programa",
- "addExercise": "Agregar ejercicio",
"addExerciseLabel": "Agregar ejercicio",
"removeExercise": "Quitar ejercicio",
"removeNamed": "Quitar {{name}}",
"exerciseFallback": "ejercicio",
"exerciseNotesPlaceholder": "p. ej., Me sentí fuerte",
"restBetweenSets": "Descanso entre series",
- "set": "Serie",
+ "set": "N.º",
"reps": "Reps",
"weight": "Peso",
- "weightWithUnit": "Peso ({{unit}})",
"setWeightLabel": "Peso de la serie",
"setRepsLabel": "Repeticiones de la serie",
"addSet": "Agregar serie",
@@ -971,7 +943,6 @@
"removeNoteLabel": "Quitar nota",
"exerciseNotesLabel": "Notas del ejercicio",
"saveWorkout": "Guardar entrenamiento",
- "saveChanges": "Guardar cambios",
"empty": {
"createTitle": "Aún no hay ejercicios",
"createHint": "Agrega un ejercicio o carga un programa para empezar",
@@ -990,15 +961,13 @@
"pickDay": "Elige un día para rellenar los ejercicios",
"loadFailed": "No se pudieron cargar tus programas.",
"back": "← Volver a programas",
- "today": "HOY",
"workoutDays_one": "{{count}} día de entrenamiento",
"workoutDays_other": "{{count}} días de entrenamiento",
- "workoutDays_many": "{{count}} días de entrenamiento",
+ "workoutDays_many": "{{count}} de días de entrenamiento",
"noExercises": "Aún no hay ejercicios",
"restDays": "días de descanso",
"createFirst": "Primero crea un programa",
"close": "Cerrar selector de programas",
- "searchPlaceholder": "Buscar programas…",
"noMatches": "No hay programas que coincidan"
}
},
@@ -1025,13 +994,11 @@
"label": "Notas, {{name}}"
},
"columns": {
- "set": "Serie",
+ "set": "N.º",
"reps": "Reps",
"weight": "Peso",
- "weightUnit": "Peso ({{unit}})",
"done": "Listo"
},
- "completeSetWeb": "Serie {{number}}, marcar como hecha",
"completeSet": "Completar serie {{number}}, {{name}}",
"completedSet": "Serie {{number}} completada, {{name}}",
"repsLabel": "Reps, serie {{number}}, {{name}}",
@@ -1043,7 +1010,7 @@
"addExercise": "Agregar ejercicio",
"cancelWorkout": "Cancelar entrenamiento",
"saveFailed": "No se pudo guardar el entrenamiento",
- "keepGoing": "Seguir",
+ "keepGoing": "Seguir entrenando",
"finishConfirm": {
"title": "¿Terminar el entrenamiento?",
"message": "{{done}} de {{total}} series completadas. Se guardará el entrenamiento."
@@ -1051,17 +1018,16 @@
"cancelConfirm": {
"title": "¿Cancelar el entrenamiento?",
"message": "Se perderá todo el progreso."
- }
+ },
+ "markSetDone": "Serie {{number}}, marcar como hecha"
},
"rest": {
- "off": "Apagado",
+ "off": "No",
"custom": "Otro",
- "stepDown5": "−5 segundos",
"stepDown5Spoken": "Menos 5 segundos",
- "stepUp5": "+5 segundos",
"stepUp5Spoken": "Más 5 segundos",
"secondsLabel": "Segundos de descanso",
- "secondsUnit": "seg",
+ "secondsUnit": "s",
"label": {
"ready": "Listo",
"paused": "En pausa",
@@ -1078,7 +1044,7 @@
"resume": "Reanudar temporizador de descanso",
"shorten": "Acortar el descanso 15 segundos",
"extend": "Alargar el descanso 15 segundos",
- "skip": "Omitir"
+ "skip": "Saltar"
}
},
"gym": {
@@ -1107,7 +1073,7 @@
},
"info": {
"restTitle": "Descanso entre series",
- "restHint": "Inicia solo al completar una serie",
+ "restHint": "Se inicia automáticamente al completar una serie",
"begin": "Empezar ejercicio"
},
"set": {
@@ -1118,10 +1084,7 @@
},
"target": {
"label": "Objetivo",
- "reps_one": "{{count}} rep",
- "reps_other": "{{count}} reps",
- "repsUnknown": "— reps",
- "reps_many": "{{count}} reps"
+ "repsUnknown": "— reps"
},
"completeSet": "Completar serie",
"completed": "Completada",
@@ -1129,8 +1092,8 @@
"removeExercise": "Quitar este ejercicio",
"nav": {
"info": "Info",
- "finishWorkout": "Terminar entrenamiento",
- "nextExercise": "Siguiente ejercicio"
+ "finishWorkout": "Terminar",
+ "nextExercise": "Siguiente"
}
},
"exercises": {
@@ -1186,7 +1149,7 @@
"triceps": "tríceps"
},
"picker": {
- "title": "Añadir ejercicio",
+ "title": "Agregar ejercicio",
"loaded_one": "{{count}} cargado",
"loaded_other": "{{count}} cargados",
"loaded_many": "{{count}} cargados",
@@ -1196,7 +1159,6 @@
"search": "Buscar ejercicios…",
"loading": "Cargando ejercicios…",
"loadingShort": "Cargando…",
- "loadingMore": "Cargando más…",
"loadMore": "Cargar más",
"empty": "No se encontraron ejercicios",
"errorSubject": "estos ejercicios",
@@ -1208,25 +1170,25 @@
"detail": {
"loadFailed": "No se pudo cargar este ejercicio",
"musclesWorked": "Músculos trabajados",
- "bodyFront": "Frente",
- "bodyBack": "Espalda",
+ "bodyFront": "Frontal",
+ "bodyBack": "Posterior",
"primary": "Principal",
"secondary": "Secundario",
"alsoWorks": "También trabaja",
"yourBest": "Tu mejor marca",
- "personalBest": "Mejor marca personal",
+ "personalBest": "Mejor marca",
"estimated1rm": "1RM estimado",
"weightProgression": "Progresión de peso",
- "noPeriodData": "Sin datos para este período",
+ "noPeriodData": "Sin datos para este periodo",
"maxWeight": "Peso máx.",
"instructions": "Instrucciones",
"bestSet_one": "{{unit}} × {{count}} repetición",
"bestSet_other": "{{unit}} × {{count}} repeticiones",
- "bestSet_many": "{{unit}} × {{count}} repeticiones",
+ "bestSet_many": "{{unit}} × {{count}} de repeticiones",
"period": {
- "1m": "1m",
- "3m": "3m",
- "6m": "6m",
+ "1m": "1M",
+ "3m": "3M",
+ "6m": "6M",
"All": "Todo"
}
}
@@ -1234,7 +1196,7 @@
"home": {
"heatmap": {
"workouts_one": "{{date}} · {{count}} entrenamiento",
- "workouts_many": "{{date}} · {{count}} entrenamientos",
+ "workouts_many": "{{date}} · {{count}} de entrenamientos",
"workouts_other": "{{date}} · {{count}} entrenamientos",
"restDay": "{{date}} · día de descanso",
"less": "Menos",
@@ -1259,12 +1221,8 @@
},
"upNext": {
"label": "A continuación · {{name}}",
- "viewRoutine": "Ver la rutina {{name}}",
- "start": "Empezar {{name}}",
- "exercises_one": "{{count}} ejercicio",
- "exercises_many": "{{count}} ejercicios",
- "exercises_other": "{{count}} ejercicios",
- "loadFailed": "No se pudieron cargar tus programas"
+ "viewRoutine": "Ver {{name}}",
+ "start": "Empezar {{name}}"
},
"kpi": {
"week": "Semana",
@@ -1293,11 +1251,8 @@
"title": "Último entrenamiento",
"all": "Todos",
"minutes": "{{mins}} min",
- "sets_one": "{{count}} serie",
- "sets_many": "{{count}} series",
- "sets_other": "{{count}} series",
"moreExercises_one": "+{{count}} ejercicio más",
- "moreExercises_many": "+{{count}} ejercicios más",
+ "moreExercises_many": "+{{count}} de ejercicios más",
"moreExercises_other": "+{{count}} ejercicios más",
"empty": "Aún no hay entrenamientos registrados",
"startFirst": "Empieza tu primer entrenamiento →"
@@ -1308,20 +1263,18 @@
"loadFailed": "No se pudo cargar la comida de hoy"
},
"macro": {
- "protein": "Proteína",
- "carbs": "Carbohidratos",
- "fat": "Grasa"
+ "carbs": "Carbohidratos"
},
"muscle": {
"title": "Equilibrio muscular",
"workouts_one": "{{count}} entrenamiento",
- "workouts_many": "{{count}} entrenamientos",
+ "workouts_many": "{{count}} de entrenamientos",
"workouts_other": "{{count}} entrenamientos",
"empty": "Registra entrenamientos para ver qué músculos entrenas más.",
"noData": "Aún no hay datos de entrenamientos",
"top": "principal",
"tooltip_one": "{{count}} serie ({{percent}}%)",
- "tooltip_many": "{{count}} series ({{percent}}%)",
+ "tooltip_many": "{{count}} de series ({{percent}}%)",
"tooltip_other": "{{count}} series ({{percent}}%)",
"donutSets": "series"
},
@@ -1375,18 +1328,13 @@
},
"quickWeighIn": {
"title": "Registrar peso",
- "duplicateToday": "Ya registraste hoy ({{weight}} {{unit}}). ¿Registrar de nuevo de todos modos?",
- "logAnyway": "Registrar de todos modos",
- "weightWithUnit": "Peso ({{unit}})",
+ "duplicateToday": "Ya registraste tu peso hoy ({{weight}} {{unit}}). ¿Registrar de nuevo de todos modos?",
"weight": "Peso",
- "weightName": "peso",
- "changeDateOrNote": "+ Cambiar la fecha o añadir una nota",
+ "changeDateOrNote": "+ Cambiar la fecha o agregar una nota",
"date": "Fecha",
"note": "Nota",
"optional": "(opcional)",
- "noteOptional": "Nota (opcional)",
- "notePlaceholder": "p. ej., mañana, después de entrenar",
- "saveFailed": "No se pudo guardar"
+ "noteOptional": "Nota (opcional)"
}
},
"nav": {
@@ -1402,9 +1350,6 @@
"darkMode": "Modo oscuro",
"signOut": "Cerrar sesión",
"session": {
- "sets": "{{done}}/{{total}} series",
- "restOver": "Descanso terminado",
- "paused": "En pausa",
"rest": "Descanso"
}
},
diff --git a/packages/shared/src/utils/copyLocale.test.ts b/packages/shared/src/utils/copyLocale.test.ts
index cc4d792..41e77e2 100644
--- a/packages/shared/src/utils/copyLocale.test.ts
+++ b/packages/shared/src/utils/copyLocale.test.ts
@@ -16,11 +16,11 @@ describe('shared helper copy in es', () => {
it('password rule labels', () => {
expect(lengthRuleLabel('')).toBe('Al menos 8 caracteres')
- expect(lengthRuleLabel('a'.repeat(MAX_PASSWORD_BYTES + 1))).toBe('Máximo 72 caracteres (los acentos y los emoji cuentan como más)')
+ expect(lengthRuleLabel('a'.repeat(MAX_PASSWORD_BYTES + 1))).toBe('Máximo 72 caracteres (los acentos y emojis ocupan más)')
expect(differentRuleLabel()).toBe('Distinta de tu contraseña actual')
expect(matchRuleLabel('ok')).toBe('Las contraseñas coinciden')
expect(matchRuleLabel('bad')).toBe('Las contraseñas no coinciden')
- expect(matchRuleLabel('pending')).toBe('Repite la nueva contraseña')
+ expect(matchRuleLabel('pending')).toBe('Repite la contraseña nueva')
})
it('weight errors keep the number and the unit', () => {
@@ -30,7 +30,7 @@ describe('shared helper copy in es', () => {
})
it('a bodyweight target reads as the es abbreviation, a loaded one keeps its unit', () => {
- expect(targetWeightLabel(0, 'lbs')).toBe('PC')
+ expect(targetWeightLabel(0, 'lbs')).toBe('P. corp.')
expect(targetWeightLabel(135, 'lbs')).toBe('135 lbs')
})
diff --git a/packages/shared/src/utils/dashboard.test.ts b/packages/shared/src/utils/dashboard.test.ts
index 7e70633..6e4edfc 100644
--- a/packages/shared/src/utils/dashboard.test.ts
+++ b/packages/shared/src/utils/dashboard.test.ts
@@ -106,7 +106,7 @@ describe('greeting', () => {
})
it('says "there" in English when there is no name', () => {
- // useDisplayName hands the common.there word to a nameless account; the sentence stays
+ // useDisplayName hands the common.anonymousName word to a nameless account; the sentence stays
// what it always read.
expect(greeting(at(9), 'there')).toBe('Good morning, there')
expect(greeting(at(9))).toBe('Good morning, there')
@@ -117,8 +117,8 @@ describe('greeting', () => {
expect(greeting(at(9), 'Sam')).toBe('Buenos días, Sam')
expect(greeting(at(14), 'Sam')).toBe('Buenas tardes, Sam')
// The nameless word is "usuario" in es; the greeting must not read "Buenos días, usuario".
- expect(greeting(at(9), es.common.there)).toBe(es.home.greeting.morning_anonymous)
- expect(greeting(at(21), es.common.there)).toBe(es.home.greeting.evening_anonymous)
+ expect(greeting(at(9), es.common.anonymousName)).toBe(es.home.greeting.morning_anonymous)
+ expect(greeting(at(21), es.common.anonymousName)).toBe(es.home.greeting.evening_anonymous)
})
})
describe('lifterQuip', () => {
diff --git a/packages/shared/src/utils/dashboard.ts b/packages/shared/src/utils/dashboard.ts
index f365b27..dcd8ebc 100644
--- a/packages/shared/src/utils/dashboard.ts
+++ b/packages/shared/src/utils/dashboard.ts
@@ -49,12 +49,12 @@ export const muscleRoast = (m: string): string =>
// "now" is sampled — and so this is testable without faking timers.
//
// `name` is what useDisplayName returned, which is never empty: with neither a name nor an
-// email it is the common.there word. That word means "no name", and the sentence for it is
+// email it is the common.anonymousName word. That word means "no name", and the sentence for it is
// its own ('Buenos días', not 'Buenos días, usuario'), picked with the 'anonymous' context.
export function greeting(now: Date, name?: string): string {
const h = now.getHours()
const band = h < 12 ? 'morning' : h < 17 ? 'afternoon' : 'evening'
- const anonymous = !name || name === i18n.t('common.there')
+ const anonymous = !name || name === i18n.t('common.anonymousName')
return i18n.t(`home.greeting.${band}`, { name, context: anonymous ? 'anonymous' : undefined })
}
diff --git a/packages/shared/src/utils/exerciseUtils.test.ts b/packages/shared/src/utils/exerciseUtils.test.ts
index 35aa328..51ec80c 100644
--- a/packages/shared/src/utils/exerciseUtils.test.ts
+++ b/packages/shared/src/utils/exerciseUtils.test.ts
@@ -94,8 +94,8 @@ describe('categoryLabel', () => {
}
})
- it('reads the pre-migration spaced spelling as the hyphenated slug', () => {
- expect(categoryLabel('olympic weightlifting')).toBe('olympic-weightlifting')
+ it('shows the pre-migration spaced spelling as it came in en', () => {
+ expect(categoryLabel('olympic weightlifting')).toBe('olympic weightlifting')
})
it('passes an unknown or empty value through as it came', () => {
diff --git a/packages/shared/src/utils/exerciseUtils.ts b/packages/shared/src/utils/exerciseUtils.ts
index 392805b..5d4dca1 100644
--- a/packages/shared/src/utils/exerciseUtils.ts
+++ b/packages/shared/src/utils/exerciseUtils.ts
@@ -57,7 +57,11 @@ export function equipmentLabel(raw: string | undefined | null): string {
// with muscles; the screens keep their CSS capitalize.
export function categoryLabel(raw: string | undefined | null): string {
const slug = slugOf(raw)
- return isOneOf(CATEGORY_SLUGS, slug) ? i18n.t(`exercises.category.${slug}`) : (raw ?? '')
+ if (!isOneOf(CATEGORY_SLUGS, slug)) return raw ?? ''
+ const label = i18n.t(`exercises.category.${slug}`)
+ // English is the slug itself, so a spelling that only normalises to one (the spaced
+ // legacy value) is shown as it came, as before the catalog.
+ return label === slug ? (raw ?? '') : label
}
export function muscleLabel(raw: string | undefined | null): string {
diff --git a/packages/shared/src/utils/profile.ts b/packages/shared/src/utils/profile.ts
index 0931007..56d3f6f 100644
--- a/packages/shared/src/utils/profile.ts
+++ b/packages/shared/src/utils/profile.ts
@@ -16,7 +16,7 @@ export function displayName(name?: string, email?: string): string {
const given = (name ?? '').trim()
if (given) return given
const local = (email ?? '').split('@')[0].trim()
- return local || i18n.t('common.there')
+ return local || i18n.t('common.anonymousName')
}
// Whether the typed address differs from the current one. A letter-case change counts:
diff --git a/web/src/components/BarcodeLookup.test.tsx b/web/src/components/BarcodeLookup.test.tsx
index 13c0175..02dd6c1 100644
--- a/web/src/components/BarcodeLookup.test.tsx
+++ b/web/src/components/BarcodeLookup.test.tsx
@@ -27,6 +27,6 @@ describe('BarcodeLookup', () => {
expect(screen.getByText('Buscando este producto…')).toBeTruthy()
act(() => { vi.advanceTimersByTime(4000) })
- expect(screen.getByText('Sigo buscando. Esto puede tardar unos segundos.')).toBeTruthy()
+ expect(screen.getByText('Seguimos buscando. Esto puede tardar unos segundos.')).toBeTruthy()
})
})
diff --git a/web/src/components/ErrorBoundary.tsx b/web/src/components/ErrorBoundary.tsx
index 2049702..ae3be9f 100644
--- a/web/src/components/ErrorBoundary.tsx
+++ b/web/src/components/ErrorBoundary.tsx
@@ -1,5 +1,5 @@
import { Component, type ReactNode } from 'react'
-import { i18n } from '@lyftr/shared'
+import { useTranslation } from '@lyftr/shared'
import ErrorState from './ui/ErrorState'
// The last net under a PR whose whole subject is that a failure must be visible.
@@ -26,6 +26,20 @@ interface State {
failed: boolean
}
+// The class cannot subscribe to language changes, so the copy is drawn by a function child
+// that can: a switch while the fallback is on screen re-translates it.
+function Fallback({ subject, size, onRetry }: Omit<Props, 'children'> & { onRetry: () => void }) {
+ const { t } = useTranslation()
+ return (
+ <ErrorState
+ size={size ?? 'page'}
+ title={t('errors.boundary.title', { subject: subject ?? t('errors.boundary.thisPage') })}
+ message={t('errors.boundary.message')}
+ onRetry={onRetry}
+ />
+ )
+}
+
export default class ErrorBoundary extends Component<Props, State> {
state: State = { failed: false }
@@ -42,10 +56,9 @@ export default class ErrorBoundary extends Component<Props, State> {
render() {
if (!this.state.failed) return this.props.children
return (
- <ErrorState
- size={this.props.size ?? 'page'}
- title={i18n.t('errors.boundary.title', { subject: this.props.subject ?? i18n.t('errors.boundary.thisPage') })}
- message={i18n.t('errors.boundary.message')}
+ <Fallback
+ subject={this.props.subject}
+ size={this.props.size}
// Remounting the subtree is the retry: state that got us into the bad
// render is thrown away with it.
onRetry={() => this.setState({ failed: false })}
diff --git a/web/src/components/ExercisePicker.test.tsx b/web/src/components/ExercisePicker.test.tsx
index 679f871..69226d1 100644
--- a/web/src/components/ExercisePicker.test.tsx
+++ b/web/src/components/ExercisePicker.test.tsx
@@ -151,7 +151,7 @@ describe('ExercisePicker', () => {
await act(async () => { await i18n.changeLanguage('es') })
- expect(screen.getByText('Añadir ejercicio')).toBeTruthy()
+ expect(screen.getByText('Agregar ejercicio')).toBeTruthy()
expect(screen.getByText('1 cargado')).toBeTruthy()
expect(screen.getByText('cuádriceps')).toBeTruthy()
expect(screen.getByText('Barra')).toBeTruthy()
diff --git a/web/src/components/Layout.tsx b/web/src/components/Layout.tsx
index a4702f4..ae951de 100644
--- a/web/src/components/Layout.tsx
+++ b/web/src/components/Layout.tsx
@@ -63,12 +63,12 @@ function ActiveSessionBar() {
</div>
<div className="text-left">
<p className="text-xs font-bold text-white leading-tight truncate max-w-[140px]">{session.name}</p>
- <p className="text-[11px] text-white/70 leading-tight">{t('nav.session.sets', { done: completedSets, total: totalSets })} · {formatElapsed(elapsed)}</p>
+ <p className="text-[11px] text-white/70 leading-tight">{t('workouts.active.setProgress', { done: completedSets, total: totalSets })} · {formatElapsed(elapsed)}</p>
</div>
{resting && (
<div className="flex items-center gap-1.5 pl-2.5 py-1 pr-1 rounded-full bg-white/15 flex-shrink-0">
<span className="text-[10px] font-semibold uppercase tracking-wide text-white/70 leading-none">
- {done ? t('nav.session.restOver') : paused ? t('nav.session.paused') : t('nav.session.rest')}
+ {done ? t('workouts.rest.label.over') : paused ? t('workouts.rest.label.paused') : t('nav.session.rest')}
</span>
{!done && <span className="text-xs font-bold text-white tabular-nums leading-none">{fmtClock(left)}</span>}
</div>
diff --git a/web/src/components/ProgramPicker.tsx b/web/src/components/ProgramPicker.tsx
index b7afd71..9a063ab 100644
--- a/web/src/components/ProgramPicker.tsx
+++ b/web/src/components/ProgramPicker.tsx
@@ -93,10 +93,10 @@ export default function ProgramPicker({ onSelect, onClose }: Props) {
<div className="flex-1 min-w-0">
<p className="text-sm font-medium text-tx-primary truncate flex items-center gap-1.5">
{dayLabel(day, day.order_index)}
- {isToday && <span className="text-[10px] font-bold text-brand-400 bg-brand-500/15 px-1.5 py-0.5 rounded-full">{t('workouts.form.programPicker.today')}</span>}
+ {isToday && <span className="text-[10px] font-bold text-brand-400 bg-brand-500/15 px-1.5 py-0.5 rounded-full">{t('common.todayChip')}</span>}
</p>
<span className="text-xs text-tx-muted">
- {t('workouts.form.exerciseCount', { count: (day.exercises ?? []).length })}
+ {t('common.count.exercises', { count: (day.exercises ?? []).length })}
</span>
</div>
<ChevronRight className="w-4 h-4 text-tx-muted flex-shrink-0 opacity-0 group-hover:opacity-100 transition-opacity" />
diff --git a/web/src/components/QuickWeighInSheet.tsx b/web/src/components/QuickWeighInSheet.tsx
index c6e94a4..a4f1da8 100644
--- a/web/src/components/QuickWeighInSheet.tsx
+++ b/web/src/components/QuickWeighInSheet.tsx
@@ -52,7 +52,7 @@ export default function QuickWeighInSheet({ isOpen, lastValue, lastLog, onClose,
})
onSuccess(log)
onClose()
- }, t('home.quickWeighIn.saveFailed'))
+ }, t('common.saveFailed'))
const handleClose = () => { setRejected(null); onClose() }
@@ -141,7 +141,7 @@ export default function QuickWeighInSheet({ isOpen, lastValue, lastLog, onClose,
}}
className="px-3 py-1 rounded-lg text-xs font-medium bg-amber-500/20 border border-amber-500/30 text-amber-300 hover:bg-amber-500/30 transition-colors"
>
- {t('home.quickWeighIn.logAnyway')}
+ {t('weight.logAnyway')}
</button>
</div>
</div>
@@ -150,8 +150,8 @@ export default function QuickWeighInSheet({ isOpen, lastValue, lastLog, onClose,
<StepperTile
icon={Scale}
- label={t('home.quickWeighIn.weightWithUnit', { unit: wUnit })}
- name={t('home.quickWeighIn.weightName')}
+ label={t('common.weightWithUnit', { unit: wUnit })}
+ name={t('common.weightName')}
step={BODYWEIGHT_STEP}
onStep={d => setValue(String(clampStep(parseFloat(value) || 0, d, { max: maxWeight(settings.weight_unit) })))}
>
@@ -188,7 +188,7 @@ export default function QuickWeighInSheet({ isOpen, lastValue, lastLog, onClose,
type="text"
value={notes}
onChange={e => setNotes(e.target.value)}
- placeholder={t('home.quickWeighIn.notePlaceholder')}
+ placeholder={t('weight.notePlaceholder')}
maxLength={200}
className="input mt-1"
/>
diff --git a/web/src/components/RestPicker.tsx b/web/src/components/RestPicker.tsx
index 97fffa3..fb4bd47 100644
--- a/web/src/components/RestPicker.tsx
+++ b/web/src/components/RestPicker.tsx
@@ -45,7 +45,7 @@ export default function RestPicker({ value, onChange }: Props) {
</div>
{customActive && (
<div className="flex items-center justify-center gap-2 mt-3">
- <button type="button" aria-label={t('workouts.rest.stepDown5')} onClick={() => onChange(Math.max(0, value - 5))}
+ <button type="button" aria-label={t('common.rest.decrease5')} onClick={() => onChange(Math.max(0, value - 5))}
className="p-2.5 rounded-xl bg-surface-muted border border-surface-border text-tx-secondary active:scale-95 hover:text-tx-primary">
<Minus className="w-4 h-4" />
</button>
@@ -61,7 +61,7 @@ export default function RestPicker({ value, onChange }: Props) {
/>
<span className="absolute right-3 top-1/2 -translate-y-1/2 text-xs text-tx-muted pointer-events-none">{t('workouts.rest.secondsUnit')}</span>
</div>
- <button type="button" aria-label={t('workouts.rest.stepUp5')} onClick={() => onChange(Math.min(3600, value + 5))}
+ <button type="button" aria-label={t('common.rest.increase5')} onClick={() => onChange(Math.min(3600, value + 5))}
className="p-2.5 rounded-xl bg-surface-muted border border-surface-border text-tx-secondary active:scale-95 hover:text-tx-primary">
<Plus className="w-4 h-4" />
</button>
diff --git a/web/src/components/programs/DayExercisesEditor.tsx b/web/src/components/programs/DayExercisesEditor.tsx
index 6438037..e46fddb 100644
--- a/web/src/components/programs/DayExercisesEditor.tsx
+++ b/web/src/components/programs/DayExercisesEditor.tsx
@@ -87,7 +87,7 @@ export default function DayExercisesEditor({ exercises, onChange, pickerExercise
className="flex items-center gap-1.5 px-3 py-1.5 text-xs bg-brand-500 hover:bg-brand-600 text-white rounded-lg transition-colors font-medium"
>
<Plus className="w-3.5 h-3.5" />
- {t('workouts.form.addExercise')}
+ {t('common.addExercise')}
</button>
</div>
@@ -123,7 +123,7 @@ export default function DayExercisesEditor({ exercises, onChange, pickerExercise
</div>
<div className="mb-4">
- <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block mb-1">{t('workouts.form.notes')}</label>
+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block mb-1">{t('common.notes')}</label>
<input
type="text"
value={workoutEx.notes}
@@ -144,7 +144,7 @@ export default function DayExercisesEditor({ exercises, onChange, pickerExercise
<div className="space-y-2 mb-3">
<div className="flex items-center justify-between">
<label className="text-xs text-tx-muted font-medium uppercase tracking-wider">{t('programs.form.targetSets')}</label>
- <span className="text-xs text-tx-muted">{t('programs.count.sets', { count: workoutEx.sets.length })}</span>
+ <span className="text-xs text-tx-muted">{t('common.count.sets', { count: workoutEx.sets.length })}</span>
</div>
{workoutEx.sets.map((set, setIdx) => (
<div key={setIdx} className="flex gap-2 items-end bg-surface-raised/40 p-3 rounded-lg border border-surface-border/50">
diff --git a/web/src/components/programs/ProgramDaysEditor.test.tsx b/web/src/components/programs/ProgramDaysEditor.test.tsx
index 570d22a..101cfbc 100644
--- a/web/src/components/programs/ProgramDaysEditor.test.tsx
+++ b/web/src/components/programs/ProgramDaysEditor.test.tsx
@@ -32,8 +32,8 @@ describe('ProgramDaysEditor', () => {
it('reads its copy from the catalog in Spanish', async () => {
await i18n.changeLanguage('es')
renderEditor([dayDraft({ exercises: [{ exercise_id: 1, notes: '', rest_seconds: 90, sets: [] }] }), dayDraft({ order_index: 1, is_rest_day: true })])
- expect(screen.getByText('Agregar día de entrenamiento')).toBeTruthy()
- expect(screen.getByText('Agregar día de descanso')).toBeTruthy()
+ expect(screen.getByText('Día de entrenamiento')).toBeTruthy()
+ expect(screen.getByText('Día de descanso')).toBeTruthy()
expect(screen.getByText('1 ejercicio')).toBeTruthy()
expect(screen.getAllByLabelText('Quitar día')).toHaveLength(2)
expect(screen.getByPlaceholderText('Día 1')).toBeTruthy()
diff --git a/web/src/components/programs/ProgramDaysEditor.tsx b/web/src/components/programs/ProgramDaysEditor.tsx
index a2685c6..ca989b2 100644
--- a/web/src/components/programs/ProgramDaysEditor.tsx
+++ b/web/src/components/programs/ProgramDaysEditor.tsx
@@ -109,7 +109,7 @@ export default function ProgramDaysEditor({ days, onChange, pickerExercises, onC
{!day.is_rest_day && (
<div className="px-3 pb-3 flex items-center gap-2 -mt-1">
- <span className="text-[11px] text-tx-muted">{t('programs.count.exercises', { count: day.exercises.length })}</span>
+ <span className="text-[11px] text-tx-muted">{t('common.count.exercises', { count: day.exercises.length })}</span>
</div>
)}
diff --git a/web/src/pages/ActiveWorkout.tsx b/web/src/pages/ActiveWorkout.tsx
index 5e4489e..b234cd9 100644
--- a/web/src/pages/ActiveWorkout.tsx
+++ b/web/src/pages/ActiveWorkout.tsx
@@ -334,7 +334,7 @@ export default function ActiveWorkout() {
"button" with no way to tell a done set from a pending one.
aria-pressed carries what the fill colour conveys visually. */}
<button
- aria-label={t('workouts.active.completeSetWeb', { number: set.set_number })}
+ aria-label={t('workouts.active.markSetDone', { number: set.set_number })}
aria-pressed={!!set.completed}
onClick={() => handleCompleteSet(exIdx, setIdx)}
className={`flex items-center justify-center transition-colors min-h-[3rem] ${
diff --git a/web/src/pages/AddProgram.tsx b/web/src/pages/AddProgram.tsx
index 9ee5f08..19ff32b 100644
--- a/web/src/pages/AddProgram.tsx
+++ b/web/src/pages/AddProgram.tsx
@@ -44,7 +44,8 @@ export default function AddProgram() {
navigate('/programs')
}, t('programs.form.createFailed'))
- useEffect(() => { if (error || save.error) window.scrollTo({ top: 0, behavior: 'smooth' }) }, [error, save.failureKey])
+ useEffect(() => { if (error) window.scrollTo({ top: 0, behavior: 'smooth' }) }, [error])
+ useEffect(() => { if (save.failureKey) window.scrollTo({ top: 0, behavior: 'smooth' }) }, [save.failureKey])
const handleSubmit = (e: React.FormEvent) => {
e.preventDefault()
@@ -68,7 +69,7 @@ export default function AddProgram() {
<div>
<h1 className="font-display font-bold text-2xl text-tx-primary">{t('programs.form.newTitle')}</h1>
<p className="text-xs text-tx-muted">
- {t('programs.form.summary', { days: t('programs.count.days', { count: formData.days.length }), exercises: t('programs.count.exercises', { count: totalExercises }), sets: t('programs.count.sets', { count: totalSets }) })}
+ {t('programs.form.summary', { days: t('common.count.days', { count: formData.days.length }), exercises: t('common.count.exercises', { count: totalExercises }), sets: t('common.count.sets', { count: totalSets }) })}
</p>
</div>
</div>
@@ -85,7 +86,7 @@ export default function AddProgram() {
<div className="flex items-center gap-2 mb-2">
<BookOpen className="w-4 h-4 text-brand-500" />
<label className="label">{t('programs.form.name')}</label>
- <span className="text-xs text-tx-muted">{t('programs.form.required')}</span>
+ <span className="text-xs text-tx-muted">{t('common.required')}</span>
</div>
<input
type="text"
@@ -99,7 +100,7 @@ export default function AddProgram() {
<div>
<div className="flex items-center gap-2 mb-2">
<FileText className="w-4 h-4 text-brand-500" />
- <label className="label">{t('workouts.form.notes')}</label>
+ <label className="label">{t('common.notes')}</label>
</div>
<textarea
value={formData.notes}
diff --git a/web/src/pages/AddWorkout.tsx b/web/src/pages/AddWorkout.tsx
index ac26471..bacd3a9 100644
--- a/web/src/pages/AddWorkout.tsx
+++ b/web/src/pages/AddWorkout.tsx
@@ -100,7 +100,8 @@ export default function AddWorkout() {
navigate('/workouts')
}, t('workouts.form.createFailed'))
- useEffect(() => { if (error || save.error) window.scrollTo({ top: 0, behavior: 'smooth' }) }, [error, save.failureKey])
+ useEffect(() => { if (error) window.scrollTo({ top: 0, behavior: 'smooth' }) }, [error])
+ useEffect(() => { if (save.failureKey) window.scrollTo({ top: 0, behavior: 'smooth' }) }, [save.failureKey])
const handleSubmit = (e: React.FormEvent) => {
e.preventDefault()
@@ -122,7 +123,7 @@ export default function AddWorkout() {
</button>
<div>
<h1 className="font-display font-bold text-2xl text-tx-primary">{t('workouts.form.logTitle')}</h1>
- <p className="text-xs text-tx-muted">{t('workouts.form.summary', { exercises: t('workouts.form.exerciseCount', { count: formData.exercises.length }), sets: t('workouts.form.setCount', { count: totalSets }) })}</p>
+ <p className="text-xs text-tx-muted">{t('workouts.form.summary', { exercises: t('common.count.exercises', { count: formData.exercises.length }), sets: t('common.count.sets', { count: totalSets }) })}</p>
</div>
</div>
@@ -138,7 +139,7 @@ export default function AddWorkout() {
<div className="flex items-center gap-2 mb-2">
<Dumbbell className="w-4 h-4 text-brand-500" />
<label className="label">{t('workouts.form.name')}</label>
- <span className="text-xs text-tx-muted">{t('workouts.form.required')}</span>
+ <span className="text-xs text-tx-muted">{t('common.required')}</span>
</div>
<input type="text" value={formData.name} onChange={e => setFormData(prev => ({ ...prev, name: e.target.value }))} placeholder={t('workouts.form.namePlaceholder')} className="input mt-1" />
</div>
@@ -167,7 +168,7 @@ export default function AddWorkout() {
<div>
<div className="flex items-center gap-2 mb-2">
<FileText className="w-4 h-4 text-brand-500" />
- <label className="label">{t('workouts.form.notes')}</label>
+ <label className="label">{t('common.notes')}</label>
</div>
<textarea value={formData.notes} onChange={e => setFormData(prev => ({ ...prev, notes: e.target.value }))} placeholder={t('workouts.form.notesPlaceholder')} className="input mt-1 min-h-20 resize-none" />
</div>
@@ -181,11 +182,11 @@ export default function AddWorkout() {
)}
<div>
- <div className="flex items-center justify-between mb-3">
+ <div className="flex flex-wrap items-center justify-between gap-2 mb-3">
<div className="flex items-center gap-2">
<Zap className="w-4 h-4 text-brand-500" />
<label className="label">{t('workouts.form.exercises')}</label>
- <span className="text-xs text-tx-muted">{t('workouts.form.required')}</span>
+ <span className="text-xs text-tx-muted">{t('common.required')}</span>
</div>
<div className="flex items-center gap-2">
<button type="button" onClick={() => setShowProgramPicker(true)} className="flex items-center gap-1.5 px-3 py-1.5 text-xs bg-surface-muted hover:bg-surface-muted/80 text-tx-secondary border border-surface-border rounded-lg transition-colors font-medium">
@@ -194,7 +195,7 @@ export default function AddWorkout() {
</button>
<button type="button" onClick={() => setShowPicker(true)} className="flex items-center gap-1.5 px-3 py-1.5 text-xs bg-brand-500 hover:bg-brand-600 text-white rounded-lg transition-colors font-medium">
<Plus className="w-3.5 h-3.5" />
- {t('workouts.form.addExercise')}
+ {t('common.addExercise')}
</button>
</div>
</div>
@@ -223,7 +224,7 @@ export default function AddWorkout() {
</div>
<div className="mb-4">
- <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block mb-1">{t('workouts.form.notes')}</label>
+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block mb-1">{t('common.notes')}</label>
<input type="text" value={workoutEx.notes} onChange={e => { const ex = [...formData.exercises]; ex[exIdx].notes = e.target.value; setFormData(p => ({ ...p, exercises: ex })) }} placeholder={t('workouts.form.exerciseNotesPlaceholder')} className="input text-sm" />
</div>
@@ -238,7 +239,7 @@ export default function AddWorkout() {
<div className="space-y-2 mb-3">
<div className="flex items-center justify-between">
<label className="text-xs text-tx-muted font-medium uppercase tracking-wider">{t('workouts.form.sets')}</label>
- <span className="text-xs text-tx-muted">{t('workouts.form.setCount', { count: workoutEx.sets.length })}</span>
+ <span className="text-xs text-tx-muted">{t('common.count.sets', { count: workoutEx.sets.length })}</span>
</div>
{workoutEx.sets.map((set, setIdx) => (
<div key={setIdx} className="flex gap-2 items-end bg-surface-raised/40 p-3 rounded-lg border border-surface-border/50">
diff --git a/web/src/pages/ChangeEmail.test.tsx b/web/src/pages/ChangeEmail.test.tsx
index 1433c69..05569bf 100644
--- a/web/src/pages/ChangeEmail.test.tsx
+++ b/web/src/pages/ChangeEmail.test.tsx
@@ -109,3 +109,19 @@ describe('ChangeEmail in Spanish', () => {
expect(screen.getByText(/en tus otros dispositivos se cerró la sesión/)).toBeTruthy()
})
})
+
+describe('ChangeEmail confirmation markup', () => {
+ it('renders an address containing markup as literal text', async () => {
+ const odd = 'a<strong>x</strong>@example.com'
+ changeEmail.mockResolvedValue({ id: 1, email: odd, created_at: '2026-07-01T00:00:00Z' })
+ const { container } = renderPage()
+
+ typeEmail('[email protected]')
+ typePassword('password123')
+ fireEvent.click(submitButton())
+
+ await waitFor(() => expect(screen.getByRole('heading', { name: 'Email changed' })).toBeTruthy())
+ expect(screen.getByText(odd).tagName).toBe('SPAN')
+ expect(container.querySelector('strong')).toBeNull()
+ })
+})
diff --git a/web/src/pages/ChangeEmail.tsx b/web/src/pages/ChangeEmail.tsx
index 5b361ab..753cc9e 100644
--- a/web/src/pages/ChangeEmail.tsx
+++ b/web/src/pages/ChangeEmail.tsx
@@ -24,7 +24,7 @@ export default function ChangeEmail() {
setCurrent('')
setCaseOnly(onlyCase)
setChangedTo(updated.email)
- }, t('settings.account.email.failedFallback'))
+ }, t('settings.account.email.changeFailed'))
const ready = emailChanged(email, user?.email) && !!current
@@ -51,6 +51,8 @@ export default function ChangeEmail() {
<Trans
i18nKey="settings.account.email.signInWith"
values={{ email: changedTo }}
+ tOptions={{ interpolation: { escapeValue: true } }}
+ shouldUnescape
components={{ email: <span className="break-all text-tx-secondary" /> }}
/>{' '}
{caseOnly
diff --git a/web/src/pages/ChangePassword.tsx b/web/src/pages/ChangePassword.tsx
index f577a5e..fdbd6a1 100644
--- a/web/src/pages/ChangePassword.tsx
+++ b/web/src/pages/ChangePassword.tsx
@@ -25,7 +25,7 @@ export default function ChangePassword() {
await userAPI.changePassword({ current_password: current, new_password: next })
setCurrent(''); setNext(''); setConfirm('')
setDone(true)
- }, t('settings.account.password.failedFallback'))
+ }, t('settings.account.password.changeFailed'))
const submit = async (e: React.FormEvent) => {
e.preventDefault()
diff --git a/web/src/pages/Dashboard.tsx b/web/src/pages/Dashboard.tsx
index 13495bb..9b701a8 100644
--- a/web/src/pages/Dashboard.tsx
+++ b/web/src/pages/Dashboard.tsx
@@ -128,16 +128,16 @@ export default function Dashboard() {
workoutAPI.list({ limit: 84 }), // 12 weeks × 7 days max
// backend's max — Up Next must see every program
programAPI.list({ limit: 100 })
- .catch(err => { absent['your programs'] = { key: 'settings.unknownError', cause: err }; return [] }),
+ .catch(err => { absent['your programs'] = { key: 'errors.unknown', cause: err }; return [] }),
foodAPI.stats(format(TODAY, 'yyyy-MM-dd'))
// A 200 carrying the wrong shape never reaches the catch. Unchecked, the missing
// field went through Math.round and the ring read "NaN".
.then(fs => isDailyStats(fs) ? fs : Promise.reject(new Error('unreadable')))
- .catch(err => { absent["today's food"] = { key: 'settings.unknownError', cause: err }; return DEFAULT_FOOD }),
+ .catch(err => { absent["today's food"] = { key: 'errors.unknown', cause: err }; return DEFAULT_FOOD }),
weightAPI.list({ limit: 14 })
- .catch(err => { absent['your weight'] = { key: 'settings.unknownError', cause: err }; return [] }),
+ .catch(err => { absent['your weight'] = { key: 'errors.unknown', cause: err }; return [] }),
weightAPI.stats()
- .catch(err => { absent['your weight'] = { key: 'settings.unknownError', cause: err }; return null }),
+ .catch(err => { absent['your weight'] = { key: 'errors.unknown', cause: err }; return null }),
])
.then(([ws, ps, fs, wl, wst]) => {
setWorkouts(ws || [])
@@ -147,7 +147,7 @@ export default function Dashboard() {
setWeightStats(wst)
setMissing(absent)
})
- .catch(err => setError({ key: 'settings.unknownError', cause: err }))
+ .catch(err => setError({ key: 'errors.unknown', cause: err }))
.finally(() => setLoading(false))
}, [TODAY, retryKey, fetchSettings])
@@ -344,7 +344,7 @@ export default function Dashboard() {
<div className="flex-1 min-w-0">
<p className="text-[10px] text-tx-muted uppercase tracking-wide font-medium truncate">{t('home.upNext.label', { name: upNext.program.name })}</p>
<p className="text-sm font-semibold text-tx-primary truncate mt-0.5">{dayLabel(upNext.day, upNext.day.order_index)}</p>
- <p className="text-xs text-tx-muted mt-0.5">{t('home.upNext.exercises', { count: (upNext.day.exercises ?? []).length })}</p>
+ <p className="text-xs text-tx-muted mt-0.5">{t('common.count.exercises', { count: (upNext.day.exercises ?? []).length })}</p>
</div>
</Link>
<button
@@ -387,7 +387,7 @@ export default function Dashboard() {
<div className="card p-3 flex flex-col gap-1.5">
<div className="flex items-center justify-between">
- <span className="text-[10px] text-tx-muted uppercase tracking-wide font-medium">{t('home.macro.protein')}</span>
+ <span className="text-[10px] text-tx-muted uppercase tracking-wide font-medium">{t('food.macro.protein')}</span>
<Beef className="w-3 h-3 text-tx-muted" />
</div>
{foodMissing ? (
@@ -557,7 +557,7 @@ export default function Dashboard() {
{[
formatDay(workoutDay(lastWorkout), 'monthDay'),
mins > 0 && t('home.lastWorkout.minutes', { mins }),
- totalSets > 0 && t('home.lastWorkout.sets', { count: totalSets }),
+ totalSets > 0 && t('common.count.sets', { count: totalSets }),
totalVolume > 0 && `${totalVolume.toLocaleString()} ${wUnit}`,
].filter(Boolean).join(' · ')}
</p>
@@ -666,9 +666,9 @@ export default function Dashboard() {
{/* Macros */}
<div className="space-y-2.5">
{[
- { id: 'protein', label: t('home.macro.protein'), val: food.total_protein, target: settings.protein_target, pct: protPct, color: '#3b82f6' },
+ { id: 'protein', label: t('food.macro.protein'), val: food.total_protein, target: settings.protein_target, pct: protPct, color: '#3b82f6' },
{ id: 'carbs', label: t('home.macro.carbs'), val: food.total_carbs, target: settings.carb_target, pct: carbsPct, color: '#f59e0b' },
- { id: 'fat', label: t('home.macro.fat'), val: food.total_fat, target: settings.fat_target, pct: fatPct, color: '#8b5cf6' },
+ { id: 'fat', label: t('food.macro.fat'), val: food.total_fat, target: settings.fat_target, pct: fatPct, color: '#8b5cf6' },
].map(m => (
<div key={m.id}>
<div className="flex justify-between items-center mb-1">
diff --git a/web/src/pages/EditProgram.tsx b/web/src/pages/EditProgram.tsx
index 7a73d90..87a1c3a 100644
--- a/web/src/pages/EditProgram.tsx
+++ b/web/src/pages/EditProgram.tsx
@@ -63,7 +63,7 @@ export default function EditProgram() {
})),
})
})
- .catch(err => { setLoadError({ key: 'settings.unknownError', cause: err }); })
+ .catch(err => { setLoadError({ key: 'errors.unknown', cause: err }); })
.finally(() => setInitialLoading(false))
}, [id, retryKey])
@@ -90,7 +90,8 @@ export default function EditProgram() {
navigate('/programs')
}, t('programs.form.updateFailed'))
- useEffect(() => { if (error || save.error) window.scrollTo({ top: 0, behavior: 'smooth' }) }, [error, save.failureKey])
+ useEffect(() => { if (error) window.scrollTo({ top: 0, behavior: 'smooth' }) }, [error])
+ useEffect(() => { if (save.failureKey) window.scrollTo({ top: 0, behavior: 'smooth' }) }, [save.failureKey])
const handleSubmit = (e: React.FormEvent) => {
e.preventDefault()
@@ -134,7 +135,7 @@ export default function EditProgram() {
<div>
<h1 className="font-display font-bold text-2xl text-tx-primary">{t('programs.form.editTitle')}</h1>
<p className="text-xs text-tx-muted">
- {t('programs.form.summary', { days: t('programs.count.days', { count: formData.days.length }), exercises: t('programs.count.exercises', { count: totalExercises }), sets: t('programs.count.sets', { count: totalSets }) })}
+ {t('programs.form.summary', { days: t('common.count.days', { count: formData.days.length }), exercises: t('common.count.exercises', { count: totalExercises }), sets: t('common.count.sets', { count: totalSets }) })}
</p>
</div>
</div>
@@ -158,7 +159,7 @@ export default function EditProgram() {
<div>
<div className="flex items-center gap-2 mb-2">
<FileText className="w-4 h-4 text-brand-500" />
- <label className="label">{t('workouts.form.notes')}</label>
+ <label className="label">{t('common.notes')}</label>
</div>
<textarea value={formData.notes} onChange={e => setFormData(prev => ({ ...prev, notes: e.target.value }))} className="input mt-1 min-h-16 resize-none" />
</div>
@@ -202,7 +203,7 @@ export default function EditProgram() {
</button>
<button type="submit" disabled={save.busy} className="flex-1 px-4 py-3 bg-brand-500 hover:bg-brand-600 disabled:opacity-40 text-white font-medium rounded-lg transition-colors flex items-center justify-center gap-2">
<BookOpen className="w-4 h-4" />
- {save.busy ? t('common.saving') : t('workouts.form.saveChanges')}
+ {save.busy ? t('common.saving') : t('common.saveChanges')}
</button>
</div>
</form>
diff --git a/web/src/pages/EditWorkout.tsx b/web/src/pages/EditWorkout.tsx
index de7f882..2d748d3 100644
--- a/web/src/pages/EditWorkout.tsx
+++ b/web/src/pages/EditWorkout.tsx
@@ -64,7 +64,7 @@ export default function EditWorkout() {
})),
})
})
- .catch(err => setLoadError({ key: 'settings.unknownError', cause: err }))
+ .catch(err => setLoadError({ key: 'errors.unknown', cause: err }))
.finally(() => setInitialLoading(false))
}, [id, retryKey])
@@ -116,7 +116,8 @@ export default function EditWorkout() {
navigate('/workouts')
}, t('workouts.form.updateFailed'))
- useEffect(() => { if (error || save.error) window.scrollTo({ top: 0, behavior: 'smooth' }) }, [error, save.failureKey])
+ useEffect(() => { if (error) window.scrollTo({ top: 0, behavior: 'smooth' }) }, [error])
+ useEffect(() => { if (save.failureKey) window.scrollTo({ top: 0, behavior: 'smooth' }) }, [save.failureKey])
const handleSubmit = (e: React.FormEvent) => {
e.preventDefault()
@@ -158,7 +159,7 @@ export default function EditWorkout() {
</button>
<div>
<h1 className="font-display font-bold text-2xl text-tx-primary">{t('workouts.form.editTitle')}</h1>
- <p className="text-xs text-tx-muted">{t('workouts.form.summary', { exercises: t('workouts.form.exerciseCount', { count: formData.exercises.length }), sets: t('workouts.form.setCount', { count: totalSets }) })}</p>
+ <p className="text-xs text-tx-muted">{t('workouts.form.summary', { exercises: t('common.count.exercises', { count: formData.exercises.length }), sets: t('common.count.sets', { count: totalSets }) })}</p>
</div>
</div>
@@ -194,7 +195,7 @@ export default function EditWorkout() {
<div>
<div className="flex items-center gap-2 mb-2">
<FileText className="w-4 h-4 text-brand-500" />
- <label className="label">{t('workouts.form.notes')}</label>
+ <label className="label">{t('common.notes')}</label>
</div>
<textarea value={formData.notes} onChange={e => setFormData(prev => ({ ...prev, notes: e.target.value }))} className="input mt-1 min-h-20 resize-none" />
</div>
@@ -215,7 +216,7 @@ export default function EditWorkout() {
</div>
<button type="button" onClick={() => setShowPicker(true)} className="flex items-center gap-1.5 px-3 py-1.5 text-xs bg-brand-500 hover:bg-brand-600 text-white rounded-lg transition-colors font-medium">
<Plus className="w-3.5 h-3.5" />
- {t('workouts.form.addExercise')}
+ {t('common.addExercise')}
</button>
</div>
@@ -242,14 +243,14 @@ export default function EditWorkout() {
</div>
<div className="mb-4">
- <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block mb-1">{t('workouts.form.notes')}</label>
+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block mb-1">{t('common.notes')}</label>
<input type="text" value={workoutEx.notes} onChange={e => { const ex = [...formData.exercises]; ex[exIdx].notes = e.target.value; setFormData(p => ({ ...p, exercises: ex })) }} className="input text-sm" />
</div>
<div className="space-y-2 mb-3">
<div className="flex items-center justify-between">
<label className="text-xs text-tx-muted font-medium uppercase tracking-wider">{t('workouts.form.sets')}</label>
- <span className="text-xs text-tx-muted">{t('workouts.form.setCount', { count: workoutEx.sets.length })}</span>
+ <span className="text-xs text-tx-muted">{t('common.count.sets', { count: workoutEx.sets.length })}</span>
</div>
{workoutEx.sets.map((set, setIdx) => (
<div key={setIdx} className="flex gap-2 items-end bg-surface-raised/40 p-3 rounded-lg border border-surface-border/50">
@@ -288,7 +289,7 @@ export default function EditWorkout() {
</button>
<button type="submit" disabled={save.busy} className="flex-1 px-4 py-3 bg-brand-500 hover:bg-brand-600 disabled:opacity-40 text-white font-medium rounded-lg transition-colors flex items-center justify-center gap-2">
<Dumbbell className="w-4 h-4" />
- {save.busy ? t('common.saving') : t('workouts.form.saveChanges')}
+ {save.busy ? t('common.saving') : t('common.saveChanges')}
</button>
</div>
</form>
diff --git a/web/src/pages/ExerciseDetail.tsx b/web/src/pages/ExerciseDetail.tsx
index 1e0a837..6055a3f 100644
--- a/web/src/pages/ExerciseDetail.tsx
+++ b/web/src/pages/ExerciseDetail.tsx
@@ -80,7 +80,7 @@ export default function ExerciseDetail() {
})
.catch(err => {
setGone(isNotFound(err))
- setError({ key: 'settings.unknownError', cause: err })
+ setError({ key: 'errors.unknown', cause: err })
})
.finally(() => setLoading(false))
}, [exerciseId, retryKey])
diff --git a/web/src/pages/Food.test.tsx b/web/src/pages/Food.test.tsx
index 8989e33..bb9846f 100644
--- a/web/src/pages/Food.test.tsx
+++ b/web/src/pages/Food.test.tsx
@@ -117,3 +117,17 @@ describe('Starring from the diary', () => {
expect(screen.queryByRole('button', { name: /Favorites/ })).toBeNull()
})
})
+
+describe('Delete confirmation', () => {
+ it('renders a food name containing markup as literal text', async () => {
+ list.mockResolvedValue([{ ...OATS, name: 'Mac <strong>x</strong>' }])
+ savedList.mockResolvedValue([])
+ const { container } = renderPage()
+
+ fireEvent.click(await screen.findByRole('button', { name: 'Delete' }))
+
+ const name = await screen.findByText('Mac <strong>x</strong>')
+ expect(name.tagName).toBe('SPAN')
+ expect(container.querySelector('strong')).toBeNull()
+ })
+})
diff --git a/web/src/pages/Food.tsx b/web/src/pages/Food.tsx
index 8eaf6e7..de13d17 100644
--- a/web/src/pages/Food.tsx
+++ b/web/src/pages/Food.tsx
@@ -139,7 +139,7 @@ export default function Food() {
.then(st => isDailyStats(st) ? st : Promise.reject(new Error('unreadable')))
.catch(err => {
statsFailed = true
- statsMessage = { key: 'settings.unknownError', cause: err }
+ statsMessage = { key: 'errors.unknown', cause: err }
return defaultStats
}),
])
@@ -152,7 +152,7 @@ export default function Food() {
return next
})
} catch (err: any) {
- setLoadError({ key: 'settings.unknownError', cause: err })
+ setLoadError({ key: 'errors.unknown', cause: err })
} finally {
hasLoadedRef.current = true
setLoading(false)
@@ -182,7 +182,7 @@ export default function Food() {
.catch(err => {
if (cancelled) return
setMissing(m => ({
- ...m, 'your history': { key: 'settings.unknownError', cause: err },
+ ...m, 'your history': { key: 'errors.unknown', cause: err },
}))
})
.finally(() => { if (!cancelled) setHistoryLoading(false) })
@@ -307,7 +307,7 @@ export default function Food() {
<ErrorState
size="section"
title={t('food.diary.totalsFailed')}
- message={t('food.diary.totalsFailedMessage')}
+ message={t('food.diary.totalsFailedHint')}
onRetry={() => void loadDay(selectedDate)}
/>
</div>
@@ -427,6 +427,8 @@ export default function Food() {
<Trans
i18nKey="food.diary.deleteConfirm"
values={{ name: entry.name }}
+ tOptions={{ interpolation: { escapeValue: true } }}
+ shouldUnescape
components={{ name: <span className="font-medium text-tx-primary" /> }}
/>
</p>
diff --git a/web/src/pages/GymModeWorkout.tsx b/web/src/pages/GymModeWorkout.tsx
index 5d80f1c..df32b7b 100644
--- a/web/src/pages/GymModeWorkout.tsx
+++ b/web/src/pages/GymModeWorkout.tsx
@@ -284,7 +284,7 @@ export default function GymModeWorkout({ wUnit }: GymModeWorkoutProps) {
<span className={`inline-flex items-center px-1.5 py-0.5 rounded text-[10px] font-medium ${muscleColor(ex.exercise.muscle_group)}`}>
{muscleLabel(ex.exercise.muscle_group)}
</span>
- <span className="text-[10px] text-tx-muted">{t('workouts.detail.setCount', { count: ex.sets.length })}</span>
+ <span className="text-[10px] text-tx-muted">{t('common.count.sets', { count: ex.sets.length })}</span>
</div>
</div>
{done && <CheckCircle2 className="w-4 h-4 text-brand-400 flex-shrink-0" />}
@@ -596,7 +596,7 @@ export default function GymModeWorkout({ wUnit }: GymModeWorkoutProps) {
{(set.target_reps > 0 || set.target_weight > 0) && (
<p className="text-sm text-tx-muted text-center">
{t('gym.target.label')}{' '}
- <span className="font-semibold text-tx-secondary tabular-nums">{set.target_reps > 0 ? t('gym.target.reps', { count: set.target_reps }) : t('gym.target.repsUnknown')}</span>
+ <span className="font-semibold text-tx-secondary tabular-nums">{set.target_reps > 0 ? t('common.count.reps', { count: set.target_reps }) : t('gym.target.repsUnknown')}</span>
{set.target_weight > 0 && (
<> · <span className="font-semibold text-tx-secondary tabular-nums">{displayWeight(set.target_weight, wUnit)} {wUnit}</span></>
)}
@@ -625,7 +625,7 @@ export default function GymModeWorkout({ wUnit }: GymModeWorkoutProps) {
{/* Weight */}
<StepperTile
- icon={Dumbbell} label={t('workouts.form.weightWithUnit', { unit: wUnit })} name={t('weight.log.weightName')} step={PLATE_STEP} disabled={set.completed}
+ icon={Dumbbell} label={t('common.weightWithUnit', { unit: wUnit })} name={t('common.weightName')} step={PLATE_STEP} disabled={set.completed}
onStep={d => updateSet(activeIdx, clampedSetIdx, 'actual_weight', displayToLbs(clampStep(displayWeight(set.actual_weight, wUnit), d, { min: 0 }), wUnit))}
>
<NumberField
diff --git a/web/src/pages/LogFood.test.tsx b/web/src/pages/LogFood.test.tsx
index c83ee92..3e21c72 100644
--- a/web/src/pages/LogFood.test.tsx
+++ b/web/src/pages/LogFood.test.tsx
@@ -68,7 +68,7 @@ describe('Log Food copy', () => {
renderPage()
expect(await screen.findByRole('heading', { name: 'Registrar comida' })).toBeTruthy()
- expect(screen.getByPlaceholderText('Buscar comida…')).toBeTruthy()
+ expect(screen.getByPlaceholderText('Buscar alimentos…')).toBeTruthy()
expect(screen.getByRole('button', { name: 'Escanear código de barras' })).toBeTruthy()
expect(screen.getByRole('button', { name: 'Favoritos' })).toBeTruthy()
expect(screen.getByLabelText('Volver')).toBeTruthy()
diff --git a/web/src/pages/LogFood.tsx b/web/src/pages/LogFood.tsx
index 43a993b..f73d127 100644
--- a/web/src/pages/LogFood.tsx
+++ b/web/src/pages/LogFood.tsx
@@ -156,7 +156,7 @@ export default function LogFood() {
setMeal(entry.meal)
setDate(entryDay(entry))
setPhase('detail')
- }).catch(err => setEditError({ key: 'settings.unknownError', cause: err }))
+ }).catch(err => setEditError({ key: 'errors.unknown', cause: err }))
}, [editId, navigate, editRetry, openOnEntry])
useEffect(() => {
@@ -241,7 +241,7 @@ export default function LogFood() {
// unreachable upstream is not an answer, and saying "not found" for it sent
// people to type in a product that does exist.
if (isNotFound(err)) enterManually()
- else setLookup({ code, error: { key: 'food.log.lookupFailed', cause: err } })
+ else setLookup({ code, error: { key: 'food.log.lookupFailedHint', cause: err } })
}
}
@@ -257,7 +257,7 @@ export default function LogFood() {
await foodAPI.log(payload)
}
navigate('/food', { replace: true })
- }, t('food.log.saveFailed'))
+ }, t('common.saveFailed'))
const handleLog = async () => {
if (!selected || save.busy) return
@@ -408,7 +408,7 @@ export default function LogFood() {
// what failed, and both ways forward keep the code already scanned.
<div className="card">
<ErrorState
- title={t('food.log.lookupFailedTitle')}
+ title={t('food.log.lookupFailed')}
message={uiMessage(lookup.error)}
onRetry={() => lookUpBarcode(lookup.code)}
secondary={<button onClick={enterManually} className="btn-secondary btn-sm">{t('food.log.enterManually')}</button>}
diff --git a/web/src/pages/ProgramDetail.tsx b/web/src/pages/ProgramDetail.tsx
index 1b4069d..ddad947 100644
--- a/web/src/pages/ProgramDetail.tsx
+++ b/web/src/pages/ProgramDetail.tsx
@@ -66,7 +66,7 @@ export default function ProgramDetail() {
setSelectedDayIdx(data.current_day_index || 0)
} catch (err: any) {
setGone(isNotFound(err))
- setError({ key: 'settings.unknownError', cause: err })
+ setError({ key: 'errors.unknown', cause: err })
} finally {
setLoading(false)
}
@@ -139,7 +139,7 @@ export default function ProgramDetail() {
newLabel = targetWeightLabel(sw, wUnit)
} else {
oldLabel = `${s.target_reps}`
- newLabel = t('programs.count.reps', { count: sr })
+ newLabel = t('common.count.reps', { count: sr })
}
return {
setId: s.id as number,
@@ -192,7 +192,7 @@ export default function ProgramDetail() {
icon={Trash2}
destructive
title={t('programs.deleteConfirmTitle')}
- message={t('common.deleteConfirmMessage', { subject: `"${program.name}"` })}
+ message={t('common.deleteNamedConfirmMessage', { name: program.name })}
confirmLabel={t('common.delete')}
busyLabel={t('common.deleting')}
busy={remove.busy}
@@ -365,7 +365,7 @@ export default function ProgramDetail() {
{/* Textual chip, not a bare dot — a color-only marker isn't
distinguishable by shape/text (a11y) and reads as decoration. */}
{isToday && (
- <span className={`text-[10px] font-bold px-1.5 py-0.5 rounded-full ${isSelected ? 'bg-white/20 text-white' : 'bg-brand-500/15 text-brand-400'}`}>{t('programs.detail.todayChip')}</span>
+ <span className={`text-[10px] font-bold px-1.5 py-0.5 rounded-full ${isSelected ? 'bg-white/20 text-white' : 'bg-brand-500/15 text-brand-400'}`}>{t('common.todayChip')}</span>
)}
</button>
)
@@ -384,7 +384,7 @@ export default function ProgramDetail() {
<>
{!restOn && (
<div className="flex items-center gap-1.5 text-[11px] text-tx-muted px-1">
- <TimerOff className="w-3.5 h-3.5" /> {t('workouts.detail.restOff')}
+ <TimerOff className="w-3.5 h-3.5" /> {t('common.rest.timerOff')}
</div>
)}
<div className="space-y-2">
@@ -398,7 +398,7 @@ export default function ProgramDetail() {
const maxTargetLbs = sets.length > 0 ? Math.max(...sets.map(s => s.target_weight || 0)) : 0
const maxTarget = displayWeight(maxTargetLbs, wUnit)
const setsSummary = [
- t('programs.count.sets', { count: sets.length }),
+ t('common.count.sets', { count: sets.length }),
...(maxTarget > 0 ? [t('programs.detail.target', { weight: maxTarget, unit: wUnit })] : []),
].join(' · ')
@@ -423,13 +423,13 @@ export default function ProgramDetail() {
)}
<div className="flex-1 min-w-0">
<p className="text-sm font-semibold text-tx-primary truncate">{ex.exercise?.name}</p>
- <div className="flex items-center gap-2 mt-0.5">
+ <div className="flex flex-wrap items-center gap-x-2 gap-y-0.5 mt-0.5">
{ex.exercise?.muscle_group && (
<span className={`inline-flex items-center px-1.5 py-0.5 rounded text-xs font-medium flex-shrink-0 ${muscleColor(ex.exercise.muscle_group)}`}>
{muscleLabel(ex.exercise.muscle_group)}
</span>
)}
- <span className="text-xs text-tx-muted truncate">{setsSummary}</span>
+ <span className="text-xs text-tx-muted">{setsSummary}</span>
</div>
</div>
<ChevronRight className="w-4 h-4 text-tx-muted flex-shrink-0" />
@@ -452,7 +452,7 @@ export default function ProgramDetail() {
})}
</div>
{restOn && (ex.rest_seconds === 0
- ? <span className="text-xs text-tx-muted flex-shrink-0">{t('workouts.detail.noRest')}</span>
+ ? <span className="text-xs text-tx-muted flex-shrink-0">{t('common.rest.none')}</span>
: <span className="flex items-center gap-1 text-xs text-tx-muted flex-shrink-0"><Pause className="w-3.5 h-3.5" />{restLabel(ex.rest_seconds ?? 90)}</span>
)}
</div>
diff --git a/web/src/pages/Programs.tsx b/web/src/pages/Programs.tsx
index 552e6d8..10bff7b 100644
--- a/web/src/pages/Programs.tsx
+++ b/web/src/pages/Programs.tsx
@@ -75,8 +75,8 @@ function ProgramCard({
<Trash2 className="w-4 h-4 text-error-400" />
</div>
<div>
- <p className="text-sm font-semibold text-tx-primary">{t('programs.card.deleteTitle', { name: program.name })}</p>
- <p className="text-xs text-tx-muted">{t('programs.card.cannotUndo')}</p>
+ <p className="text-sm font-semibold text-tx-primary">{t('common.card.deleteNamed', { name: program.name })}</p>
+ <p className="text-xs text-tx-muted">{t('common.card.cannotUndo')}</p>
{remove.error && <p className="text-xs text-error-400 mt-1">{remove.error}</p>}
</div>
</div>
@@ -129,9 +129,9 @@ function ProgramCard({
<p className="text-sm font-semibold text-tx-primary truncate">{program.name}</p>
<p className="text-xs text-tx-muted mt-0.5 whitespace-nowrap">{formatDate(new Date(program.created_at), 'monthDayYear')}</p>
<div className="flex items-center gap-x-2 mt-0.5 min-w-0 overflow-hidden">
- <span className="text-xs text-tx-muted whitespace-nowrap">{t('programs.count.exercises', { count: totalExercises })}</span>
+ <span className="text-xs text-tx-muted whitespace-nowrap">{t('common.count.exercises', { count: totalExercises })}</span>
<span className="text-tx-muted/40 text-xs">·</span>
- <span className="text-xs text-tx-muted whitespace-nowrap">{t('programs.count.sets', { count: totalSets })}</span>
+ <span className="text-xs text-tx-muted whitespace-nowrap">{t('common.count.sets', { count: totalSets })}</span>
{dayCount > 1 && today && (
<>
<span className="text-tx-muted/40 text-xs">·</span>
@@ -342,7 +342,7 @@ export default function Programs() {
<BookOpen className="w-6 h-6 text-tx-muted" />
</div>
<p className="text-sm font-medium text-tx-primary mb-1">{t('programs.list.empty.title')}</p>
- <p className="text-xs text-tx-muted">{search ? t('programs.list.empty.searchHint') : t('programs.list.empty.startHint')}</p>
+ <p className="text-xs text-tx-muted">{search ? t('common.tryDifferentSearch') : t('programs.list.empty.startHint')}</p>
</div>
) : (
<>
@@ -357,7 +357,7 @@ export default function Programs() {
<div ref={sentinelRef} />
{listError && <ListError subject={t('programs.list.errorSubject')} message={listError} onRetry={retryList} />}
{hasMore && loading && (
- <p className="text-center text-xs text-tx-muted py-2">{t('programs.list.loadingMore')}</p>
+ <p className="text-center text-xs text-tx-muted py-2">{t('common.loadingMore')}</p>
)}
</>
)}
diff --git a/web/src/pages/Settings.tsx b/web/src/pages/Settings.tsx
index 40d3645..111b096 100644
--- a/web/src/pages/Settings.tsx
+++ b/web/src/pages/Settings.tsx
@@ -143,7 +143,7 @@ export default function Settings() {
fat_target: s.fat_target,
})
} catch (err: any) {
- setError({ key: 'settings.unknownError', cause: err })
+ setError({ key: 'errors.unknown', cause: err })
} finally {
setLoading(false)
}
@@ -209,7 +209,7 @@ export default function Settings() {
await updateSettings(formData)
setSuccess(true)
setTimeout(() => setSuccess(false), 3000)
- }, t('settings.targets.saveFailedFallback'))
+ }, t('settings.saveFailed'))
// Mobile has had this since it shipped; web rendered the button and wired nothing to
// it, so "Delete account" was a control that did nothing at all — worse than absent,
@@ -306,7 +306,7 @@ export default function Settings() {
"Saving…" state with it. */}
{(nameDirty || saveName.busy) && (
<button onClick={handleSaveName} disabled={saveName.busy} className="btn-secondary btn-sm flex-shrink-0">
- {saveName.busy ? t('settings.account.name.saving') : t('settings.account.name.save')}
+ {saveName.busy ? t('common.saving') : t('common.save')}
</button>
)}
</div>
@@ -420,12 +420,12 @@ export default function Settings() {
))}
<button disabled={!enabled} onClick={() => setShowCustomRest(true)} className={seg(customActive)}>
<Pencil className="w-3.5 h-3.5 flex-shrink-0" />
- <span className="text-[11px] font-semibold leading-none">{isCustom ? t('settings.workout.defaultRest.preset', { seconds: cur }) : t('settings.workout.defaultRest.custom')}</span>
+ <span className="text-[11px] font-semibold leading-none">{isCustom ? t('settings.workout.defaultRest.preset', { seconds: cur }) : t('workouts.rest.custom')}</span>
</button>
</div>
{customActive && (
<div className="flex items-center justify-center gap-2 mt-3">
- <button type="button" disabled={!enabled} aria-label={t('settings.workout.defaultRest.minusFive')} onClick={() => setRestSeconds(Math.max(0, cur - 5))}
+ <button type="button" disabled={!enabled} aria-label={t('common.rest.decrease5')} onClick={() => setRestSeconds(Math.max(0, cur - 5))}
className="p-2.5 rounded-xl bg-surface-muted border border-surface-border text-tx-secondary active:scale-95 hover:text-tx-primary">
<Minus className="w-4 h-4" />
</button>
@@ -440,9 +440,9 @@ export default function Settings() {
className="input w-28 text-center py-2.5 pr-9 text-base font-semibold tabular-nums"
aria-label={t('settings.workout.defaultRest.customLabel')}
/>
- <span className="absolute right-3 top-1/2 -translate-y-1/2 text-xs text-tx-muted pointer-events-none">{t('settings.workout.defaultRest.secondsUnit')}</span>
+ <span className="absolute right-3 top-1/2 -translate-y-1/2 text-xs text-tx-muted pointer-events-none">{t('workouts.rest.secondsUnit')}</span>
</div>
- <button type="button" disabled={!enabled} aria-label={t('settings.workout.defaultRest.plusFive')} onClick={() => setRestSeconds(Math.min(3600, cur + 5))}
+ <button type="button" disabled={!enabled} aria-label={t('common.rest.increase5')} onClick={() => setRestSeconds(Math.min(3600, cur + 5))}
className="p-2.5 rounded-xl bg-surface-muted border border-surface-border text-tx-secondary active:scale-95 hover:text-tx-primary">
<Plus className="w-4 h-4" />
</button>
@@ -465,16 +465,16 @@ export default function Settings() {
defaults, so the inputs showed 2000/150/250/65 and Save PUT them over real
targets of 3175/205/310/88. Measured, not theorised. */}
{settingsLoadFailed ? (
- <Section title={t('settings.goalsUnits.title')}>
+ <Section title={t('settings.targets.titleWeb')}>
<ErrorState
size="section"
- title={t('settings.targets.loadFailedTitle')}
- message={t('settings.goalsUnits.loadFailedMessage')}
+ title={t('settings.targets.loadFailed')}
+ message={t('settings.targets.loadFailedHintWeb')}
onRetry={() => { void load() }}
/>
</Section>
) : (
- <Section title={t('settings.goalsUnits.title')}>
+ <Section title={t('settings.targets.titleWeb')}>
<SettingRow
label={t('settings.targets.weightUnit.label')}
description={unitError ? uiMessage(unitError) : t('settings.targets.weightUnit.description')}
@@ -635,7 +635,7 @@ export default function Settings() {
</SettingRow>
<SettingRow label={t('settings.deleteAccount.label')} description={t('settings.deleteAccount.description')}>
<button onClick={() => setConfirmDelete(true)} className="btn-danger btn-sm">
- <Trash2 className="w-3.5 h-3.5" /> {t('settings.deleteAccount.button')}
+ <Trash2 className="w-3.5 h-3.5" /> {t('common.delete')}
</button>
</SettingRow>
</Section>
@@ -649,7 +649,7 @@ export default function Settings() {
title={t('settings.deleteAccount.sheetTitle')}
message={t('settings.deleteAccount.sheetMessage')}
confirmLabel={t('settings.deleteAccount.confirm')}
- busyLabel={t('settings.deleteAccount.busy')}
+ busyLabel={t('common.deleting')}
busy={deleteAccount.busy}
error={deleteAccount.error ?? undefined}
onConfirm={() => { void deleteAccount.run() }}
diff --git a/web/src/pages/Weight.tsx b/web/src/pages/Weight.tsx
index 93e41c4..66e7690 100644
--- a/web/src/pages/Weight.tsx
+++ b/web/src/pages/Weight.tsx
@@ -470,8 +470,8 @@ export default function Weight() {
<form ref={logFormRef} onSubmit={handleLog} className="space-y-3">
<StepperTile
icon={Scale}
- label={t('weight.log.weightLabel', { unit: wUnit })}
- name={t('weight.log.weightName')}
+ label={t('common.weightWithUnit', { unit: wUnit })}
+ name={t('common.weightName')}
step={BODYWEIGHT_STEP}
onStep={d => setNewWeight(String(clampStep(parseFloat(newWeight) || 0, d, { max: maxWeight(settings.weight_unit) })))}
>
@@ -534,7 +534,7 @@ export default function Weight() {
}}
className="px-3 py-1 rounded-lg text-xs font-medium bg-amber-500/20 border border-amber-500/30 text-amber-300 hover:bg-amber-500/30 transition-colors"
>
- {t('weight.log.logAnyway')}
+ {t('weight.logAnyway')}
</button>
</div>
</div>
@@ -710,7 +710,7 @@ export default function Weight() {
</div>
<div ref={sentinelRef} />
{hasMore && listLoading && (
- <p className="text-center text-xs text-tx-muted py-2">{t('weight.history.loadingMore')}</p>
+ <p className="text-center text-xs text-tx-muted py-2">{t('common.loadingMore')}</p>
)}
</>
)}
diff --git a/web/src/pages/WeightDetail.tsx b/web/src/pages/WeightDetail.tsx
index ddecdaa..a6679e3 100644
--- a/web/src/pages/WeightDetail.tsx
+++ b/web/src/pages/WeightDetail.tsx
@@ -41,7 +41,7 @@ export default function WeightDetail() {
.then(setLog)
.catch(err => {
setGone(isNotFound(err))
- setError({ key: 'settings.unknownError', cause: err })
+ setError({ key: 'errors.unknown', cause: err })
})
.finally(() => setLoading(false))
}, [id, retryKey])
@@ -63,7 +63,7 @@ export default function WeightDetail() {
})
setLog(updated)
setEditing(false)
- }, t('weight.detail.saveFailed'))
+ }, t('common.saveFailed'))
// `badWeight` is what this page can say about the value in the box; the hook carries
// what the server said. The entry is passed to run() because the guard below is what
@@ -179,8 +179,8 @@ export default function WeightDetail() {
<StepperTile
icon={Scale}
- label={t('weight.log.weightLabel', { unit: wUnit })}
- name={t('weight.log.weightName')}
+ label={t('common.weightWithUnit', { unit: wUnit })}
+ name={t('common.weightName')}
step={BODYWEIGHT_STEP}
onStep={d => setEditWeight(String(clampStep(parseFloat(editWeight) || 0, d, { max: maxWeight(settings.weight_unit) })))}
>
@@ -206,7 +206,7 @@ export default function WeightDetail() {
type="text"
value={editNotes}
onChange={e => setEditNotes(e.target.value)}
- placeholder={t('weight.detail.notePlaceholder')}
+ placeholder={t('weight.notePlaceholder')}
maxLength={200}
className="input mt-1"
/>
diff --git a/web/src/pages/WorkoutDetail.tsx b/web/src/pages/WorkoutDetail.tsx
index 94f81c4..908248c 100644
--- a/web/src/pages/WorkoutDetail.tsx
+++ b/web/src/pages/WorkoutDetail.tsx
@@ -50,7 +50,7 @@ export default function WorkoutDetail() {
setWorkout(data)
} catch (err: any) {
setGone(isNotFound(err))
- setError({ key: 'settings.unknownError', cause: err })
+ setError({ key: 'errors.unknown', cause: err })
} finally {
setLoading(false)
}
@@ -123,7 +123,7 @@ export default function WorkoutDetail() {
icon={Trash2}
destructive
title={t('workouts.deleteConfirmTitle')}
- message={t('common.deleteConfirmMessage', { subject: `"${workout.name}"` })}
+ message={t('common.deleteNamedConfirmMessage', { name: workout.name })}
confirmLabel={t('common.delete')}
busyLabel={t('common.deleting')}
busy={remove.busy}
@@ -191,7 +191,7 @@ export default function WorkoutDetail() {
{/* Exercises */}
{!restOn && (
<div className="flex items-center gap-1.5 text-[11px] text-tx-muted px-1">
- <TimerOff className="w-3.5 h-3.5" /> {t('workouts.detail.restOff')}
+ <TimerOff className="w-3.5 h-3.5" /> {t('common.rest.timerOff')}
</div>
)}
<div className="space-y-3">
@@ -201,7 +201,7 @@ export default function WorkoutDetail() {
const maxWeight = displayWeight(maxWeightLbs, wUnit)
const exVol = displayVolume(exerciseVolume(sets), wUnit)
const setsSummary = [
- t('workouts.detail.setCount', { count: sets.length }),
+ t('common.count.sets', { count: sets.length }),
...(exVol > 0 ? [`${exVol.toLocaleString()} ${wUnit}`] : []),
].join(' · ')
@@ -226,13 +226,13 @@ export default function WorkoutDetail() {
)}
<div className="flex-1 min-w-0">
<p className="text-sm font-semibold text-tx-primary truncate">{ex.exercise?.name}</p>
- <div className="flex items-center gap-2 mt-0.5">
+ <div className="flex flex-wrap items-center gap-x-2 gap-y-0.5 mt-0.5">
{ex.exercise?.muscle_group && (
<span className={`inline-flex items-center px-1.5 py-0.5 rounded text-xs font-medium flex-shrink-0 ${muscleColor(ex.exercise.muscle_group)}`}>
{muscleLabel(ex.exercise.muscle_group)}
</span>
)}
- <span className="text-xs text-tx-muted truncate">{setsSummary}</span>
+ <span className="text-xs text-tx-muted">{setsSummary}</span>
</div>
</div>
{maxWeight > 0 && (
@@ -252,7 +252,7 @@ export default function WorkoutDetail() {
))}
</div>
{restOn && (ex.rest_seconds === 0
- ? <span className="text-xs text-tx-muted flex-shrink-0">{t('workouts.detail.noRest')}</span>
+ ? <span className="text-xs text-tx-muted flex-shrink-0">{t('common.rest.none')}</span>
: <span className="flex items-center gap-1 text-xs text-tx-muted flex-shrink-0"><Pause className="w-3.5 h-3.5" />{restLabel(ex.rest_seconds ?? 90)}</span>
)}
</div>
diff --git a/web/src/pages/Workouts.tsx b/web/src/pages/Workouts.tsx
index f0d8b78..66201ad 100644
--- a/web/src/pages/Workouts.tsx
+++ b/web/src/pages/Workouts.tsx
@@ -52,8 +52,8 @@ function WorkoutCard({ workout, onEdit, onDelete }: { workout: types.Workout; on
<Trash2 className="w-4 h-4 text-error-400" />
</div>
<div>
- <p className="text-sm font-semibold text-tx-primary">{t('workouts.card.deleteTitle', { name: workout.name })}</p>
- <p className="text-xs text-tx-muted">{t('workouts.card.cannotUndo')}</p>
+ <p className="text-sm font-semibold text-tx-primary">{t('common.card.deleteNamed', { name: workout.name })}</p>
+ <p className="text-xs text-tx-muted">{t('common.card.cannotUndo')}</p>
{remove.error && <p className="text-xs text-error-400 mt-1">{remove.error}</p>}
</div>
</div>
@@ -101,7 +101,7 @@ function WorkoutCard({ workout, onEdit, onDelete }: { workout: types.Workout; on
</span>
)}
{durationMin > 0 && <span className="text-tx-muted/40 text-xs">·</span>}
- <span className="text-xs text-tx-muted whitespace-nowrap">{t('workouts.card.exercises', { count: workout.exercises?.length || 0 })}</span>
+ <span className="text-xs text-tx-muted whitespace-nowrap">{t('common.count.exercises', { count: workout.exercises?.length || 0 })}</span>
{totalVolume > 0 && (
<>
<span className="text-tx-muted/40 text-xs">·</span>
@@ -284,9 +284,9 @@ export default function Workouts() {
<div className="flex items-center gap-1.5 mb-2">
<span className="stat-label truncate">{s.label}</span>
</div>
- <div className="flex items-end gap-1 min-w-0">
+ <div className="flex flex-wrap items-end gap-x-1 min-w-0">
<span className="stat-value text-xl">{s.value}</span>
- <span className="text-xs text-tx-muted mb-0.5 truncate">{s.unit}</span>
+ <span className="text-xs text-tx-muted mb-0.5">{s.unit}</span>
</div>
</div>
))}
@@ -312,7 +312,7 @@ export default function Workouts() {
<EmptyState
icon={Dumbbell}
title={t('workouts.list.empty.title')}
- subtitle={search ? t('workouts.list.empty.searchHint') : t('workouts.list.empty.startHint')}
+ subtitle={search ? t('common.tryDifferentSearch') : t('workouts.list.empty.startHint')}
/>
) : (
<>
@@ -323,7 +323,7 @@ export default function Workouts() {
<div ref={sentinelRef} />
{listError && <ListError subject={t('workouts.list.errorSubject')} message={listError} onRetry={retryList} />}
{hasMore && loading && (
- <p className="text-center text-xs text-tx-muted py-2">{t('workouts.list.loadingMore')}</p>
+ <p className="text-center text-xs text-tx-muted py-2">{t('common.loadingMore')}</p>
)}
</>
)}