From 0bebac8af1bcd9b29535be399568d2a671dbee00 Mon Sep 17 00:00:00 2001 From: "Matthew Emerson Spotnitz, PhD" Date: Thu, 29 Oct 2026 19:04:40 -0600 Subject: [PATCH 01/30] feat: clarify portion and date editing in the web diary --- public/locales/en/translation.json | 1 + .../Nutrition/api/nutritionalDiary.test.ts | 6 +- .../Nutrition/api/nutritionalDiary.ts | 13 ++- .../widgets/IngredientDetailTable.test.tsx | 20 ++++ .../widgets/IngredientDetailTable.tsx | 14 ++- .../widgets/forms/IngredientAmountFields.tsx | 14 ++- .../forms/NutritionDiaryEntryForm.test.tsx | 97 ++++++++++++++++--- .../widgets/forms/NutritionDiaryEntryForm.tsx | 27 +++--- 8 files changed, 157 insertions(+), 35 deletions(-) create mode 100644 src/components/Nutrition/widgets/IngredientDetailTable.test.tsx diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index 7f44ddee2..d858cfd3a 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -133,6 +133,7 @@ "swapExercise": "Swap exercise" }, "nutrition": { + "invalidPortion": "Enter an amount from 1 to 1000 with at most two decimal places.", "plans": "Nutritional plans", "copyPlan": "Make a copy of this plan", "plan": "Nutritional plan", diff --git a/src/components/Nutrition/api/nutritionalDiary.test.ts b/src/components/Nutrition/api/nutritionalDiary.test.ts index ce109dd1e..cf9659a85 100644 --- a/src/components/Nutrition/api/nutritionalDiary.test.ts +++ b/src/components/Nutrition/api/nutritionalDiary.test.ts @@ -126,7 +126,11 @@ describe("Nutritional diary service tests", () => { expect(axios.patch).toHaveBeenCalledTimes(1); const [url, body] = (axios.patch as Mock).mock.calls[0]; expect(url).toMatch(new RegExp(`/api/v2/nutritiondiary/${RESPONSE_DIARY_UUID}/$`)); - expect(body).toMatchObject({ amount: "99" }); + expect(body).toEqual({ + amount: 99, + datetime: "2024-08-01T08:00:00.000Z", + weight_unit: null, + }); expect(result.amount).toBe(99); }); diff --git a/src/components/Nutrition/api/nutritionalDiary.ts b/src/components/Nutrition/api/nutritionalDiary.ts index 5cba5d0d5..301abb246 100644 --- a/src/components/Nutrition/api/nutritionalDiary.ts +++ b/src/components/Nutrition/api/nutritionalDiary.ts @@ -57,10 +57,21 @@ export const addNutritionalDiaryEntry = async (diaryEntry: DiaryEntry): Promise< return DiaryEntry.fromJson(response.data); }; +export type DiaryEntryEditPayload = { + amount: number; + datetime: string; + weight_unit: number | null; +}; + export const editNutritionalDiaryEntry = async (diaryEntry: DiaryEntry): Promise => { + const payload: DiaryEntryEditPayload = { + amount: diaryEntry.amount, + datetime: diaryEntry.datetime.toISOString(), + weight_unit: diaryEntry.weightUnitId, + }; const response = await axios.patch( makeUrl(ApiPath.NUTRITIONAL_DIARY, { id: diaryEntry.id! }), - diaryEntry.toJson(), + payload, { headers: makeHeader() } ); diff --git a/src/components/Nutrition/widgets/IngredientDetailTable.test.tsx b/src/components/Nutrition/widgets/IngredientDetailTable.test.tsx new file mode 100644 index 000000000..2ed49d6f5 --- /dev/null +++ b/src/components/Nutrition/widgets/IngredientDetailTable.test.tsx @@ -0,0 +1,20 @@ +import { IngredientDetailTable } from './IngredientDetailTable'; +import { TEST_DIARY_ENTRY_1 } from '@/tests/nutritionDiaryTestdata'; +import { render, screen } from '@testing-library/react'; +import userEvent from '@testing-library/user-event'; + +vi.mock('./forms/NutritionDiaryEntryForm', () => ({ + NutritionDiaryEntryForm: () =>
Portion editor
, +})); + +test('the explicit Edit action opens the diary editor by keyboard', async () => { + const user = userEvent.setup(); + render(); + const edit = screen.getByRole('button', { name: 'edit' }); + edit.focus(); + await user.keyboard('{Enter}'); + expect(screen.getByText('Portion editor')).toBeInTheDocument(); + expect(edit).toHaveAttribute('aria-expanded', 'true'); +}); diff --git a/src/components/Nutrition/widgets/IngredientDetailTable.tsx b/src/components/Nutrition/widgets/IngredientDetailTable.tsx index 0f127028e..f5fef9b2e 100644 --- a/src/components/Nutrition/widgets/IngredientDetailTable.tsx +++ b/src/components/Nutrition/widgets/IngredientDetailTable.tsx @@ -1,5 +1,6 @@ import PhotoIcon from "@mui/icons-material/Photo"; -import { Avatar, Collapse, Table, TableBody, TableCell, TableContainer, TableHead, TableRow } from "@mui/material"; +import EditOutlinedIcon from "@mui/icons-material/EditOutlined"; +import { Avatar, Collapse, IconButton, Table, TableBody, TableCell, TableContainer, TableHead, TableRow } from "@mui/material"; import { NutritionalValues } from "@/components/Nutrition/helpers/nutritionalValues"; import { DiaryEntry } from "@/components/Nutrition/models/diaryEntry"; import { Meal } from "@/components/Nutrition/models/meal"; @@ -35,6 +36,13 @@ const IngredientTableRow = (props: { item: MealItem | DiaryEntry, planId?: strin {props.item.amountString} {props.item.ingredient?.name} + {isEditable && { + event.stopPropagation(); + handleToggleForm(); + }}> + + } {t('nutrition.valueEnergyKcalKj', { @@ -73,7 +81,7 @@ export const IngredientDetailTable = (props: { showSum: boolean, // When given, diary entry rows can be expanded to an edit form planId?: string, - // When given, the edit form lets the user move the entry to another meal + // Retained for callers that also use this table for meal context meals?: Meal[] }) => { const [t, i18n] = useTranslation(); @@ -118,4 +126,4 @@ export const IngredientDetailTable = (props: { ; -}; \ No newline at end of file +}; diff --git a/src/components/Nutrition/widgets/forms/IngredientAmountFields.tsx b/src/components/Nutrition/widgets/forms/IngredientAmountFields.tsx index 754ebca14..e4707a88d 100644 --- a/src/components/Nutrition/widgets/forms/IngredientAmountFields.tsx +++ b/src/components/Nutrition/widgets/forms/IngredientAmountFields.tsx @@ -19,6 +19,7 @@ type IngredientAmountFieldsProps = { onWeightUnitChange: (unit: NutritionWeightUnit | null) => void, amount: number, ingredientError?: string, + ingredientReadOnly?: boolean, /** Renders the form's bound amount field with the given end adornment */ renderAmountField: (endAdornment: React.ReactNode) => React.ReactNode, @@ -45,7 +46,9 @@ export const IngredientAmountFields = (props: IngredientAmountFieldsProps) => { ; return <> - {ingredient === null + {ingredient === null && props.ingredientReadOnly + ? … + : ingredient === null ? <> {props.ingredientError !== undefined && ( @@ -54,7 +57,8 @@ export const IngredientAmountFields = (props: IngredientAmountFieldsProps) => { )} - : changeIngredient(null)} /> + : changeIngredient(null)} /> } {props.renderAmountField(endAdornment)} @@ -91,7 +95,7 @@ export const IngredientAmountFields = (props: IngredientAmountFieldsProps) => { ; }; -const SelectedIngredient = (props: { ingredient: Ingredient, onClear: () => void }) => { +const SelectedIngredient = (props: { ingredient: Ingredient, onClear?: () => void }) => { const [t, i18n] = useTranslation(); const { ingredient } = props; @@ -115,9 +119,9 @@ const SelectedIngredient = (props: { ingredient: Ingredient, onClear: () => void > - + {props.onClear && - + } ; }; diff --git a/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.test.tsx b/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.test.tsx index f8b34f60d..3c4eab019 100644 --- a/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.test.tsx +++ b/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.test.tsx @@ -1,5 +1,6 @@ import { searchIngredient } from "@/components/Nutrition/api/ingredient"; import { DiaryEntry } from "@/components/Nutrition/models/diaryEntry"; +import { Ingredient } from "@/components/Nutrition/models/Ingredient"; import { useAddDiaryEntryQuery, useDeleteDiaryEntryQuery, @@ -10,7 +11,7 @@ import { NutritionDiaryEntryForm } from "@/components/Nutrition/widgets/forms/Nu import { TEST_INGREDIENT_1, TEST_INGREDIENT_2 } from "@/tests/ingredientTestdata"; import { mutateMock } from "@/tests/mutationMock"; import { TEST_DIARY_ENTRY_1 } from "@/tests/nutritionDiaryTestdata"; -import { TEST_MEAL_1, TEST_MEAL_2 } from "@/tests/nutritionTestdata"; +import { TEST_MEAL_1, TEST_MEAL_2, TEST_WEIGHT_UNIT_SLICE } from "@/tests/nutritionTestdata"; import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; import { render, screen, within } from '@testing-library/react'; import userEvent, { UserEvent } from "@testing-library/user-event"; @@ -63,6 +64,73 @@ describe('Test the NutritionDiaryEntryForm component', () => { }); + test('clearing a serving unit saves null without mutating the source entry', async () => { + const user = userEvent.setup(); + const entry = DiaryEntry.clone(TEST_DIARY_ENTRY_1, { + ingredient: new Ingredient({ ...TEST_INGREDIENT_1, weightUnits: [TEST_WEIGHT_UNIT_SLICE] }), + weightUnit: TEST_WEIGHT_UNIT_SLICE, + }); + render(); + await user.click(screen.getByRole('button', { name: 'nutrition.gramShort' })); + await user.click(screen.getByRole('button', { name: 'submit' })); + expect(mutateEditMock).toHaveBeenCalledWith(expect.objectContaining({ + weightUnitId: null, weightUnit: null, ingredientId: entry.ingredientId, + }), expect.anything()); + expect(entry.weightUnitId).toBe(TEST_WEIGHT_UNIT_SLICE.id); + expect(entry.weightUnit).toBe(TEST_WEIGHT_UNIT_SLICE); + }); + + test('closing a draft leaves the cached entry unchanged', async () => { + const user = userEvent.setup(); + const entry = DiaryEntry.clone(TEST_DIARY_ENTRY_1); + render(); + await user.clear(screen.getByLabelText('amount')); + await user.type(screen.getByLabelText('amount'), '80.5'); + await user.click(screen.getByRole('button', { name: 'close' })); + expect(entry.amount).toBe(120); + expect(mutateEditMock).not.toHaveBeenCalled(); + expect(closeFnMock).toHaveBeenCalledOnce(); + }); + + test.each(['1', '1000', '80.55', '80,55'])('accepts portion %s', async value => { + const user = userEvent.setup(); + render(); + await user.clear(screen.getByLabelText('amount')); + await user.type(screen.getByLabelText('amount'), value); + await user.click(screen.getByRole('button', { name: 'submit' })); + expect(mutateEditMock).toHaveBeenCalledWith(expect.objectContaining({ + amount: Number(value.replace(',', '.')), + }), expect.anything()); + }); + + test.each(['0.99', '1000.01', '1.001'])('rejects portion %s', async value => { + const user = userEvent.setup(); + render(); + await user.clear(screen.getByLabelText('amount')); + await user.type(screen.getByLabelText('amount'), value); + await user.click(screen.getByRole('button', { name: 'submit' })); + expect(mutateEditMock).not.toHaveBeenCalled(); + }); + + test('a pending save disables resubmission', () => { + (useEditDiaryEntryQuery as Mock).mockReturnValue({ mutate: mutateEditMock, isPending: true }); + render(); + expect(screen.getByRole('button', { name: 'submit' })).toBeDisabled(); + }); + + test('a failed write leaves the form open and displays the error', async () => { + const user = userEvent.setup(); + (useEditDiaryEntryQuery as Mock).mockReturnValue({ + mutate: vi.fn(), isError: true, error: { message: 'Unable to save', response: { data: {} } }, + }); + render(); + await user.click(screen.getByRole('button', { name: 'submit' })); + expect(closeFnMock).not.toHaveBeenCalled(); + expect(screen.getByRole('alert')).toHaveTextContent('Unable to save'); + expect(screen.getByLabelText('amount')).toBeInTheDocument(); + }); + test('A new entry should be added - no meal', async () => { // Arrange const user = userEvent.setup(); @@ -133,7 +201,10 @@ describe('Test the NutritionDiaryEntryForm component', () => { closeFn={closeFnMock} /> ); - await fillInEntry(user, '1001 Nacht Haferbrei'); + expect(screen.queryByRole('button', { name: 'nutrition.changeIngredient' })).not.toBeInTheDocument(); + await user.clear(screen.getByLabelText('amount')); + await user.type(screen.getByLabelText('amount'), '80,5'); + await user.click(screen.getByRole('button', { name: 'submit' })); // Assert expect(mutateAddMock).not.toHaveBeenCalled(); @@ -141,11 +212,10 @@ describe('Test the NutritionDiaryEntryForm component', () => { expect(mutateEditMock).toHaveBeenCalledWith( expect.objectContaining({ id: 'dddddddd-0000-0000-0000-000000000042', - amount: 120, + amount: 80.5, mealId: 'bbbbbbbb-0000-0000-0000-000000000078', - planId: 'aaaaaaaa-0000-0000-0000-000000000123', - // The newly selected ingredient, not the entry's original one - ingredientId: 102, + planId: TEST_DIARY_ENTRY_1.planId, + ingredientId: 101, }) , expect.anything()); }); @@ -180,7 +250,7 @@ describe('Test the NutritionDiaryEntryForm component', () => { , expect.anything()); }); - test('Editing shows the entry\'s meal preselected when meals are passed', async () => { + test('Editing preserves the meal without offering a meal selector', async () => { // Arrange const user = userEvent.setup(); @@ -193,7 +263,7 @@ describe('Test the NutritionDiaryEntryForm component', () => { ); // Assert - the meal the entry belongs to is selected, not an empty field - expect(screen.getByDisplayValue('Second breakfast')).toBeInTheDocument(); + expect(screen.queryByRole('combobox')).not.toBeInTheDocument(); // Submitting keeps that meal await user.click(screen.getByRole('button', { name: 'submit' })); @@ -234,7 +304,7 @@ describe('Test the NutritionDiaryEntryForm component', () => { closeFn={closeFnMock} /> ); - await fillInEntry(user, '1001 Nacht Haferbrei'); + await user.click(screen.getByRole('button', { name: 'submit' })); // Assert expect(mutateAddMock).not.toHaveBeenCalled(); @@ -242,13 +312,12 @@ describe('Test the NutritionDiaryEntryForm component', () => { expect(mutateEditMock).toHaveBeenCalledWith( expect.objectContaining({ id: 'dddddddd-0000-0000-0000-000000000042', - planId: 'aaaaaaaa-0000-0000-0000-000000000123', - mealId: 'bbbbbbbb-0000-0000-0000-000000000456', + planId: TEST_DIARY_ENTRY_1.planId, + mealId: TEST_DIARY_ENTRY_1.mealId, amount: 120, - // The newly selected ingredient, not the entry's original one - ingredientId: 102, + ingredientId: 101, weightUnitId: null, }) , expect.anything()); }); -}); \ No newline at end of file +}); diff --git a/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.tsx b/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.tsx index 100324c32..86a51cdfa 100644 --- a/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.tsx +++ b/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.tsx @@ -49,13 +49,17 @@ export const NutritionDiaryEntryForm = ({ planId, entry, mealId, meals, closeFn const [selectedIngredient, setSelectedIngredient] = useState(entry?.ingredient ?? null); const [selectedUnit, setSelectedUnit] = useState(entry?.weightUnit ?? null); + const [selectedUnitId, setSelectedUnitId] = useState(entry?.weightUnitId ?? null); const validationSchema = yup.object({ amount: yup .number() + .transform((value, original: unknown) => typeof original === 'string' ? Number(original.replace(',', '.')) : value) .required(t('forms.fieldRequired')) .max(1000, t('forms.maxValue', { value: '1000' })) - .min(1, t('forms.minValue', { value: '1' })), + .min(1, t('forms.minValue', { value: '1' })) + .test('precision', t('nutrition.invalidPortion'), value => + value === undefined || (Number.isFinite(value) && value === Number(value.toFixed(2)))), ingredient: yup .number() .nullable() @@ -94,18 +98,14 @@ export const NutritionDiaryEntryForm = ({ planId, entry, mealId, meals, closeFn } // Make sure "amount" is a number - const newAmount = Number(value.amount); + const newAmount = Number(value.amount.replace(',', '.')); if (entry) { // Edit const newDiaryEntry = DiaryEntry.clone(entry, { - mealId: selectedMeal, - planId: planId, amount: newAmount, datetime: value.datetime, - ingredientId: value.ingredient, - ingredient: selectedIngredient, - weightUnitId: selectedUnit?.id ?? null, + weightUnitId: selectedUnitId, weightUnit: selectedUnit, }); editDiaryQuery.mutate(newDiaryEntry, closeOnSuccess); @@ -131,14 +131,18 @@ export const NutritionDiaryEntryForm = ({ planId, entry, mealId, meals, closeFn {field => state.values.amount}> {amount => { field.handleChange(value?.id ?? null); setSelectedIngredient(value); }} ingredientError={fieldError(field)} weightUnit={selectedUnit} - onWeightUnitChange={setSelectedUnit} - amount={Number(amount)} + onWeightUnitChange={unit => { + setSelectedUnit(unit); + setSelectedUnitId(unit?.id ?? null); + }} + amount={Number(amount.replace(',', '.'))} renderAmountField={endAdornment => {amountField => } } - {mealObjs.length > 0 && 0 && e.id)} getOptionLabel={option => mealObjs.find(e => e.id === option)!.displayName!} @@ -202,7 +206,8 @@ export const NutritionDiaryEntryForm = ({ planId, entry, mealId, meals, closeFn && } - From 8bbc4b37757544aba0d93b502c30fe93a43d8963 Mon Sep 17 00:00:00 2001 From: "Matthew Emerson Spotnitz, PhD" Date: Thu, 29 Oct 2026 19:14:13 -0600 Subject: [PATCH 02/30] fix: preserve unresolved diary units and pending error visibility --- public/locales/en/translation.json | 1 + .../widgets/IngredientDetailTable.test.tsx | 7 ++++++- .../widgets/IngredientDetailTable.tsx | 6 ++++-- .../widgets/forms/IngredientAmountFields.tsx | 15 +++++++++------ .../forms/NutritionDiaryEntryForm.test.tsx | 19 ++++++++++++++++++- .../widgets/forms/NutritionDiaryEntryForm.tsx | 14 +++++++++----- 6 files changed, 47 insertions(+), 15 deletions(-) diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index d858cfd3a..d646b4be9 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -134,6 +134,7 @@ }, "nutrition": { "invalidPortion": "Enter an amount from 1 to 1000 with at most two decimal places.", + "unavailableWeightUnit": "Serving unit unavailable", "plans": "Nutritional plans", "copyPlan": "Make a copy of this plan", "plan": "Nutritional plan", diff --git a/src/components/Nutrition/widgets/IngredientDetailTable.test.tsx b/src/components/Nutrition/widgets/IngredientDetailTable.test.tsx index 2ed49d6f5..2c007b7da 100644 --- a/src/components/Nutrition/widgets/IngredientDetailTable.test.tsx +++ b/src/components/Nutrition/widgets/IngredientDetailTable.test.tsx @@ -4,7 +4,8 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; vi.mock('./forms/NutritionDiaryEntryForm', () => ({ - NutritionDiaryEntryForm: () =>
Portion editor
, + NutritionDiaryEntryForm: ({ onPendingChange }: { onPendingChange?: (pending: boolean) => void }) => +
Portion editor
, })); test('the explicit Edit action opens the diary editor by keyboard', async () => { @@ -17,4 +18,8 @@ test('the explicit Edit action opens the diary editor by keyboard', async () => await user.keyboard('{Enter}'); expect(screen.getByText('Portion editor')).toBeInTheDocument(); expect(edit).toHaveAttribute('aria-expanded', 'true'); + await user.click(screen.getByRole('button', { name: 'Start save' })); + expect(edit).toBeDisabled(); + await user.click(screen.getByText(/0% fat Greek style yogurt/)); + expect(screen.getByText('Portion editor')).toBeInTheDocument(); }); diff --git a/src/components/Nutrition/widgets/IngredientDetailTable.tsx b/src/components/Nutrition/widgets/IngredientDetailTable.tsx index f5fef9b2e..dd3cc8b7b 100644 --- a/src/components/Nutrition/widgets/IngredientDetailTable.tsx +++ b/src/components/Nutrition/widgets/IngredientDetailTable.tsx @@ -13,10 +13,11 @@ import { numberGramLocale, numberLocale } from "@/core/lib/numbers"; const IngredientTableRow = (props: { item: MealItem | DiaryEntry, planId?: string, meals?: Meal[] }) => { const [t, i18n] = useTranslation(); const [expandForm, setExpandForm] = useState(false); + const [isSaving, setIsSaving] = useState(false); const isEditable = props.planId !== undefined && props.item instanceof DiaryEntry; const handleToggleForm = () => { - if (isEditable) { + if (isEditable && !isSaving) { setExpandForm(!expandForm); } }; @@ -36,7 +37,7 @@ const IngredientTableRow = (props: { item: MealItem | DiaryEntry, planId?: strin
{props.item.amountString} {props.item.ingredient?.name} - {isEditable && { event.stopPropagation(); handleToggleForm(); @@ -68,6 +69,7 @@ const IngredientTableRow = (props: { item: MealItem | DiaryEntry, planId?: strin entry={props.item as DiaryEntry} meals={props.meals} closeFn={() => setExpandForm(false)} + onPendingChange={setIsSaving} /> diff --git a/src/components/Nutrition/widgets/forms/IngredientAmountFields.tsx b/src/components/Nutrition/widgets/forms/IngredientAmountFields.tsx index e4707a88d..feee04061 100644 --- a/src/components/Nutrition/widgets/forms/IngredientAmountFields.tsx +++ b/src/components/Nutrition/widgets/forms/IngredientAmountFields.tsx @@ -16,6 +16,7 @@ type IngredientAmountFieldsProps = { ingredient: Ingredient | null, onIngredientChange: (ingredient: Ingredient | null) => void, weightUnit: NutritionWeightUnit | null, + weightUnitId?: number | null, onWeightUnitChange: (unit: NutritionWeightUnit | null) => void, amount: number, ingredientError?: string, @@ -35,6 +36,7 @@ export const IngredientAmountFields = (props: IngredientAmountFieldsProps) => { const [t] = useTranslation(); const { ingredient, weightUnit, onWeightUnitChange } = props; const weightUnits = ingredient?.weightUnits ?? []; + const unresolvedUnit = props.weightUnitId != null && weightUnit === null; const changeIngredient = (value: Ingredient | null) => { props.onIngredientChange(value); @@ -42,7 +44,8 @@ export const IngredientAmountFields = (props: IngredientAmountFieldsProps) => { }; const endAdornment = - {weightUnit === null ? t('nutrition.gramShort') : `× ${weightUnit.name}`} + {unresolvedUnit ? t('nutrition.unavailableWeightUnit') + : weightUnit === null ? t('nutrition.gramShort') : `× ${weightUnit.name}`} ; return <> @@ -63,13 +66,13 @@ export const IngredientAmountFields = (props: IngredientAmountFieldsProps) => { {props.renderAmountField(endAdornment)} - {weightUnits.length > 0 && ( + {(weightUnits.length > 0 || unresolvedUnit) && ( onWeightUnitChange(null)} /> {weightUnits.map(unit => { @@ -86,7 +89,7 @@ export const IngredientAmountFields = (props: IngredientAmountFieldsProps) => { )} - {ingredient !== null && props.amount > 0 && ( + {ingredient !== null && !unresolvedUnit && props.amount > 0 && ( { expect(entry.weightUnit).toBe(TEST_WEIGHT_UNIT_SLICE); }); + test.each([null, TEST_INGREDIENT_1])('unresolved servings are not displayed as grams (%s)', async ingredient => { + const user = userEvent.setup(); + const entry = DiaryEntry.clone(TEST_DIARY_ENTRY_1, { + ingredient, weightUnit: null, weightUnitId: 987, + }); + render(); + expect(screen.getByText('nutrition.unavailableWeightUnit')).toBeInTheDocument(); + expect(screen.queryByTestId('macros-summary')).not.toBeInTheDocument(); + await user.click(screen.getByRole('button', { name: 'submit' })); + expect(mutateEditMock).toHaveBeenLastCalledWith(expect.objectContaining({ weightUnitId: 987 }), expect.anything()); + await user.click(screen.getByRole('button', { name: 'nutrition.gramShort' })); + await user.click(screen.getByRole('button', { name: 'submit' })); + expect(mutateEditMock).toHaveBeenLastCalledWith(expect.objectContaining({ weightUnitId: null }), expect.anything()); + }); + test('closing a draft leaves the cached entry unchanged', async () => { const user = userEvent.setup(); const entry = DiaryEntry.clone(TEST_DIARY_ENTRY_1); @@ -114,8 +129,10 @@ describe('Test the NutritionDiaryEntryForm component', () => { test('a pending save disables resubmission', () => { (useEditDiaryEntryQuery as Mock).mockReturnValue({ mutate: mutateEditMock, isPending: true }); - render(); + render(); expect(screen.getByRole('button', { name: 'submit' })).toBeDisabled(); + expect(screen.getByRole('button', { name: 'close' })).toBeDisabled(); + expect(screen.getByRole('button', { name: 'delete' })).toBeDisabled(); }); test('a failed write leaves the form open and displays the error', async () => { diff --git a/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.tsx b/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.tsx index 86a51cdfa..eb490ce34 100644 --- a/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.tsx +++ b/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.tsx @@ -16,7 +16,7 @@ import { Autocomplete, Button, Stack, TextField } from "@mui/material"; import { DateTimePicker, LocalizationProvider } from "@mui/x-date-pickers"; import { AdapterLuxon } from "@mui/x-date-pickers/AdapterLuxon"; import { DateTime } from "luxon"; -import React, { useState } from 'react'; +import React, { useEffect, useState } from 'react'; import { useTranslation } from "react-i18next"; import * as yup from "yup"; @@ -26,6 +26,7 @@ type NutritionDiaryEntryFormProps = { mealId?: string | null, meals?: Meal[], closeFn?: () => void, + onPendingChange?: (pending: boolean) => void, } interface DiaryEntryFormValues { @@ -35,7 +36,7 @@ interface DiaryEntryFormValues { ingredient: number | null, } -export const NutritionDiaryEntryForm = ({ planId, entry, mealId, meals, closeFn }: NutritionDiaryEntryFormProps) => { +export const NutritionDiaryEntryForm = ({ planId, entry, mealId, meals, closeFn, onPendingChange }: NutritionDiaryEntryFormProps) => { const meal = mealId === undefined ? null : mealId; const mealObjs = meals === undefined ? [] : meals; @@ -44,6 +45,8 @@ export const NutritionDiaryEntryForm = ({ planId, entry, mealId, meals, closeFn const addDiaryQuery = useAddDiaryEntryQuery(planId); const editDiaryQuery = useEditDiaryEntryQuery(planId); const deleteDiaryQuery = useDeleteDiaryEntryQuery(planId); + const isPending = Boolean(editDiaryQuery.isPending || addDiaryQuery.isPending || deleteDiaryQuery.isPending); + useEffect(() => { onPendingChange?.(isPending); }, [isPending, onPendingChange]); const [dateValue, setDateValue] = useState(entry ? DateTime.fromJSDate(entry.datetime) : DateTime.now()); const [selectedMeal, setSelectedMeal] = useState(meal ?? entry?.mealId ?? null); @@ -138,6 +141,7 @@ export const NutritionDiaryEntryForm = ({ planId, entry, mealId, meals, closeFn }} ingredientError={fieldError(field)} weightUnit={selectedUnit} + weightUnitId={selectedUnitId} onWeightUnitChange={unit => { setSelectedUnit(unit); setSelectedUnitId(unit?.id ?? null); @@ -198,16 +202,16 @@ export const NutritionDiaryEntryForm = ({ planId, entry, mealId, meals, closeFn {(closeFn !== undefined && entry !== undefined) - && } {closeFn !== undefined - && } From aa35c0c36f70d345872d17944a4d1e079fa037cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D0=BE=D1=80=D0=B8=D1=81=20=D0=91=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D1=80=D1=87=D1=83=D0=BA?= Date: Fri, 30 Oct 2026 12:05:43 +0100 Subject: [PATCH 03/30] Translated using Weblate (Ukrainian) Currently translated at 100.0% (473 of 473 strings) Translation: wger Workout Manager/Webapp (frontend) Translate-URL: https://hosted.weblate.org/projects/wger/frontend/uk/ --- public/locales/uk/translation.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/public/locales/uk/translation.json b/public/locales/uk/translation.json index 57f5f5dcc..3ee9f5eff 100644 --- a/public/locales/uk/translation.json +++ b/public/locales/uk/translation.json @@ -64,7 +64,13 @@ "transferTranslationsLabel": "Перенести переклади до нової вправи (переклади для вже існуючих мов будуть проігноровані)", "exactMatch": "Точний збіг", "imageIsAiGenerated": "Зображення згенероване ШІ", - "dropOrClickImage": "Перетягніть зображення сюди або натисніть, щоб вибрати" + "dropOrClickImage": "Перетягніть зображення сюди або натисніть, щоб вибрати", + "submitAuthorNotice": "Вправу буде опубліковано за ліцензією CC BY-SA 4.0 із зазначенням автора, вказаного вище.", + "authorHelpText": "Це ім’я буде зазначено як ім’я автора вправи (CC BY-SA 4.0). Змінюйте його, лише якщо ви не є автором.", + "editAuthorNotice": "Зміни публікуються за ліцензією CC BY-SA 4.0, а ваше ім’я користувача додається до списку авторів цієї вправи.", + "contentLicense": "Матеріали на цій сторінці доступні за ліцензією <0>CC BY-SA 4.0.", + "authorsList": "Автори:: {{authors}}", + "lastUpdate": "Останнє оновлення:: {{date}}" }, "noResults": "Немає результатів", "noResultsDescription": "Для цього запиту не знайдено результатів. Спробуйте зменшити кількість фільтрів.", @@ -395,7 +401,8 @@ "derivativeSourceUrl": "Посилання на першоджерело, якщо це похідна робота", "derivativeSourceUrlHelper": "Зауважте, що похідна робота — це робота, яка не тільки базується на попередній роботі, але й містить достатню кількість нового, творчого вмісту, щоб надати їй власне авторське право.", "authors": "Автор(и)", - "originalObjectUrl": "Посилання на вебсайт джерела, якщо є" + "originalObjectUrl": "Посилання на вебсайт джерела, якщо є", + "authorsHelper": "Залиште поле порожнім, якщо це ваше власне фото. У такому разі буде використано ваше ім’я користувача." }, "copyToClipboard": "Скопіювати до буфера обміну", "nutrition": { From d0d6e063e62ef4a2c7b8a25a9e31f85f9a9d179e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Nov 2026 14:43:24 +0000 Subject: [PATCH 04/30] Bump the types group with 2 updates Bumps the types group with 2 updates: [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) and [@types/luxon](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/luxon). Updates `@types/lodash` from 4.17.25 to 4.17.27 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash) Updates `@types/luxon` from 3.7.5 to 3.7.6 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/luxon) --- updated-dependencies: - dependency-name: "@types/lodash" dependency-version: 4.17.27 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: types - dependency-name: "@types/luxon" dependency-version: 3.7.6 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: types ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62f0a38ff..494f5aee2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3309,16 +3309,16 @@ "license": "MIT" }, "node_modules/@types/lodash": { - "version": "4.17.25", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.25.tgz", - "integrity": "sha512-+K1NIO8I+F9/wNulfVvu23QYd0Pe9/OCqRrim4NoYIf1VoEDL90Ve4ClzpyqBLc7NpGGWRvYNCKZ1BE/Jpf8dQ==", + "version": "4.17.27", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.27.tgz", + "integrity": "sha512-VenMRv/eKNrspX9v3H4dbmjsrnCOYdYBG3kxXKk3dG6X+urBGcj2Prww3xw1U5K4FV/mE4h5GbWd0szEKf+9ew==", "dev": true, "license": "MIT" }, "node_modules/@types/luxon": { - "version": "3.7.5", - "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.7.5.tgz", - "integrity": "sha512-jJ41Q4z6ZVO260MNDdHfW7+7a5iMiX8Mr6ZJHcmgrvhZha6dz5704o/lF2kKl6URjH6ivEL97w9xS/MgpJEphg==", + "version": "3.7.6", + "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.7.6.tgz", + "integrity": "sha512-6KSjliQAXK8ZLgFQO4B7iE4Rpf/B3rItzCFuXezBY/XIAGxOdLd7vRNK9/StRPwiS/yJsVbB7HKpW46B8tcEuQ==", "dev": true, "license": "MIT" }, From 05e6f0fb86f46d4894059da7747fb94b1a49eb86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Nov 2026 14:43:49 +0000 Subject: [PATCH 05/30] Bump vitest from 5.0.2 to 5.0.5 Bumps [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) from 5.0.2 to 5.0.5. - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Changelog](https://github.com/vitest-dev/vitest/blob/main/docs/releases.md) - [Commits](https://github.com/vitest-dev/vitest/commits/v5.0.5/packages/vitest) --- updated-dependencies: - dependency-name: vitest dependency-version: 5.0.5 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 130 +++++++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62f0a38ff..d34cade00 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3998,27 +3998,27 @@ } }, "node_modules/@vitest/coverage-v8": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-5.0.2.tgz", - "integrity": "sha512-3ffHBEi8DOOBLwIGBhOBZbRfYFYWjMUuxZicONdhuFEFEG5AVsMOSrVeuROskqnqpbOmEJwxM2eTVZ9N3a1t+A==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-5.0.5.tgz", + "integrity": "sha512-4KpkGdIrSqBihx/JyP/e+S+IKB98etg1XDQiLAxksLfcShnwi1VReGeOT9NI43hLHbknosKp/1CCLn9Zgcs8mg==", "dev": true, "license": "MIT", "dependencies": { "@bcoe/v8-coverage": "^1.0.2", - "@vitest/istanbul-lib-coverage": "^1.0.0", - "@vitest/istanbul-lib-report": "^1.0.0", - "ast-v8-to-istanbul": "^1.0.5", - "magicast": "^0.5.4", - "obug": "^2.1.4", - "std-env": "^4.2.0", - "tinyrainbow": "^3.1.1" + "@vitest/istanbul-lib-coverage": "^1.0.2", + "@vitest/istanbul-lib-report": "^1.0.2", + "ast-v8-to-istanbul": "^1.0.7", + "magicast": "^0.5.5", + "obug": "^3.0.0", + "std-env": "^4.3.0", + "tinyrainbow": "^3.2.0" }, "funding": { "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "@vitest/browser": "5.0.2", - "vitest": "5.0.2" + "@vitest/browser": "5.0.5", + "vitest": "5.0.5" }, "peerDependenciesMeta": { "@vitest/browser": { @@ -4027,9 +4027,9 @@ } }, "node_modules/@vitest/istanbul-lib-coverage": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@vitest/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.1.tgz", - "integrity": "sha512-k3DJZ8LhMBK9NS4SclF1ASD3OgXEWDorbIcPTRDK0/Zae6fRvu+fJRxtFdLfHsa9Y24beCdPnoNZ4LviTNstfA==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@vitest/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.2.tgz", + "integrity": "sha512-9J/JMwOf9AoJhAywhrn7ScKTL38hsWQP/qPG60OtaAFcQ5OXPwKsxZFlbnuCKmZ61m8/lGgHYnFpdyQZUvG/iA==", "dev": true, "license": "MIT", "engines": { @@ -4037,35 +4037,35 @@ } }, "node_modules/@vitest/istanbul-lib-report": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@vitest/istanbul-lib-report/-/istanbul-lib-report-1.0.1.tgz", - "integrity": "sha512-1EOLRfsTMnyAr3+kEAsP4o9dhaDlGPpD7H5iLBBeq//YpNB1VIahkPhB+eRp9N2Dkfw8oySROjE3yf9XDeaIkQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@vitest/istanbul-lib-report/-/istanbul-lib-report-1.0.2.tgz", + "integrity": "sha512-gUsfXZJbzPamoIY5TvHFiMMoXESBrUMo+xqaj+rYrWI69+EnvRlYBlP96ZnHPY4vX8kyUpgAnFUCg5wZG/HkDQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/istanbul-lib-coverage": "1.0.1" + "@vitest/istanbul-lib-coverage": "1.0.2" }, "engines": { "node": ">=22" } }, "node_modules/@vitest/mocker": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-5.0.2.tgz", - "integrity": "sha512-Z5FS00Q1SJHkB35xATsmWGdQ5WA1/0MV3CDjqyv7GavHv1OfOj145MNfHOlHk7QLes21dKFDHr8EO2zvL+9WGA==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-5.0.5.tgz", + "integrity": "sha512-xLL3lkDegJZw+MGoGaCCsFayDZthGgpAtr3Vziyfc4p7xH89K7KRPcRBBh/kEYm0Aqkt5DtTmkYpBtRV/FrHZg==", "dev": true, "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "0.3.31", - "@vitest/spy": "5.0.2", + "@vitest/spy": "5.0.5", "estree-walker": "^3.0.3", - "magic-string": "^1.2.3" + "magic-string": "^1.4.3" }, "funding": { "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "msw": "^2.4.9", + "msw": "^2.4.9 || ^3.0.0", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { @@ -4078,9 +4078,9 @@ } }, "node_modules/@vitest/spy": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-5.0.2.tgz", - "integrity": "sha512-Ijc7T1nT9efNb5LxvjaBrEqw3f/QwUv5EE0nKqZxgqsaV/FxAAZ8baGylA8X/Z2oS4Lp+K74Jr6dTJsDKxJDeg==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-5.0.5.tgz", + "integrity": "sha512-lwJRExuH417257Q5wv9QYugN9IMJkoxcrKrYxGPQkBzl7wlNpTUxD/5yNX4ESKVUIShKPgkGchYPFMWOOk0wzw==", "dev": true, "license": "MIT", "funding": { @@ -4388,9 +4388,9 @@ "license": "CC-BY-4.0" }, "node_modules/chai": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz", - "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-6.3.0.tgz", + "integrity": "sha512-XWAtwJ6OHO+tj0EKCs0Y2UamnyOxseZWltU4x2U2wh8g4AigdjwvtUjvLP2tqkA/avxHEtzxNaqGq/YGNwckKg==", "dev": true, "license": "MIT", "engines": { @@ -6819,9 +6819,9 @@ } }, "node_modules/magic-string": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-1.4.2.tgz", - "integrity": "sha512-vG+rjFRj1PqdIBozIxAGMjPlOhaVe+GXpbttY/iSK7rGcJRMlwNJO7dcUwmUqkymsFLJiNGI06t4D7Fr7yRC9g==", + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-1.4.5.tgz", + "integrity": "sha512-oLLC2+YvQUfAa+vxoufE/yc1icb87M9iXIRqAoR/2EhE/8cb3SF/+Gi0c2By1B+5Vz2e2vQtUvHiu1+63Znh+w==", "dev": true, "license": "MIT", "dependencies": { @@ -7060,9 +7060,9 @@ } }, "node_modules/obug": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/obug/-/obug-2.2.1.tgz", - "integrity": "sha512-XrsrhT5sybtKI6wakr2SPOlGZWWYbUXZ7a0jT8/QOeAPau+1X/bSegNe5YR75oJmEZQbKningirmGOEJCIk61Q==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/obug/-/obug-3.0.0.tgz", + "integrity": "sha512-5vvB5+W7ePv+p3uqxi+RcW1XAzLW0/hxt3/4X4Lc4qHudzOhmBiBwOY6DRob4WnanAEGvNcLjF+KNOufrUoEQw==", "dev": true, "funding": [ "https://github.com/sponsors/sxzz", @@ -8067,9 +8067,9 @@ } }, "node_modules/std-env": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.2.0.tgz", - "integrity": "sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.3.0.tgz", + "integrity": "sha512-OtU/EgQ1kIm5KwqQpBC6ZEMXrZRui11w8zgfTWp8cdO9B8OaPsbA8bTHO2P+HNo1VlUTGMVBwPhydu6poeXiag==", "dev": true, "license": "MIT" }, @@ -8221,9 +8221,9 @@ "license": "MIT" }, "node_modules/tinybench": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-6.2.0.tgz", - "integrity": "sha512-78U2TlB2CnVenajOFzf3BKSm0J6oz5L0NV7g32LCPccvYc0lbWvys4d3uUUCS2B1N8PAf2+aekR8i1KbC3HO7Q==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-6.2.2.tgz", + "integrity": "sha512-nIZ2N2dFpjBsg2hgitKu7mA+FvsIJuGJOwysRngmVRRmWgR/UyPjwJj8c/fT/dhm8EkHnF5EOogRf+0Z2qrimA==", "dev": true, "license": "MIT", "engines": { @@ -8257,9 +8257,9 @@ } }, "node_modules/tinyrainbow": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.1.tgz", - "integrity": "sha512-yau8yJdTt989Mm0Bd/236QnzEiPf2xLLTqUZRUJOo/3CB078LSwzei343DgtJVmfJKJE3TMINY1u42SQsP6mXw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.2.0.tgz", + "integrity": "sha512-LgO3D9yZJjApUiuUfl9iFAwrtaX4+lok3wJIqttGoKCHlWUqHqbQpnxCf82L8FjgKsh4iGo78hqJwgL8F6To2A==", "dev": true, "license": "MIT", "engines": { @@ -8623,25 +8623,25 @@ } }, "node_modules/vitest": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-5.0.2.tgz", - "integrity": "sha512-7MQrx9pDv5aHiUcovIb/70Ys3tgtkUVgCtledvKdCmEO+/1Dicq5ZqoSxOW034m03oqC+oHOKui2dM6qtMLoJg==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-5.0.5.tgz", + "integrity": "sha512-cPODOMF8YnkiiYtDdHo6n4wWmBrOBBbOIYH2d33M4l3CdNn72h+qMmO6uXffUN6A5AZFXNND/d+krS9mgkXRfg==", "dev": true, "license": "MIT", "dependencies": { "@types/chai": "^5.2.2", - "@vitest/mocker": "5.0.2", - "chai": "^6.2.2", + "@vitest/mocker": "5.0.5", + "chai": "^6.3.0", "es-module-lexer": "^2.3.2", "expect-type": "^1.4.0", - "magic-string": "^1.2.3", - "obug": "^2.1.4", + "magic-string": "^1.4.3", + "obug": "^3.0.0", "picomatch": "^4.0.7", - "std-env": "^4.2.0", - "tinybench": "^6.1.4", - "tinyexec": "^1.3.0", + "std-env": "^4.3.0", + "tinybench": "^6.2.2", + "tinyexec": "^1.3.1", "tinyglobby": "^0.2.17", - "why-is-node-running": "^3.2.1" + "why-is-node-running": "3.2.1" }, "bin": { "vitest": "vitest.mjs" @@ -8656,12 +8656,12 @@ "@edge-runtime/vm": "*", "@opentelemetry/api": "^1.9.0", "@types/node": "^22.0.0 || >=24.0.0", - "@vitest/browser-playwright": "5.0.2", - "@vitest/browser-preview": "5.0.2", + "@vitest/browser-playwright": "5.0.5", + "@vitest/browser-preview": "5.0.5", "@vitest/browser-webdriverio": "^5.0.0-beta.5 || >=5.0.0", - "@vitest/coverage-istanbul": "5.0.2", - "@vitest/coverage-v8": "5.0.2", - "@vitest/ui": "5.0.2", + "@vitest/coverage-istanbul": "5.0.5", + "@vitest/coverage-v8": "5.0.5", + "@vitest/ui": "5.0.5", "happy-dom": "*", "jsdom": "*", "vite": "^6.4.0 || ^7.0.0 || ^8.0.0" @@ -8786,9 +8786,9 @@ } }, "node_modules/why-is-node-running": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-3.2.2.tgz", - "integrity": "sha512-NKUzAelcoCXhXL4dJzKIwXeR8iEVqsA0Lq6Vnd0UXvgaKbzVo4ZTHROF2Jidrv+SgxOQ03fMinnNhzZATxOD3A==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-3.2.1.tgz", + "integrity": "sha512-Tb2FUhB4vUsGQlfSquQLYkApkuPAFQXGFzxWKHHumVz2dK+X1RUm/HnID4+TfIGYJ1kTcwOaCk/buYCEJr6YjQ==", "dev": true, "license": "MIT", "bin": { From a770f1c118b70d2263bb588d3692034280a5cc9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Nov 2026 14:43:56 +0000 Subject: [PATCH 06/30] Bump i18next-http-backend from 4.0.4 to 4.0.6 Bumps [i18next-http-backend](https://github.com/i18next/i18next-http-backend) from 4.0.4 to 4.0.6. - [Changelog](https://github.com/i18next/i18next-http-backend/blob/master/CHANGELOG.md) - [Commits](https://github.com/i18next/i18next-http-backend/compare/v4.0.4...v4.0.6) --- updated-dependencies: - dependency-name: i18next-http-backend dependency-version: 4.0.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62f0a38ff..04b77f8cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6089,9 +6089,9 @@ } }, "node_modules/i18next-http-backend": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-4.0.4.tgz", - "integrity": "sha512-nG9OQKvUsPiTVUBg1rCGmvmWhzxC9GOxVbGdTYyejHVMSUjutt1hiBNVSzhB/ZE7keL9Xkb880kUfhDovV5T5g==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-4.0.6.tgz", + "integrity": "sha512-k5OPDXAQH9CZ2Ju2DDw1ZC4WiYmjKUjOE4lcd51tNQyWjVDfpuwPcE9Y5VzDpz1tR1Z4wxkkj4H+ImxgwbfpeQ==", "license": "MIT", "engines": { "node": ">=18" From a35d9207f4acc84f94301cbea3fcaef73df7c318 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Nov 2026 14:44:06 +0000 Subject: [PATCH 07/30] Bump react-dom from 19.3.0 to 19.3.1 Bumps [react-dom](https://github.com/react/react/tree/HEAD/packages/react-dom) from 19.3.0 to 19.3.1. - [Release notes](https://github.com/react/react/releases) - [Changelog](https://github.com/react/react/blob/main/CHANGELOG.md) - [Commits](https://github.com/react/react/commits/v19.3.1/packages/react-dom) --- updated-dependencies: - dependency-name: react-dom dependency-version: 19.3.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62f0a38ff..04840be60 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7481,24 +7481,24 @@ "license": "MIT" }, "node_modules/react": { - "version": "19.3.0", - "resolved": "https://registry.npmjs.org/react/-/react-19.3.0.tgz", - "integrity": "sha512-E8LUcbtBWt20bbl2YoHfx4ZDBdxVTfOKtCZn9cDSJ4l6/nuoApcpIBcj47t2wZoVX8g2ZHuMHbiShgCR1T5Sog==", + "version": "19.3.1", + "resolved": "https://registry.npmjs.org/react/-/react-19.3.1.tgz", + "integrity": "sha512-QNhWdt7nrgVWWQG58QuGsAR3jv3Hbe4mb4vz7w2csnHavciZJgda1CPNaldF6eVxv90ud3jUXpKlHL69gO38yw==", "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/react-dom": { - "version": "19.3.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.3.0.tgz", - "integrity": "sha512-JDk8dgif51OjFoDE70+OT9ICyYr+69HlmihNwp1+Nsfbna3t5sIiCa9ZJktDmQ4/1b/rn26hIAR2uYXDMr5r0Q==", + "version": "19.3.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.3.1.tgz", + "integrity": "sha512-Y0bARz53lhEC1NMCASs0/j+faB/zqt3R8hpvg1e8+61ZVJ4UL0UdC4cBbXfZMcIuhrfgeILTLe+ZeBCavQPtKQ==", "license": "MIT", "dependencies": { "scheduler": "^0.28.0" }, "peerDependencies": { - "react": "^19.3.0" + "react": "^19.3.1" } }, "node_modules/react-draggable": { From 77fb2917bcaaa3ee002a00a9e3871ae501edb8be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Nov 2026 14:44:14 +0000 Subject: [PATCH 08/30] Bump jsdom from 30.1.1 to 30.1.3 Bumps [jsdom](https://github.com/jsdom/jsdom) from 30.1.1 to 30.1.3. - [Release notes](https://github.com/jsdom/jsdom/releases) - [Commits](https://github.com/jsdom/jsdom/compare/v30.1.1...v30.1.3) --- updated-dependencies: - dependency-name: jsdom dependency-version: 30.1.3 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 113 ++++++++++++++++++++-------------------------- 1 file changed, 49 insertions(+), 64 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62f0a38ff..e69b4b4fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -77,15 +77,15 @@ "license": "MIT" }, "node_modules/@asamuzakjp/css-color": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-7.1.1.tgz", - "integrity": "sha512-XiECZfC7glpDldWNCSp4UG2D0JxYKxYGSy+SDzIWfcuLs+NrM91z7rFz67s3e5unJdrY9wh1Wal8mBTW7ivD6A==", + "version": "7.1.9", + "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-7.1.9.tgz", + "integrity": "sha512-vZ6JQVq8Ivgz6b/IBlAf90wZviXdluY13cQOPO+nJHbmXwGrPl2GcpqUY7a55/8ZVdfONXpCFMpRijOBCHNlcQ==", "dev": true, "license": "MIT", "dependencies": { - "@csstools/css-calc": "^3.4.1", - "@csstools/css-color-parser": "^4.2.4", - "@csstools/css-parser-algorithms": "^4.0.1", + "@csstools/css-calc": "^3.4.3", + "@csstools/css-color-parser": "^4.2.6", + "@csstools/css-parser-algorithms": "^4.0.2", "@csstools/css-tokenizer": "^4.0.2", "lru-cache": "^11.5.3" }, @@ -104,9 +104,9 @@ } }, "node_modules/@asamuzakjp/dom-selector": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-9.2.2.tgz", - "integrity": "sha512-lSWTBMjAcmu2xn5yEDU7jh6QDV+C8GEKtdJ4pIQhXh26RkKQ7S3FuQlt+zZkUbTdJ4d3XyV1kPI/G0zWXxqaqw==", + "version": "10.0.5", + "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-10.0.5.tgz", + "integrity": "sha512-EgmJ7oEaGQECTn3H3wmnQpEy4hKY66VvM7VQndwPIQob3p877BgbyOUE3EX0LgXQCciF2H8KMdR+RznqjMNOLw==", "dev": true, "license": "MIT", "dependencies": { @@ -515,9 +515,9 @@ } }, "node_modules/@csstools/css-calc": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-3.4.1.tgz", - "integrity": "sha512-EtC7SoN1j6J4E4DCwg5QgbO5TGxgxIA1RXqe+W+qUM+BUcezx9wT+/tiQ/WO2yCX4i5X+Cuf9ciJ22aP4UEwWw==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-3.4.3.tgz", + "integrity": "sha512-iex20d8CHVkyvg6B7UKV7uHnI2Bqo9g+EFfT9E0y+GvTvhZ/DwONJ+9aKb1dlqm0ZiGsL5RXjp0fCoJYnkeDjA==", "dev": true, "funding": [ { @@ -534,14 +534,14 @@ "node": ">=20.19.0" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^4.0.1", + "@csstools/css-parser-algorithms": "^4.0.2", "@csstools/css-tokenizer": "^4.0.2" } }, "node_modules/@csstools/css-color-parser": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.2.4.tgz", - "integrity": "sha512-DyefytAZ735mX4Dq/WcDAXFtXhaEFvme0ZS9tVEBAc2whxUthXr0R0L2rmEPm59SrMBkGrFzQviBXMs/UtnABQ==", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.2.6.tgz", + "integrity": "sha512-iiPQ3iRWwnJkeEn6RIu6SJPr7hYrLz6XZ9s/QZl+2/LI5KQVjpl2fdmDSZKuD4xP6GMmMPgHFFXg6k1Wkz0Trg==", "dev": true, "funding": [ { @@ -556,20 +556,20 @@ "license": "MIT", "dependencies": { "@csstools/color-helpers": "^6.1.2", - "@csstools/css-calc": "^3.4.1" + "@csstools/css-calc": "^3.4.3" }, "engines": { "node": ">=20.19.0" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^4.0.1", + "@csstools/css-parser-algorithms": "^4.0.2", "@csstools/css-tokenizer": "^4.0.2" } }, "node_modules/@csstools/css-parser-algorithms": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-4.0.1.tgz", - "integrity": "sha512-ShL8BqPfbKJrJiKFH0xBbN0i7Nrh9HXYRuF+pzyj93R/BL2YAsUxJeqANErzqM+0JGl7vjHp+3OIgd/DL69YIA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-4.0.2.tgz", + "integrity": "sha512-40cSKyMvK+tq4qz6Awrlye2WGuOKt3FwPgtGg6KTfbHOWNw+Rk1rzbAtZnZ6IBhsY491HLRnDXwoyBAijmmILA==", "dev": true, "funding": [ { @@ -590,9 +590,9 @@ } }, "node_modules/@csstools/css-syntax-patches-for-csstree": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.14.tgz", - "integrity": "sha512-HpbVXyrofRXpHpgkNIjU/3EWR4WJvOkO3emNK/L6X/mTJU7bGUI3AkkpoTNXznQLp0KRjLHELTGeKI5dIkI9JQ==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.15.tgz", + "integrity": "sha512-J0u7HkVl2nzSlhsiTOp4AmwcUQ3D+mGEEKfBy/7To5/y7F2OHwyLrXfrhR0SMgr4p5Lo+eaMVSeai24zUcBIxA==", "dev": true, "funding": [ { @@ -4773,17 +4773,17 @@ } }, "node_modules/data-urls": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-7.0.0.tgz", - "integrity": "sha512-23XHcCF+coGYevirZceTVD7NdJOqVn+49IHyxgszm+JIiHLoB2TkmPtsYkNWT1pvRSGkc35L6NHs0yHkN2SumA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-8.0.0.tgz", + "integrity": "sha512-JQUCCK+/CAGbGGx618PlFZMXH81Jtj7t73CHv9dd/zVWvxgGT2zLFRjnKb+Ng46GIwcy+f7f88qd4duqllK+WQ==", "dev": true, "license": "MIT", "dependencies": { "whatwg-mimetype": "^5.0.0", - "whatwg-url": "^16.0.0" + "whatwg-url": "^17.1.2" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + "node": "^22.14.0 || >=24.0.0" } }, "node_modules/data-urls/node_modules/whatwg-mimetype": { @@ -4796,21 +4796,6 @@ "node": ">=20" } }, - "node_modules/data-urls/node_modules/whatwg-url": { - "version": "16.0.1", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-16.0.1.tgz", - "integrity": "sha512-1to4zXBxmXHV3IiSSEInrreIlu02vUOvrhxJJH5vcxYTBDAx51cqZiKdyTxlecdKNSjj8EcxGBxNf6Vg+945gw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@exodus/bytes": "^1.11.0", - "tr46": "^6.0.0", - "webidl-conversions": "^8.0.1" - }, - "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0" - } - }, "node_modules/debug": { "version": "4.4.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", @@ -6348,31 +6333,31 @@ "license": "MIT" }, "node_modules/jsdom": { - "version": "30.1.1", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-30.1.1.tgz", - "integrity": "sha512-FahmoPK5vbPc+jxV1iErMHmAZypCZ942NHF4+qqaWAuvaKKTBZxawnmAtrbGWLU7MtlxfqIP0qw6aSI+aWGtLg==", + "version": "30.1.3", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-30.1.3.tgz", + "integrity": "sha512-hQMUPvRgN7KxsfIytDQji7bimuJeRQa6Qo5+iuiZQk5CafeRxLIA10/cG5YCBFNpD9RO3oqIiN4CO1Y44kxqXg==", "dev": true, "license": "MIT", "dependencies": { - "@asamuzakjp/css-color": "^7.0.0", - "@asamuzakjp/dom-selector": "^9.2.1", + "@asamuzakjp/css-color": "^7.1.3", + "@asamuzakjp/dom-selector": "^10.0.3", "@bramus/specificity": "^2.4.2", - "@csstools/css-syntax-patches-for-csstree": "^1.1.13", - "@exodus/bytes": "^1.15.1", + "@csstools/css-syntax-patches-for-csstree": "^1.1.15", + "@exodus/bytes": "^1.16.0", "css-tree": "^3.2.1", - "data-urls": "^7.0.0", + "data-urls": "^8.0.0", "decimal.js": "^10.6.0", "html-encoding-sniffer": "^7.0.0", "is-potential-custom-element-name": "^1.0.1", - "lru-cache": "^11.5.2", + "lru-cache": "^11.5.3", "parse5": "^8.0.1", "saxes": "^6.0.0", "tough-cookie": "^6.0.2", - "undici": "^8.10.2", + "undici": "^8.12.1", "w3c-xmlserializer": "^6.0.0", "webidl-conversions": "^8.0.1", "whatwg-mimetype": "^5.0.0", - "whatwg-url": "^17.1.1", + "whatwg-url": "^17.2.0", "xml-name-validator": "^5.0.0" }, "engines": { @@ -8306,16 +8291,16 @@ } }, "node_modules/tr46": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-6.0.0.tgz", - "integrity": "sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-7.0.0.tgz", + "integrity": "sha512-BcDSDW+SIGWVOns1Zm6Yg91q9AEj7eaID0QDY9oIqJD1A8dscNwMcl9Sms2DeuWCNov1X0/oXanHGYQBSLwZsg==", "dev": true, "license": "MIT", "dependencies": { "punycode": "^2.3.1" }, "engines": { - "node": ">=20" + "node": "^22.14.0 || >=24.0.0" } }, "node_modules/ts-api-utils": { @@ -8739,14 +8724,14 @@ } }, "node_modules/whatwg-url": { - "version": "17.1.2", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-17.1.2.tgz", - "integrity": "sha512-TEZA+Zqxin7Jjsm2cjRohCmen5awh+hT6Zi3VZdqZlNRk7zvOI/9WpBFg/DWlA56bWnzwm6DuB8NS0EsxQH9uQ==", + "version": "17.3.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-17.3.0.tgz", + "integrity": "sha512-KwOAJrpf+GTgBvcBQJcP38sMF0DsQKdwtG+TxM2pW44P6E5k0hDbWrDmyuJDIF0Uef0aQq0ZoJs+5oI+k8ddhg==", "dev": true, "license": "MIT", "dependencies": { - "@exodus/bytes": "^1.15.1", - "tr46": "^6.0.0", + "@exodus/bytes": "^1.16.0", + "tr46": "^7.0.0", "webidl-conversions": "^8.0.1" }, "engines": { From 8dd45b9c6b65d19698f08fb8041a37cf7cfb3894 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Nov 2026 14:44:22 +0000 Subject: [PATCH 09/30] Bump axios from 1.20.0 to 1.21.0 Bumps [axios](https://github.com/axios/axios) from 1.20.0 to 1.21.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.20.0...v1.21.0) --- updated-dependencies: - dependency-name: axios dependency-version: 1.21.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62f0a38ff..26234392a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4211,9 +4211,9 @@ "license": "MIT" }, "node_modules/axios": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.20.0.tgz", - "integrity": "sha512-r8aOh8j9cGKpgQAqpzrUHnSIc6a59Y3Xf/cv8sy1DrHCkZHzQGEuoq1tARk6qSyDdtQGSDgpb9kFlruzPvrgwg==", + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.21.0.tgz", + "integrity": "sha512-YCzXMB53Q9PZBsh7yN7wtapit4WepwcHS2fP8QhGsBxSz5YtgYobV7GGlWlAJi+RxfU77GQTQi2DSLUma42EYA==", "license": "MIT", "dependencies": { "follow-redirects": "^1.16.0", From 969b91d76f41fa8379861a534093af3c3cdd31cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Nov 2026 14:44:32 +0000 Subject: [PATCH 10/30] Bump i18next from 26.4.2 to 26.5.11 Bumps [i18next](https://github.com/i18next/i18next) from 26.4.2 to 26.5.11. - [Release notes](https://github.com/i18next/i18next/releases) - [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md) - [Commits](https://github.com/i18next/i18next/compare/v26.4.2...v26.5.11) --- updated-dependencies: - dependency-name: i18next dependency-version: 26.5.11 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62f0a38ff..4d881aca9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6022,9 +6022,9 @@ } }, "node_modules/i18next": { - "version": "26.4.2", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.4.2.tgz", - "integrity": "sha512-RX+R0VLg13IbvRuJSxnqykUFS9vQZTl8wYpWPCIUDWVrSGjsQywB5Y+pjzrkboxGAuYfJZVH1InFTdgBdxq6ug==", + "version": "26.5.11", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.5.11.tgz", + "integrity": "sha512-Wc0klBPKxqZ2tL2qdAnF8xvvnWgr1IMGSY2ikTiAvaFVbz7xiFARtkoU4RidBDw1SyziGROp0qxu6qnJ7l2Wug==", "funding": [ { "type": "individual", From 9f104769e5d0c38dd223be544cfb82e4bea16239 Mon Sep 17 00:00:00 2001 From: "Luke Gabriel R. Arrieta" Date: Tue, 3 Nov 2026 01:13:15 +0800 Subject: [PATCH 11/30] Document Weblate format for i18next plural forms --- public/locales/README.md | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/public/locales/README.md b/public/locales/README.md index 2c968ab3a..6058af9ce 100644 --- a/public/locales/README.md +++ b/public/locales/README.md @@ -6,5 +6,35 @@ To extract new strings `npm run i18n`, actual translation occurs in weblate: More info: +Plural forms +------------ + +The frontend uses i18next JSON v4 plural keys. Call the base key with a numeric +`count`, for example `t('measurements.chartRangeMonths', { count: 3 })`. +English uses `_one` and `_other`; target languages can require additional +categories such as `_two`, `_few`, or `_many`. Keep `{{count}}` available in +translations whose plural category applies to several numbers. + +For Weblate to group these variants and offer each language's plural forms, +configure the frontend component with: + +| Setting | Value | +| --- | --- | +| File format | i18next JSON file v4 (`i18nextv4`) | +| File mask | `public/locales/*/translation.json` | +| Monolingual base language file | `public/locales/en/translation.json` | + +Weblate's generic JSON formats (`json` and `json-nested`) do not support plural +forms. See the [Weblate i18next documentation](https://docs.weblate.org/en/latest/formats/i18next.html) +and [i18next plural documentation](https://www.i18next.com/translation-function/plurals). + +Before changing an existing Weblate component, back up pending translation work +and verify the format change on a test component. After rescanning, check that +existing translations and ordinary keys are preserved and that required plural +forms survive a translation export and another source extraction. Translators +still need to supply the missing forms; changing the format does not translate +them automatically. The component's format is a Weblate administration setting, +so updating this README alone does not change the running translation service. + Please note that the contents of i18n.tsx contains the values of the exercise categories, equipment, etc. and is -autogenerated on the wger repo by the extract-i18n.py script (python manage.py extract-i18n). \ No newline at end of file +autogenerated on the wger repo by the extract-i18n.py script (python manage.py extract-i18n). From 5fbb038917749db4d7ad42c8e220dde812b9d33d Mon Sep 17 00:00:00 2001 From: Milo Ivir Date: Sun, 1 Nov 2026 22:13:35 +0100 Subject: [PATCH 12/30] Translated using Weblate (Croatian) Currently translated at 99.3% (470 of 473 strings) Translation: wger Workout Manager/Webapp (frontend) Translate-URL: https://hosted.weblate.org/projects/wger/frontend/hr/ --- public/locales/hr/translation.json | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/public/locales/hr/translation.json b/public/locales/hr/translation.json index 99ce571f7..ec322ba7b 100644 --- a/public/locales/hr/translation.json +++ b/public/locales/hr/translation.json @@ -65,7 +65,13 @@ "transferTranslationsLabel": "Prenesi prijevode na zamjensku vježbu (jezici koji su već prisutni se ptreskaču)", "imageIsAiGenerated": "Slika je stvorena pomoću umjetne inteligencije", "dropOrClickImage": "Povuci i ispusti sliku ovdje ili klikni za biranje", - "addImage": "Dodaj sliku" + "addImage": "Dodaj sliku", + "submitAuthorNotice": "Vježba je objavljena pod licencom CC BY-SA 4.0, uz navođenje gore navedenog autora.", + "authorHelpText": "Prikazano kao autor vježbe (CC BY-SA 4.0). Promijeni samo ako nisi autor.", + "editAuthorNotice": "Promjene su objavljene pod licencom CC BY-SA 4.0. Tvoje se korisničko ime dodaje autorima ove vježbe.", + "contentLicense": "Sadržaj na ovoj stranici je dostupan pod licencom <0>CC BY-SA 4.", + "authorsList": "Autori: {{authors}}", + "lastUpdate": "Zadnje aktualiziranje: {{date}}" }, "noResults": "Nema rezultata", "noResultsDescription": "Za ovaj upit nisu pronađeni rezultati. Smanji broja filtara.", @@ -266,15 +272,21 @@ "retry": "Pokušaj ponovo", "empty": "Nema podataka za ove filtre i metriku. Pokušaj jednu drugu metriku ili dulji vremenski raspon.", "skipped_one": "{{count}} zapis sadrži nedostajuće vrijednosti ili nekompatibilne jedinice za ovu metriku i ne prikazuje se.", - "skipped_other": "{{count}} zapisa sadrže nedostajuće vrijednosti ili nekompatibilne jedinice za ovu metriku i ne prikazuju se." + "skipped_other": "{{count}} zapisa sadrže nedostajuće vrijednosti ili nekompatibilne jedinice za ovu metriku i ne prikazuju se.", + "volumeHelp": "Dnevni volumen (težina × ponavljanja), pretvoren u kg × ponavljanja. Serije s tjelesnom težinom bez vanjske težine koriste ponavljanja; vremenski mjerene serije koriste sekunde. One se prikazuju zasebno.", + "repsHelp": "Ukupan dnevni broj ponavljanja. Vremenski mjerene serije i serije temeljene na udaljenosti se ne računaju kao ponavljanja.", + "muscleHelp": "Mišićne grupe uključuju primarne i sekundarne mišiće; svaka serija broji se samo jednom." }, "requirementRules": { "weight": "Težina", "repetitions": "Ponavljanja", "rest": "Vrijeme odmora", "max_repetitions": "Ponavljanja (vrh raspona)", - "max_weight": "Težina (vrh raspona)" - } + "max_weight": "Težina (vrh raspona)", + "rir": "Broj ponavljanja u rezervi" + }, + "deleteSessionInfo": "Ovo će izbrisati sesiju kao i sve u njoj zabilježene serije", + "requirementsAllSets": "Sve serije moraju ispunjavati uvjete" }, "preferences": "Postavke", "notes": "Bilješke", @@ -378,7 +390,8 @@ "chartRangeWeeks_one": "1 tjedan", "chartRangeYears_one": "1 godina", "categoryFormHelpText": "Kategorija mjerenja, kao što su „bicepsi” ili „tjelesna mast”", - "metricAlreadyTracked": "Već se prati" + "metricAlreadyTracked": "Već se prati", + "indicatorRaw": "neobrađeno" }, "deleteConfirmation": "Stvarno želiš izbrisati „{{name}}”?", "nutrition": { @@ -455,7 +468,8 @@ "originalTitle": "Naslov", "authors": "Autori", "derivativeSourceUrl": "Poveznica na izvorni izvor, ako je ovo izvedeno djelo", - "derivativeSourceUrlHelper": "Izvedeni rad koji se ne temelji samo na prethodnom radu, te sadrži dovoljno novog, kreativnog sadržaja ima pravo na vlastito autorsko pravo." + "derivativeSourceUrlHelper": "Izvedeni rad koji se ne temelji samo na prethodnom radu, te sadrži dovoljno novog, kreativnog sadržaja ima pravo na vlastito autorsko pravo.", + "authorsHelper": "Ostavi prazno ako je to tvoja fotografija. Tada se koristi tvoje korisničko ime." }, "filters": "Filtri", "height": "Visina", From 2dc37c8b2a0dfdcc664bf8a17ea649ca051c1888 Mon Sep 17 00:00:00 2001 From: "Luke Gabriel R. Arrieta" Date: Tue, 3 Nov 2026 08:32:21 +0800 Subject: [PATCH 13/30] Keep plural count placeholders and document migration checks Retain count interpolation in English one forms for target-language reuse. Record the v4 parser audit and the need to preserve existing Ukrainian and Slovak categories before a Weblate migration. --- public/locales/README.md | 18 ++++++++++++++++-- public/locales/en/translation.json | 12 ++++++------ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/public/locales/README.md b/public/locales/README.md index 6058af9ce..981fc9a7b 100644 --- a/public/locales/README.md +++ b/public/locales/README.md @@ -16,7 +16,7 @@ categories such as `_two`, `_few`, or `_many`. Keep `{{count}}` available in translations whose plural category applies to several numbers. For Weblate to group these variants and offer each language's plural forms, -configure the frontend component with: +the intended frontend component configuration is: | Setting | Value | | --- | --- | @@ -31,10 +31,24 @@ and [i18next plural documentation](https://www.i18next.com/translation-function/ Before changing an existing Weblate component, back up pending translation work and verify the format change on a test component. After rescanning, check that existing translations and ordinary keys are preserved and that required plural -forms survive a translation export and another source extraction. Translators +forms survive a translation export and another source extraction. Compare every +existing plural key as well as ordinary keys: parsers can select different +categories for a target language, so preserve and review translations under old +suffixes before allowing an export to replace them. Do not automatically rename +a translated variant into a different grammatical category. Translators still need to supply the missing forms; changing the format does not translate them automatically. The component's format is a Weblate administration setting, so updating this README alone does not change the running translation service. +An offline round-trip of the catalogues at +[`aa35c0c3`](https://github.com/wger-project/react/commit/aa35c0c36f70d345872d17944a4d1e079fa037cd) +with Translate Toolkit 3.20.2 +illustrates why this check matters: its default Ukrainian categories exclude +`other`, and its Slovak categories exclude `many`. Exporting through that parser +omits seven existing Ukrainian `_other` values and two Slovak `_many` values. +This is a parser-level check, not a test of Weblate's migration or translation +memory. Verify the actual Weblate version and merge behavior on a test component +and preserve those values for translator review before enabling writes. + Please note that the contents of i18n.tsx contains the values of the exercise categories, equipment, etc. and is autogenerated on the wger repo by the extract-i18n.py script (python manage.py extract-i18n). diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index 7f44ddee2..a2681102c 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -397,13 +397,13 @@ "sluggish": "Smooth" }, "chartAverageWindow": "Average over", - "chartAverageWindowDays_one": "1 day", + "chartAverageWindowDays_one": "{{count}} day", "chartAverageWindowDays_other": "{{count}} days", "distributionMedian": "Median", "distributionLatest": "Latest", - "distributionEntryCount_one": "1 entry", + "distributionEntryCount_one": "{{count}} entry", "distributionEntryCount_other": "{{count}} entries", - "distributionDayCount_one": "1 day", + "distributionDayCount_one": "{{count}} day", "distributionDayCount_other": "{{count}} days", "partOfGroup": "Part of group", "noGroup": "No group", @@ -435,11 +435,11 @@ "noDataAvailable": "No data available", "overallChangeWeight": "Overall change", "chartRangeAll": "All", - "chartRangeMonths_one": "1 month", + "chartRangeMonths_one": "{{count}} month", "chartRangeMonths_other": "{{count}} months", - "chartRangeWeeks_one": "1 week", + "chartRangeWeeks_one": "{{count}} week", "chartRangeWeeks_other": "{{count}} weeks", - "chartRangeYears_one": "1 year", + "chartRangeYears_one": "{{count}} year", "chartRangeYears_other": "{{count}} years", "customMeasurement": "Custom measurement", "metricAlreadyTracked": "Already tracked", From 875637b07533ba2dae7eee9f20e507a11e8dffad Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Sat, 31 Oct 2026 00:11:40 +0100 Subject: [PATCH 14/30] Require 120 characters and 15 words for exercise descriptions --- public/locales/de/translation.json | 3 +- public/locales/en/translation.json | 3 +- public/locales/fr/translation.json | 3 +- .../Exercises/forms/yupValidators.test.ts | 33 +++++++++++++++++++ .../Exercises/forms/yupValidators.ts | 25 +++++++++++--- .../screens/Add/Step3Description.test.tsx | 3 +- .../screens/Add/Step4Translation.test.tsx | 3 +- .../Detail/ExerciseDetailEdit.test.tsx | 3 +- .../screens/Detail/ExerciseDetailEdit.tsx | 2 +- 9 files changed, 67 insertions(+), 11 deletions(-) create mode 100644 src/components/Exercises/forms/yupValidators.test.ts diff --git a/public/locales/de/translation.json b/public/locales/de/translation.json index f10b19f42..69725f76e 100644 --- a/public/locales/de/translation.json +++ b/public/locales/de/translation.json @@ -146,7 +146,8 @@ "enterNumber": "Bitte gib eine gültige Nummer ein", "enterInteger": "Bitte gib eine ganze Zahl ein", "maxLessThanMin": "Der maximale Wert muss größer als der minimale sein", - "endBeforeStart": "Der Endwert darf nicht vor dem Startwert liegen" + "endBeforeStart": "Der Endwert darf nicht vor dem Startwert liegen", + "minWords": "Bitte gib mindestens {{words}} Wörter ein" }, "routines": { "sets": "Sätze", diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index 7f44ddee2..8f95315d4 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -221,7 +221,8 @@ "minValue": "The value for this field has to be higher than {{value}}", "maxValue": "The value for this field has to be less than {{value}}", "maxLessThanMin": "The max value has to be bigger than the minimum", - "endBeforeStart": "The end value cannot be before the start" + "endBeforeStart": "The end value cannot be before the start", + "minWords": "Please enter at least {{words}} words" }, "name": "Name", "category": "Category", diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json index f7387b14a..d81bfc67a 100644 --- a/public/locales/fr/translation.json +++ b/public/locales/fr/translation.json @@ -143,7 +143,8 @@ "enterNumber": "Veuillez entrer un nombre valide", "maxLessThanMin": "La valeur maximale doit être plus grande que la valeur minimale", "endBeforeStart": "La valeur de fin ne peut être avant le début", - "enterInteger": "Veuillez entrer un nombre entier" + "enterInteger": "Veuillez entrer un nombre entier", + "minWords": "Veuillez saisir au moins {{words}} mots" }, "name": "Nom", "category": "Catégorie", diff --git a/src/components/Exercises/forms/yupValidators.test.ts b/src/components/Exercises/forms/yupValidators.test.ts new file mode 100644 index 000000000..99a331194 --- /dev/null +++ b/src/components/Exercises/forms/yupValidators.test.ts @@ -0,0 +1,33 @@ +import { descriptionValidator } from "@/components/Exercises/forms/yupValidators"; + +const FIFTEEN_WORDS = "Stand upright and hold the dumbbells at your sides, then curl both weights up slowly."; +const LONG_ENOUGH = FIFTEEN_WORDS + " Lower them again under control and keep your elbows close to your body."; + +describe("descriptionValidator", () => { + test("accepts a description with enough characters and words", () => { + expect(descriptionValidator().isValidSync(LONG_ENOUGH)).toBe(true); + }); + + test("rejects a description under 120 characters", () => { + expect(FIFTEEN_WORDS.length).toBeLessThan(120); + expect(descriptionValidator().isValidSync(FIFTEEN_WORDS)).toBe(false); + }); + + test("rejects a long description with too few words", () => { + const fewWords = "Supercalifragilisticexpialidocious ".repeat(5); + expect(fewWords.length).toBeGreaterThanOrEqual(120); + expect(descriptionValidator().isValidSync(fewWords)).toBe(false); + }); + + test("markdown list markers don't count as words", () => { + const padded = "- 1. * - ".repeat(14) + "Hold the bar and pull yourself up."; + expect(padded.length).toBeGreaterThanOrEqual(120); + expect(descriptionValidator().isValidSync(padded)).toBe(false); + }); + + test("an unchanged existing description stays valid, an edited one is checked", () => { + const old = "View the video to understand the exercise"; + expect(descriptionValidator(old).isValidSync(old)).toBe(true); + expect(descriptionValidator(old).isValidSync(old + "!")).toBe(false); + }); +}); diff --git a/src/components/Exercises/forms/yupValidators.ts b/src/components/Exercises/forms/yupValidators.ts index eee53b2d1..fd696aab7 100644 --- a/src/components/Exercises/forms/yupValidators.ts +++ b/src/components/Exercises/forms/yupValidators.ts @@ -4,7 +4,8 @@ import * as yup from "yup"; const MIN_CHAR_NAME = 5; const MAX_CHAR_NAME = 40; -const MIN_DESC_LENGTH = 40; +const MIN_DESC_LENGTH = 120; +const MIN_DESC_WORDS = 15; const MIN_NOTE_LENGTH = 15; @@ -29,10 +30,26 @@ export const alternativeNameValidator = () => yup }) ); -export const descriptionValidator = () => yup +/** Words are tokens with at least one letter, so markdown list markers don't count */ +const countWords = (text: string) => text.split(/\s+/).filter(token => /\p{L}/u.test(token)).length; + +/** + * Description of a translation. An existing description passed as ``unchanged`` stays + * valid as long as it isn't edited, older entries may be shorter than the current limits. + */ +export const descriptionValidator = (unchanged?: string) => yup .string() - .min(MIN_DESC_LENGTH, i18n.t("forms.minLength", { 'chars': MIN_DESC_LENGTH })) - .required(i18n.t("forms.fieldRequired")); + .required(i18n.t("forms.fieldRequired")) + .test( + 'minLength', + i18n.t("forms.minLength", { 'chars': MIN_DESC_LENGTH }), + value => value === unchanged || (value ?? '').length >= MIN_DESC_LENGTH + ) + .test( + 'minWords', + i18n.t("forms.minWords", { 'words': MIN_DESC_WORDS }), + value => value === unchanged || countWords(value ?? '') >= MIN_DESC_WORDS + ); export const noteValidator = () => yup .array() diff --git a/src/components/Exercises/screens/Add/Step3Description.test.tsx b/src/components/Exercises/screens/Add/Step3Description.test.tsx index dad9872db..7f97d6692 100644 --- a/src/components/Exercises/screens/Add/Step3Description.test.tsx +++ b/src/components/Exercises/screens/Add/Step3Description.test.tsx @@ -82,7 +82,8 @@ describe("Test the add exercise step 3 component", () => { // The yup validator requires at least 40 characters, so any happy-path test // has to fill the markdown editor before submitting. const VALID_DESCRIPTION = - "This is a long enough description for the exercise that satisfies the minimum length validator."; + "Stand upright with your feet shoulder-width apart and hold the dumbbells at your sides. " + + "Slowly curl both weights up to your shoulders, then lower them again under control."; async function fillDescription(user: ReturnType, value: string) { // The MarkdownEditor TextField uses t('useMarkdownHint') as placeholder; diff --git a/src/components/Exercises/screens/Add/Step4Translation.test.tsx b/src/components/Exercises/screens/Add/Step4Translation.test.tsx index f9f1a1ef6..bef44d762 100644 --- a/src/components/Exercises/screens/Add/Step4Translation.test.tsx +++ b/src/components/Exercises/screens/Add/Step4Translation.test.tsx @@ -116,7 +116,8 @@ describe("Test the add exercise step 4 component", () => { }); const VALID_DESCRIPTION = - "Eine ausreichend lange Beschreibung der Übung, die die yup-Mindestlänge erfüllt."; + "Stelle dich aufrecht hin, die Füße schulterbreit, und halte die Kurzhanteln seitlich am Körper. " + + "Beuge langsam beide Arme bis zu den Schultern und senke die Gewichte kontrolliert wieder ab."; async function fillTranslation(user: ReturnType) { // Enable the form diff --git a/src/components/Exercises/screens/Detail/ExerciseDetailEdit.test.tsx b/src/components/Exercises/screens/Detail/ExerciseDetailEdit.test.tsx index cedc67150..b8b832bd3 100644 --- a/src/components/Exercises/screens/Detail/ExerciseDetailEdit.test.tsx +++ b/src/components/Exercises/screens/Detail/ExerciseDetailEdit.test.tsx @@ -352,7 +352,8 @@ describe("Exercise translation edit tests", () => { test('creates a new translation if the language is not available', async () => { // Arrange const user = userEvent.setup(); - const description = "Le sanglier d'Europe est une espèce de mammifères de la famille des Suidés"; + const description = "Le sanglier d'Europe est une espèce de mammifères de la famille des Suidés, très répandue " + + "dans les forêts du continent, où il vit en groupes et se nourrit surtout de plantes et de racines."; addTranslationMutateMock.mockResolvedValue(new Translation({ id: 300, uuid: '409f4b97-a56d-4852-85b2-834ba18b7ccc', diff --git a/src/components/Exercises/screens/Detail/ExerciseDetailEdit.tsx b/src/components/Exercises/screens/Detail/ExerciseDetailEdit.tsx index 21445a67a..fcc633bd4 100644 --- a/src/components/Exercises/screens/Detail/ExerciseDetailEdit.tsx +++ b/src/components/Exercises/screens/Detail/ExerciseDetailEdit.tsx @@ -332,7 +332,7 @@ const TranslationEditForm = ({ const validationSchema = yup.object({ name: nameValidator(), alternativeNames: alternativeNameValidator(), - description: descriptionValidator() + description: descriptionValidator(exerciseTranslation.descriptionSource) }); const defaultValues: TranslationFormValues = { From 75faf926edcf281f96660e601f856c5740bc927b Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Wed, 4 Nov 2026 19:54:25 +0100 Subject: [PATCH 15/30] Warn against adding personal exercises --- public/locales/de/translation.json | 2 ++ public/locales/en/translation.json | 2 ++ public/locales/es/translation.json | 2 ++ public/locales/fr/translation.json | 2 ++ .../screens/Add/AddExerciseStepper.test.tsx | 14 ++++++++++++++ .../screens/Add/AddExerciseStepper.tsx | 19 +++++++++++++++++-- 6 files changed, 39 insertions(+), 2 deletions(-) diff --git a/public/locales/de/translation.json b/public/locales/de/translation.json index 69725f76e..a09fe4213 100644 --- a/public/locales/de/translation.json +++ b/public/locales/de/translation.json @@ -29,6 +29,8 @@ "primaryMuscles": "Primäre Muskeln", "identicalExercisePleaseDiscard": "Wenn dir eine Übung auffällt, die mit der von dir hinzugefügten identisch ist, verwerfe bitte deinen Entwurf und bearbeite stattdessen diese Übung.", "contributeExercise": "Eine Übung beisteuern", + "personalExercisesWarningTitle": "Füge keine persönlichen Übungen hinzu", + "personalExercisesWarningBody": "Übungen werden der gemeinsamen Datenbank hinzugefügt und sind für alle Nutzer sichtbar. Füge nur allgemeine Übungen hinzu, die für alle nützlich sind. Übungen, die nur erstellt werden, damit ein Import aus einer anderen App funktioniert, werden gelöscht.", "checkInformationBeforeSubmitting": "Bitte überprüfe vor dem Absenden der Übung, ob die von dir eingegebenen Informationen korrekt sind", "successfullyUpdated": "Die Übung wurde erfolgreich aktualisiert. Aufgrund von Caching kann es einige Zeit dauern, bis die Änderungen in der gesamten Anwendung sichtbar sind.", "alsoKnownAs": "Auch bekannt als:", diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index 8f95315d4..bb75db61e 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -77,6 +77,8 @@ "transferMediaLabel": "Transfer media to the replacement exercise", "transferTranslationsLabel": "Transfer translations to the replacement (skips languages already present)", "contributeExercise": "Contribute an exercise", + "personalExercisesWarningTitle": "Don't add personal exercises", + "personalExercisesWarningBody": "Exercises are added to the shared database and are visible to all users. Only add general exercises that are useful to everyone. Exercises created just to make an import from another app work will be deleted.", "step1HeaderBasics": "Basics in English", "variations": "Variations", "notEnoughRightsHeader": "You can't contribute exercises", diff --git a/public/locales/es/translation.json b/public/locales/es/translation.json index 2cbe4488e..94b1cecbc 100644 --- a/public/locales/es/translation.json +++ b/public/locales/es/translation.json @@ -17,6 +17,8 @@ "exercises": { "secondaryMuscles": "Músculos secundarios", "contributeExercise": "Aporta un ejercicio", + "personalExercisesWarningTitle": "No agregues ejercicios personales", + "personalExercisesWarningBody": "Los ejercicios se agregan a la base de datos compartida y son visibles para todos los usuarios. Agrega solo ejercicios generales que sean útiles para todos. Los ejercicios creados solo para que funcione una importación desde otra aplicación se eliminarán.", "variations": "Variaciones", "whatVariationsExist": "¿Qué variaciones de este ejercicio existen, si las hay?", "translateExerciseNow": "Traducir este ejercicio ahora", diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json index d81bfc67a..7b91ca543 100644 --- a/public/locales/fr/translation.json +++ b/public/locales/fr/translation.json @@ -20,6 +20,8 @@ "missingExercise": "Un certain exercice manque ?", "missingExerciseDescription": "Aidez la communauté en y contribuant !", "contributeExercise": "Contribuer à un exercice", + "personalExercisesWarningTitle": "N'ajoutez pas d'exercices personnels", + "personalExercisesWarningBody": "Les exercices sont ajoutés à la base de données partagée et sont visibles par tous les utilisateurs. N'ajoutez que des exercices généraux, utiles à tout le monde. Les exercices créés uniquement pour faire fonctionner une importation depuis une autre application seront supprimés.", "exercises": "Exercices", "category": "Catégorie", "equipment": "Équipement", diff --git a/src/components/Exercises/screens/Add/AddExerciseStepper.test.tsx b/src/components/Exercises/screens/Add/AddExerciseStepper.test.tsx index 6a28dabaa..3aee421ef 100644 --- a/src/components/Exercises/screens/Add/AddExerciseStepper.test.tsx +++ b/src/components/Exercises/screens/Add/AddExerciseStepper.test.tsx @@ -30,4 +30,18 @@ describe("Test the add-exercise stepper component", () => { expect(screen.getByText("images")).toBeInTheDocument(); expect(screen.getByText("overview")).toBeInTheDocument(); }); + + test("Warns against adding personal exercises", () => { + // Act + const queryClient = new QueryClient(); + render( + + + + ); + + // Assert + expect(screen.getByRole("alert")).toHaveTextContent("exercises.personalExercisesWarningTitle"); + expect(screen.getByRole("alert")).toHaveTextContent("exercises.personalExercisesWarningBody"); + }); }); diff --git a/src/components/Exercises/screens/Add/AddExerciseStepper.tsx b/src/components/Exercises/screens/Add/AddExerciseStepper.tsx index 34dee4f02..94c75e9ab 100644 --- a/src/components/Exercises/screens/Add/AddExerciseStepper.tsx +++ b/src/components/Exercises/screens/Add/AddExerciseStepper.tsx @@ -1,13 +1,24 @@ -import { Box, Container, Stack, Step, StepContent, StepLabel, Stepper, Typography, } from "@mui/material"; +import * as exerciseState from "@/components/Exercises/screens/Add/state"; import { Step1Basics } from "@/components/Exercises/screens/Add/Step1Basics"; import { Step2Variations } from "@/components/Exercises/screens/Add/Step2Variations"; import { Step3Description } from "@/components/Exercises/screens/Add/Step3Description"; import { Step4Translations } from "@/components/Exercises/screens/Add/Step4Translations"; import { Step5Images } from "@/components/Exercises/screens/Add/Step5Images"; import { Step6Overview } from "@/components/Exercises/screens/Add/Step6Overview"; +import { + Alert, + AlertTitle, + Box, + Container, + Stack, + Step, + StepContent, + StepLabel, + Stepper, + Typography, +} from "@mui/material"; import React from "react"; import { useTranslation } from "react-i18next"; -import * as exerciseState from "@/components/Exercises/screens/Add/state"; export type StepProps = { onContinue?: () => void; @@ -34,6 +45,10 @@ export const AddExerciseStepper = () => { {t("exercises.contributeExercise")} + + {t("exercises.personalExercisesWarningTitle")} + {t("exercises.personalExercisesWarningBody")} + From 4119953566671e1291c798456cb54f648dfd150c Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Wed, 4 Nov 2026 20:23:06 +0100 Subject: [PATCH 16/30] Fall back to English for empty plural forms --- public/locales/README.md | 45 +++++++--------------------------------- src/i18n.ts | 3 +++ 2 files changed, 10 insertions(+), 38 deletions(-) diff --git a/public/locales/README.md b/public/locales/README.md index 981fc9a7b..e227ba8ea 100644 --- a/public/locales/README.md +++ b/public/locales/README.md @@ -9,46 +9,15 @@ More info: Plural forms ------------ -The frontend uses i18next JSON v4 plural keys. Call the base key with a numeric -`count`, for example `t('measurements.chartRangeMonths', { count: 3 })`. -English uses `_one` and `_other`; target languages can require additional -categories such as `_two`, `_few`, or `_many`. Keep `{{count}}` available in -translations whose plural category applies to several numbers. +Plural strings use i18next JSON v4 keys. Call the base key with a numeric `count`, for example +`t('measurements.chartRangeMonths', { count: 3 })`. English has `_one` and `_other`, other languages +use the forms they need, such as `_few` or `_many`. The weblate component uses the `i18nextv4` file +format, which groups these keys and offers each language its plural forms. -For Weblate to group these variants and offer each language's plural forms, -the intended frontend component configuration is: +Use `{{count}}` in `_one` as well instead of a literal `1`: in some languages this form also covers +numbers such as 21. -| Setting | Value | -| --- | --- | -| File format | i18next JSON file v4 (`i18nextv4`) | -| File mask | `public/locales/*/translation.json` | -| Monolingual base language file | `public/locales/en/translation.json` | - -Weblate's generic JSON formats (`json` and `json-nested`) do not support plural -forms. See the [Weblate i18next documentation](https://docs.weblate.org/en/latest/formats/i18next.html) -and [i18next plural documentation](https://www.i18next.com/translation-function/plurals). - -Before changing an existing Weblate component, back up pending translation work -and verify the format change on a test component. After rescanning, check that -existing translations and ordinary keys are preserved and that required plural -forms survive a translation export and another source extraction. Compare every -existing plural key as well as ordinary keys: parsers can select different -categories for a target language, so preserve and review translations under old -suffixes before allowing an export to replace them. Do not automatically rename -a translated variant into a different grammatical category. Translators -still need to supply the missing forms; changing the format does not translate -them automatically. The component's format is a Weblate administration setting, -so updating this README alone does not change the running translation service. - -An offline round-trip of the catalogues at -[`aa35c0c3`](https://github.com/wger-project/react/commit/aa35c0c36f70d345872d17944a4d1e079fa037cd) -with Translate Toolkit 3.20.2 -illustrates why this check matters: its default Ukrainian categories exclude -`other`, and its Slovak categories exclude `many`. Exporting through that parser -omits seven existing Ukrainian `_other` values and two Slovak `_many` values. -This is a parser-level check, not a test of Weblate's migration or translation -memory. Verify the actual Weblate version and merge behavior on a test component -and preserve those values for translator review before enabling writes. +More info: Please note that the contents of i18n.tsx contains the values of the exercise categories, equipment, etc. and is autogenerated on the wger repo by the extract-i18n.py script (python manage.py extract-i18n). diff --git a/src/i18n.ts b/src/i18n.ts index 0b625023a..ed0779371 100644 --- a/src/i18n.ts +++ b/src/i18n.ts @@ -31,6 +31,9 @@ i18n fallbackLng: 'en', + // Weblate can write untranslated plural forms as empty strings + returnEmptyString: false, + //lng: "de", // language to use, more information here: https://www.i18next.com/overview/configuration-options#languages-namespaces-resources // you can use the i18n.changeLanguage function to change the language manually: https://www.i18next.com/overview/api#changelanguage From 07f959999dd28e0b10faf47a2943dd41ad5ee534 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Wed, 4 Nov 2026 20:25:06 +0100 Subject: [PATCH 17/30] Move uk and sk plural values to their categories --- public/locales/sk/translation.json | 6 ++---- public/locales/uk/translation.json | 14 +++++++------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/public/locales/sk/translation.json b/public/locales/sk/translation.json index ebe3a885b..a916f01d9 100644 --- a/public/locales/sk/translation.json +++ b/public/locales/sk/translation.json @@ -428,14 +428,12 @@ "chartRangeAll": "Všetko", "chartRangeMonths_one": "1 mesiac", "chartRangeMonths_few": "{{count}} mesiace", - "chartRangeMonths_many": "{{count}} mesiacov", - "chartRangeMonths_other": "{{count}} mesiaca", + "chartRangeMonths_other": "{{count}} mesiacov", "chartRangeWeeks_one": "1 týždeň", "chartRangeWeeks_other": "{{count}} týždňov", "chartRangeYears_one": "1 rok", "chartRangeYears_few": "{{count}} roky", - "chartRangeYears_many": "{{count}} rokov", - "chartRangeYears_other": "{{count}} roka", + "chartRangeYears_other": "{{count}} rokov", "customMeasurement": "Vlastné meranie", "metricAlreadyTracked": "Už sa sleduje", "categoryFormHelpText": "Kategória merania, napríklad 'biceps' alebo 'telesný tuk'", diff --git a/public/locales/uk/translation.json b/public/locales/uk/translation.json index 3ee9f5eff..c9e66f2f4 100644 --- a/public/locales/uk/translation.json +++ b/public/locales/uk/translation.json @@ -283,7 +283,7 @@ "retry": "Повторити", "empty": "Немає даних для цих фільтрів та показника. Спробуйте інший показник або довший період часу.", "skipped_one": "{{count}} запис має пропущені значення або несумісні одиниці вимірювання для цього показника й не відображається.", - "skipped_other": "{{count}} записи мають пропущені значення або несумісні одиниці вимірювання для цього показника й не відображаються." + "skipped_few": "{{count}} записи мають пропущені значення або несумісні одиниці вимірювання для цього показника й не відображаються." }, "deleteSessionInfo": "Це видалить тренування, а також усі записані в ньому підходи" }, @@ -347,12 +347,12 @@ "sluggish": "Плавний" }, "chartAverageWindow": "Усереднення за", - "chartAverageWindowDays_other": "Середнє за {{count}} днів", + "chartAverageWindowDays_many": "Середнє за {{count}} днів", "distributionMedian": "Медіана", "distributionLatest": "Останнє", "distributionEntryCount_one": "1 запис", - "distributionEntryCount_other": "{{count}} записів", - "distributionDayCount_other": "{{count}} днів", + "distributionEntryCount_many": "{{count}} записів", + "distributionDayCount_many": "{{count}} днів", "partOfGroup": "У складі групи", "noGroup": "Без групи", "metricTypes": { @@ -384,11 +384,11 @@ "overallChangeWeight": "Загальна зміна ваги", "chartRangeAll": "Весь період", "chartRangeMonths_one": "За останній місяць", - "chartRangeMonths_other": "{{count}} місяців", + "chartRangeMonths_many": "{{count}} місяців", "chartRangeWeeks_one": "За останній тиждень", - "chartRangeWeeks_other": "{{count}} тижнів", + "chartRangeWeeks_many": "{{count}} тижнів", "chartRangeYears_one": "За останній рік", - "chartRangeYears_other": "{{count}} років", + "chartRangeYears_many": "{{count}} років", "customMeasurement": "Власне вимірювання", "metricAlreadyTracked": "Вже відстежується", "categoryFormHelpText": "Категорія вимірювання, наприклад 'біцепс' або 'відсоток жиру'", From d385d1238e323f549b5facea9dade61a2ec0b46e Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Wed, 4 Nov 2026 20:53:13 +0100 Subject: [PATCH 18/30] Move uk and sk plural values to their categories --- public/locales/ar/translation.json | 49 ++++++++++++++--- public/locales/cs/translation.json | 20 +++++-- public/locales/de/translation.json | 36 ++++++++----- public/locales/el/translation.json | 9 ++-- public/locales/en/translation.json | 24 ++++++--- public/locales/es/translation.json | 40 +++++++++----- public/locales/fr/translation.json | 44 +++++++++++----- public/locales/gl/translation.json | 3 +- public/locales/hr/translation.json | 52 ++++++++++++++----- public/locales/hu/translation.json | 21 +++++--- public/locales/it/translation.json | 28 +++++++--- public/locales/ko/translation.json | 14 ++--- public/locales/mk/translation.json | 9 ++-- public/locales/nl/translation.json | 21 +++++--- public/locales/pl/translation.json | 19 +++++-- public/locales/pt/translation.json | 28 +++++++--- public/locales/pt_BR/translation.json | 32 ++++++++---- public/locales/pt_PT/translation.json | 28 +++++++--- public/locales/ro/translation.json | 28 +++++++--- public/locales/ru/translation.json | 12 +++-- public/locales/sk/translation.json | 45 +++++++++++----- public/locales/sl/translation.json | 35 ++++++++++--- public/locales/sr/translation.json | 12 +++-- public/locales/sv/translation.json | 33 +++++++----- public/locales/ta/translation.json | 21 +++++--- public/locales/tr/translation.json | 21 +++++--- public/locales/uk/translation.json | 49 ++++++++++++----- public/locales/vi/translation.json | 2 +- public/locales/zh_Hans/translation.json | 14 ++--- public/locales/zh_Hant/translation.json | 14 ++--- .../Exercises/forms/yupValidators.ts | 14 ++--- .../Exercises/screens/Add/NotEnoughRights.tsx | 3 +- .../Measurements/widgets/CategoryForm.tsx | 4 +- .../Measurements/widgets/EntryForm.tsx | 2 +- .../Nutrition/widgets/forms/MealForm.tsx | 4 +- .../Nutrition/widgets/forms/PlanForm.tsx | 4 +- .../Routines/models/Routine.test.ts | 21 +++++++- src/components/Routines/models/Routine.ts | 7 ++- .../screens/Detail/RoutineEdit.test.tsx | 2 +- .../Routines/widgets/forms/DayForm.tsx | 6 +-- .../Routines/widgets/forms/RoutineForm.tsx | 16 +++--- .../Routines/widgets/forms/SessionForm.tsx | 2 +- 42 files changed, 587 insertions(+), 261 deletions(-) diff --git a/public/locales/ar/translation.json b/public/locales/ar/translation.json index 7edb7b18a..a2d98c047 100644 --- a/public/locales/ar/translation.json +++ b/public/locales/ar/translation.json @@ -49,7 +49,12 @@ "step1HeaderBasics": "الأساسيات بالإنجليزية", "variations": "الاختلافات", "notEnoughRightsHeader": "لا يمكنك المساهمة بتمارين", - "notEnoughRights": "يمكنك المساهمة بتمارين فقط إذا كان عمر حسابك أكثر من {{days}} يومًا وقمت بتأكيد بريدك الإلكتروني", + "notEnoughRights_zero": "يمكنك المساهمة بتمارين فقط إذا كان عمر حسابك أكثر من {{count}} يومًا وقمت بتأكيد بريدك الإلكتروني", + "notEnoughRights_one": "يمكنك المساهمة بتمارين فقط إذا كان عمر حسابك أكثر من {{count}} يومًا وقمت بتأكيد بريدك الإلكتروني", + "notEnoughRights_two": "يمكنك المساهمة بتمارين فقط إذا كان عمر حسابك أكثر من {{count}} يومًا وقمت بتأكيد بريدك الإلكتروني", + "notEnoughRights_few": "يمكنك المساهمة بتمارين فقط إذا كان عمر حسابك أكثر من {{count}} يومًا وقمت بتأكيد بريدك الإلكتروني", + "notEnoughRights_many": "يمكنك المساهمة بتمارين فقط إذا كان عمر حسابك أكثر من {{count}} يومًا وقمت بتأكيد بريدك الإلكتروني", + "notEnoughRights_other": "يمكنك المساهمة بتمارين فقط إذا كان عمر حسابك أكثر من {{count}} يومًا وقمت بتأكيد بريدك الإلكتروني", "muscles": "العضلات", "secondaryMuscles": "العضلات الثانوية", "whatVariationsExist": "ما هي الاختلافات الموجودة لهذا التمرين، إن وجدت؟", @@ -178,8 +183,18 @@ "valueTooShort": "القيمة قصيرة جدًا", "valueTooLong": "القيمة طويلة جدًا", "fieldRequired": "هذا الحقل مطلوب", - "maxLength": "الرجاء إدخال أقل من {{chars}} حرفًا", - "minLength": "الرجاء إدخال أكثر من {{chars}} حرفًا", + "maxLength_zero": "الرجاء إدخال أقل من {{count}} حرفًا", + "maxLength_one": "الرجاء إدخال أقل من {{count}} حرفًا", + "maxLength_two": "الرجاء إدخال أقل من {{count}} حرفًا", + "maxLength_few": "الرجاء إدخال أقل من {{count}} حرفًا", + "maxLength_many": "الرجاء إدخال أقل من {{count}} حرفًا", + "maxLength_other": "الرجاء إدخال أقل من {{count}} حرفًا", + "minLength_zero": "الرجاء إدخال أكثر من {{count}} حرفًا", + "minLength_one": "الرجاء إدخال أكثر من {{count}} حرفًا", + "minLength_two": "الرجاء إدخال أكثر من {{count}} حرفًا", + "minLength_few": "الرجاء إدخال أكثر من {{count}} حرفًا", + "minLength_many": "الرجاء إدخال أكثر من {{count}} حرفًا", + "minLength_other": "الرجاء إدخال أكثر من {{count}} حرفًا", "minValue": "يجب أن تكون القيمة أكبر من {{value}}", "maxValue": "يجب أن تكون القيمة أقل من {{value}}", "enterNumber": "يرجى ادخال رقم صحيح", @@ -212,8 +227,18 @@ "workoutNr": "رقم التمرين {{number}}", "weekNr": "اسبوع {{number}}", "backToRoutine": "العودة إلى الروتين", - "minLengthRoutine": "يجب أن يستمر الروتين لمدة لا تقل عن {{number}} أسبوعًا", - "maxLengthRoutine": "يمكن أن يستمر الروتين لمدة أقصاها {{number}} أسبوعًا", + "minLengthRoutine_zero": "يجب أن يستمر الروتين لمدة لا تقل عن {{count}} أسبوعًا", + "minLengthRoutine_one": "يجب أن يستمر الروتين لمدة لا تقل عن {{count}} أسبوعًا", + "minLengthRoutine_two": "يجب أن يستمر الروتين لمدة لا تقل عن {{count}} أسبوعًا", + "minLengthRoutine_few": "يجب أن يستمر الروتين لمدة لا تقل عن {{count}} أسبوعًا", + "minLengthRoutine_many": "يجب أن يستمر الروتين لمدة لا تقل عن {{count}} أسبوعًا", + "minLengthRoutine_other": "يجب أن يستمر الروتين لمدة لا تقل عن {{count}} أسبوعًا", + "maxLengthRoutine_zero": "يمكن أن يستمر الروتين لمدة أقصاها {{count}} أسبوعًا", + "maxLengthRoutine_one": "يمكن أن يستمر الروتين لمدة أقصاها {{count}} أسبوعًا", + "maxLengthRoutine_two": "يمكن أن يستمر الروتين لمدة أقصاها {{count}} أسبوعًا", + "maxLengthRoutine_few": "يمكن أن يستمر الروتين لمدة أقصاها {{count}} أسبوعًا", + "maxLengthRoutine_many": "يمكن أن يستمر الروتين لمدة أقصاها {{count}} أسبوعًا", + "maxLengthRoutine_other": "يمكن أن يستمر الروتين لمدة أقصاها {{count}} أسبوعًا", "resultingRoutine": "الروتين الناتج", "currentRoutine": "الروتين الحالي", "sets": "مجموعات", @@ -362,8 +387,18 @@ "public": "عام", "min": "الادنى", "max": "الاقصى", - "durationWeeks": "{{number}} اسابيع", - "durationWeeksDays": "{{nrWeeks}} اسابيع, {{nrDays}} ايام", + "durationWeeks_zero": "{{count}} اسابيع", + "durationWeeks_one": "{{count}} اسابيع", + "durationWeeks_two": "{{count}} اسابيع", + "durationWeeks_few": "{{count}} اسابيع", + "durationWeeks_many": "{{count}} اسابيع", + "durationWeeks_other": "{{count}} اسابيع", + "durationDays_zero": "{{count}} ايام", + "durationDays_one": "{{count}} ايام", + "durationDays_two": "{{count}} ايام", + "durationDays_few": "{{count}} ايام", + "durationDays_many": "{{count}} ايام", + "durationDays_other": "{{count}} ايام", "undo": "تراجع", "successfullyDeleted": "تم الحذف بنجاح", "preview": "عرض مبدئي", diff --git a/public/locales/cs/translation.json b/public/locales/cs/translation.json index 72ef55ddb..4342aa968 100644 --- a/public/locales/cs/translation.json +++ b/public/locales/cs/translation.json @@ -11,7 +11,9 @@ "imageStyleLine": "Čára", "imageStyleOther": "Jiné", "imageDetails": "Podrobnosti o obrázku", - "notEnoughRights": "Cviky můžete přidávat pouze, pokud je váš účet starší než {{days}} dní a máte ověřený svůj e-mail", + "notEnoughRights_one": "Cviky můžete přidávat pouze, pokud je váš účet starší než {{count}} den a máte ověřený svůj e-mail", + "notEnoughRights_few": "Cviky můžete přidávat pouze, pokud je váš účet starší než {{count}} dny a máte ověřený svůj e-mail", + "notEnoughRights_other": "Cviky můžete přidávat pouze, pokud je váš účet starší než {{count}} dní a máte ověřený svůj e-mail", "step1HeaderBasics": "Základy v angličtině", "variations": "Variace", "notEnoughRightsHeader": "Nemůžete přidávat cviky", @@ -276,8 +278,12 @@ "valueTooShort": "Hodnota je příliš krátká", "valueTooLong": "Hodnota je příliš dlouhá", "fieldRequired": "Toto pole je vyžadováno", - "maxLength": "Zadejte prosím méně než {{chars}} znaků", - "minLength": "Zadejte prosím více než {{chars}} znaků", + "maxLength_one": "Zadejte prosím méně než {{count}} znak", + "maxLength_few": "Zadejte prosím méně než {{count}} znaky", + "maxLength_other": "Zadejte prosím méně než {{count}} znaků", + "minLength_one": "Zadejte prosím více než {{count}} znak", + "minLength_few": "Zadejte prosím více než {{count}} znaky", + "minLength_other": "Zadejte prosím více než {{count}} znaků", "minValue": "Hodnota tohoto pole musí být vyšší než {{value}}", "maxValue": "Hodnota tohoto pole musí být nižší než {{value}}", "enterNumber": "Zadejte prosím platné číslo", @@ -305,8 +311,12 @@ "comment": "Komentář", "min": "Min", "max": "Max", - "durationWeeks": "{{number}} týdnů", - "durationWeeksDays": "{{nrWeeks}} týdnů, {{nrDays}} dní", + "durationWeeks_one": "{{count}} týden", + "durationWeeks_few": "{{count}} týdny", + "durationWeeks_other": "{{count}} týdnů", + "durationDays_one": "{{count}} den", + "durationDays_few": "{{count}} dny", + "durationDays_other": "{{count}} dní", "undo": "Vrátit", "successfullyDeleted": "Úspěšně smazáno", "height": "Výška", diff --git a/public/locales/de/translation.json b/public/locales/de/translation.json index a09fe4213..a7ed61a4d 100644 --- a/public/locales/de/translation.json +++ b/public/locales/de/translation.json @@ -52,7 +52,8 @@ "deleteExerciseBody": "Möchtest du die Übung \"{{name}}\" löschen? Du kannst entweder die aktuelle {{language}} Übersetzung oder die komplette Übung mit allen Übersetzungen, Bildern usw. löschen.", "basics": "Grundlagen", "notEnoughRightsHeader": "Du kannst keine Übungen beisteuern", - "notEnoughRights": "Du kannst Übungen nur dann beisteuern, wenn dein Benutzerkonto älter als {{days}} Tage und deine E-Mail-Adresse verifiziert ist", + "notEnoughRights_one": "Du kannst Übungen nur dann beisteuern, wenn dein Benutzerkonto älter als {{count}} Tag und deine E-Mail-Adresse verifiziert ist", + "notEnoughRights_other": "Du kannst Übungen nur dann beisteuern, wenn dein Benutzerkonto älter als {{count}} Tage und deine E-Mail-Adresse verifiziert ist", "changeExerciseLanguage": "Ändere die Sprache dieser Übung", "identicalExercise": "Vermeide doppelte Übungen", "cacheWarning": "Aufgrund von Caching kann es einige Zeit dauern, bis Änderungen in der ganzen Anwendung sichtbar sind.", @@ -141,15 +142,18 @@ "valueTooShort": "Der Wert ist zu gering", "valueTooLong": "Der Wert ist zu groß", "fieldRequired": "Pflichtfeld", - "maxLength": "Bitte geben Sie weniger als {{chars}} Zeichen ein", - "minLength": "Bitte geben Sie mehr als {{chars}} Zeichen ein", + "maxLength_one": "Bitte geben Sie weniger als {{count}} Zeichen ein", + "maxLength_other": "Bitte geben Sie weniger als {{count}} Zeichen ein", + "minLength_one": "Bitte geben Sie mehr als {{count}} Zeichen ein", + "minLength_other": "Bitte geben Sie mehr als {{count}} Zeichen ein", "minValue": "Der Wert für dieses Feld muss höher sein als {{value}}", "maxValue": "Der Wert für dieses Feld muss niedriger sein als {{value}}", "enterNumber": "Bitte gib eine gültige Nummer ein", "enterInteger": "Bitte gib eine ganze Zahl ein", "maxLessThanMin": "Der maximale Wert muss größer als der minimale sein", "endBeforeStart": "Der Endwert darf nicht vor dem Startwert liegen", - "minWords": "Bitte gib mindestens {{words}} Wörter ein" + "minWords_one": "Bitte gib mindestens {{count}} Wort ein", + "minWords_other": "Bitte gib mindestens {{count}} Wörter ein" }, "routines": { "sets": "Sätze", @@ -190,7 +194,8 @@ "newSession": "Neue Trainingseinheit", "changeSession": "Andere Trainingseinheit auswählen", "backToRoutine": "Zurück zur Routine", - "maxLengthRoutine": "Die Routine darf maximal {{number}} Wochen lang sein", + "maxLengthRoutine_one": "Die Routine darf maximal {{count}} Woche lang sein", + "maxLengthRoutine_other": "Die Routine darf maximal {{count}} Wochen lang sein", "resultingRoutine": "Resultierende Routine", "deleteDayConfirmation": "Dies löscht alle Sets, Übungen und Fortschrittsregeln", "fitDaysInWeek": "Fester Wochenrhythmus", @@ -243,7 +248,8 @@ "impressionBad": "Schlecht", "newDay": "Neuer Tag", "logsOverview": "Log Übersicht", - "minLengthRoutine": "Die Routine muss mindestens {{number}} Wochen lang sein", + "minLengthRoutine_one": "Die Routine muss mindestens {{count}} Woche lang sein", + "minLengthRoutine_other": "Die Routine muss mindestens {{count}} Wochen lang sein", "workoutSession": "Trainingseinheit", "repeatHelpText": "Aktivieren Sie das Kontrollkästchen, wenn diese Regel auch für nachfolgende Trainingseinheiten gelten soll, bis Sie eine neue definieren", "impressionHelpText": "Dieses Formular erfasst Ihre Trainingsergebnisse (Wiederholungen, Gewicht usw.) für jede Übung. Änderungen, die Sie hier vornehmen, wie das Entfernen oder Austauschen von Übungen, wirken sich nur auf die gespeicherten Protokolle aus und haben keinen Einfluss auf Ihr Gesamtprogramm. Es werden nur Zeilen mit Werten für Gewicht oder Wiederholungen gespeichert.", @@ -326,13 +332,13 @@ "sluggish": "Geglättet" }, "chartAverageWindow": "Durchschnitt über", - "chartAverageWindowDays_one": "1 Tag", + "chartAverageWindowDays_one": "{{count}} Tag", "chartAverageWindowDays_other": "{{count}} Tage", "distributionMedian": "Median", "distributionLatest": "Aktuell", - "distributionEntryCount_one": "1 Eintrag", + "distributionEntryCount_one": "{{count}} Eintrag", "distributionEntryCount_other": "{{count}} Einträge", - "distributionDayCount_one": "1 Tag", + "distributionDayCount_one": "{{count}} Tag", "distributionDayCount_other": "{{count}} Tage", "partOfGroup": "Teil der Gruppe", "noGroup": "Keine Gruppe", @@ -364,11 +370,11 @@ "noDataAvailable": "Keine Daten vorhanden", "overallChangeWeight": "Allgemeine Veränderung", "chartRangeAll": "Gesamt", - "chartRangeMonths_one": "1 Monat", + "chartRangeMonths_one": "{{count}} Monat", "chartRangeMonths_other": "{{count}} Monate", - "chartRangeWeeks_one": "1 Woche", + "chartRangeWeeks_one": "{{count}} Woche", "chartRangeWeeks_other": "{{count}} Wochen", - "chartRangeYears_one": "1 Jahr", + "chartRangeYears_one": "{{count}} Jahr", "chartRangeYears_other": "{{count}} Jahre", "customMeasurement": "Eigene Messung", "metricAlreadyTracked": "Wird bereits aufgezeichnet", @@ -481,8 +487,10 @@ "comment": "Kommentar", "min": "Min", "max": "Max", - "durationWeeks": "{{number}} Wochen", - "durationWeeksDays": "{{nrWeeks}} Wochen, {{nrDays}} Tage", + "durationWeeks_one": "{{count}} Woche", + "durationWeeks_other": "{{count}} Wochen", + "durationDays_one": "{{count}} Tag", + "durationDays_other": "{{count}} Tage", "undo": "Rückgängig machen", "successfullyDeleted": "Erfolgreich gelöscht", "private": "Privat", diff --git a/public/locales/el/translation.json b/public/locales/el/translation.json index fc7e2ec84..7a3ed702e 100644 --- a/public/locales/el/translation.json +++ b/public/locales/el/translation.json @@ -3,7 +3,8 @@ "secondaryMuscles": "Δευτερεύοντες μύες", "muscles": "Μύες", "contributeExercise": "Συνεισφέρετε μια άσκηση", - "notEnoughRights": "Μπορείτε να συνεισφέρετε ασκήσεις μόνο εάν ο λογαριασμός σας είναι παλαιότερος από {{days}} ημέρες και έχετε επαληθεύσει το ηλεκτρονικό σας ταχυδρομείο", + "notEnoughRights_one": "Μπορείτε να συνεισφέρετε ασκήσεις μόνο εάν ο λογαριασμός σας είναι παλαιότερος από {{count}} ημέρα και έχετε επαληθεύσει το ηλεκτρονικό σας ταχυδρομείο", + "notEnoughRights_other": "Μπορείτε να συνεισφέρετε ασκήσεις μόνο εάν ο λογαριασμός σας είναι παλαιότερος από {{count}} ημέρες και έχετε επαληθεύσει το ηλεκτρονικό σας ταχυδρομείο", "variations": "Παραλλαγές", "notEnoughRightsHeader": "Δεν μπορείτε να συνεισφέρετε ασκήσεις", "newNote": "Νέα σημείωση", @@ -71,10 +72,12 @@ "forms": { "valueTooLong": "Η τιμή είναι πολύ μεγάλη", "minValue": "Η τιμή για αυτό το πεδίο πρέπει να είναι μεγαλύτερη από {{value}}", - "minLength": "Παρακαλώ εισάγετε περισσότερους από {{chars}} χαρακτήρες", + "minLength_one": "Παρακαλώ εισάγετε περισσότερους από {{count}} χαρακτήρα", + "minLength_other": "Παρακαλώ εισάγετε περισσότερους από {{count}} χαρακτήρες", "valueTooShort": "Η τιμή είναι πολύ μικρή", "supportedImageFormats": "Υποστηρίζονται μόνο αρχεία JPEG, PNG, WEBP και AVIF κάτω των 20Mb", - "maxLength": "Παρακαλώ εισάγετε λιγότερους από {{chars}} χαρακτήρες", + "maxLength_one": "Παρακαλώ εισάγετε λιγότερους από {{count}} χαρακτήρα", + "maxLength_other": "Παρακαλώ εισάγετε λιγότερους από {{count}} χαρακτήρες", "maxValue": "Η τιμή για αυτό το πεδίο πρέπει να είναι μικρότερη από {{value}}", "fieldRequired": "Το πεδίο αυτό είναι υποχρεωτικό" }, diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index 3c98a8c30..9ea92e80c 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -82,7 +82,8 @@ "step1HeaderBasics": "Basics in English", "variations": "Variations", "notEnoughRightsHeader": "You can't contribute exercises", - "notEnoughRights": "You can only contribute exercises if your account is older than {{days}} days and have verified your email", + "notEnoughRights_one": "You can only contribute exercises if your account is older than {{count}} day and have verified your email", + "notEnoughRights_other": "You can only contribute exercises if your account is older than {{count}} days and have verified your email", "muscles": "Muscles", "secondaryMuscles": "Secondary muscles", "whatVariationsExist": "Which variations of this exercise exist, if any?", @@ -218,13 +219,16 @@ "enterNumber": "Please enter a valid number", "enterInteger": "Please enter a whole number", "fieldRequired": "This field is required", - "maxLength": "Please enter less than {{chars}} characters", - "minLength": "Please enter more than {{chars}} characters", + "maxLength_one": "Please enter less than {{count}} character", + "maxLength_other": "Please enter less than {{count}} characters", + "minLength_one": "Please enter more than {{count}} character", + "minLength_other": "Please enter more than {{count}} characters", "minValue": "The value for this field has to be higher than {{value}}", "maxValue": "The value for this field has to be less than {{value}}", "maxLessThanMin": "The max value has to be bigger than the minimum", "endBeforeStart": "The end value cannot be before the start", - "minWords": "Please enter at least {{words}} words" + "minWords_one": "Please enter at least {{count}} word", + "minWords_other": "Please enter at least {{count}} words" }, "name": "Name", "category": "Category", @@ -233,8 +237,10 @@ "save": "Save", "min": "Min", "max": "Max", - "durationWeeks": "{{number}} weeks", - "durationWeeksDays": "{{nrWeeks}} weeks, {{nrDays}} days", + "durationWeeks_one": "{{count}} week", + "durationWeeks_other": "{{count}} weeks", + "durationDays_one": "{{count}} day", + "durationDays_other": "{{count}} days", "videos": "Videos", "undo": "Undo", "successfullyDeleted": "Successfully deleted", @@ -275,8 +281,10 @@ "weekNr": "Week {{number}}", "iterationNr": "Iteration {{number}}", "backToRoutine": "Back to routine", - "minLengthRoutine": "The routine needs to be at least {{number}} weeks long", - "maxLengthRoutine": "The routine can be at most {{number}} weeks long", + "minLengthRoutine_one": "The routine needs to be at least {{count}} week long", + "minLengthRoutine_other": "The routine needs to be at least {{count}} weeks long", + "maxLengthRoutine_one": "The routine can be at most {{count}} week long", + "maxLengthRoutine_other": "The routine can be at most {{count}} weeks long", "resultingRoutine": "Resulting routine", "addDay": "Add training day", "deleteDayConfirmation": "This will remove all sets, exercises and progression rules", diff --git a/public/locales/es/translation.json b/public/locales/es/translation.json index 94b1cecbc..e0a78c913 100644 --- a/public/locales/es/translation.json +++ b/public/locales/es/translation.json @@ -41,7 +41,9 @@ "primaryMuscles": "Músculos primarios", "exercises": "Ejercicios", "noEquipment": "Sin equipamiento", - "notEnoughRights": "Solo puede aportar ejercicios si su cuenta tiene más de {{days}} días y ha verificado su correo electrónico", + "notEnoughRights_one": "Solo puede aportar ejercicios si su cuenta tiene más de {{count}} día y ha verificado su correo electrónico", + "notEnoughRights_many": "Solo puede aportar ejercicios si su cuenta tiene más de {{count}} días y ha verificado su correo electrónico", + "notEnoughRights_other": "Solo puede aportar ejercicios si su cuenta tiene más de {{count}} días y ha verificado su correo electrónico", "alternativeNames": "Nombres alternativos", "checkInformationBeforeSubmitting": "Verifique que la información que ingresó sea correcta antes de enviar el ejercicio", "successfullyUpdated": "El ejercicio se actualizó con éxito. Debido al almacenamiento en caché, puede llevar algún tiempo hasta que los cambios sean visibles en toda la aplicación.", @@ -135,8 +137,12 @@ "valueTooLong": "El valor es demasiado largo", "fieldRequired": "Este campo es obligatorio", "minValue": "El valor de este campo tiene que ser superior a {{value}}", - "minLength": "Por favor, introduce más de {{chars}} caracteres", - "maxLength": "Por favor, escribe menos de {{chars}} caracteres", + "minLength_one": "Por favor, introduce más de {{count}} carácter", + "minLength_many": "Por favor, introduce más de {{count}} caracteres", + "minLength_other": "Por favor, introduce más de {{count}} caracteres", + "maxLength_one": "Por favor, escribe menos de {{count}} carácter", + "maxLength_many": "Por favor, escribe menos de {{count}} caracteres", + "maxLength_other": "Por favor, escribe menos de {{count}} caracteres", "maxValue": "El valor de este campo tiene que ser inferior a {{value}}", "enterNumber": "Introduzca un número válido", "enterInteger": "Introduzca un número entero", @@ -172,7 +178,9 @@ "workoutNr": "Sesión Num. {{number}}", "weekNr": "Semana {{number}}", "backToRoutine": "Vuelta a la rutina", - "minLengthRoutine": "La rutina debe ser de al menos {{number}} semanas", + "minLengthRoutine_one": "La rutina debe ser de al menos {{count}} semana", + "minLengthRoutine_many": "La rutina debe ser de al menos {{count}} semanas", + "minLengthRoutine_other": "La rutina debe ser de al menos {{count}} semanas", "resultingRoutine": "Rutina resultante", "routineHasNoDays": "La rutina no tiene días", "setHasNoExercises": "El conjunto no tiene días", @@ -223,7 +231,9 @@ "warmup": "Calentamiento" }, "roundingHelp": "Establezca el redondeo predeterminado para obtener peso y repeticiones (esto es especialmente útil cuando se usan incrementos porcentuales en la progresión). Esto se aplicará a todos los conjuntos nuevos, pero se puede cambiar individualmente en el formulario de progresión. Deja vacío para deshabilitar el redondeo.", - "maxLengthRoutine": "La rutina debe tener como mucho {{number}} semanas", + "maxLengthRoutine_one": "La rutina debe tener como mucho {{count}} semana", + "maxLengthRoutine_many": "La rutina debe tener como mucho {{count}} semanas", + "maxLengthRoutine_other": "La rutina debe tener como mucho {{count}} semanas", "deleteDayConfirmation": "Esto eliminará todos los conjuntos, ejercicios y progresos del día", "statsOverview": "Estadísticas", "repeat": "Regla para repeticiones", @@ -321,15 +331,15 @@ "sluggish": "Suavizada" }, "chartAverageWindow": "Promedio de", - "chartAverageWindowDays_one": "1 día", + "chartAverageWindowDays_one": "{{count}} día", "chartAverageWindowDays_other": "{{count}} días", "chartAverageWindowDays_many": "{{count}} días", "distributionMedian": "Mediana", "distributionLatest": "Actual", - "distributionEntryCount_one": "1 entrada", + "distributionEntryCount_one": "{{count}} entrada", "distributionEntryCount_other": "{{count}} entradas", "distributionEntryCount_many": "{{count}} entradas", - "distributionDayCount_one": "1 día", + "distributionDayCount_one": "{{count}} día", "distributionDayCount_other": "{{count}} días", "distributionDayCount_many": "{{count}} días", "partOfGroup": "Parte del grupo", @@ -362,13 +372,13 @@ "noDataAvailable": "No hay datos disponibles", "overallChangeWeight": "Cambio general", "chartRangeAll": "Todo", - "chartRangeMonths_one": "1 mes", + "chartRangeMonths_one": "{{count}} mes", "chartRangeMonths_other": "{{count}} meses", "chartRangeMonths_many": "{{count}} meses", - "chartRangeWeeks_one": "1 semana", + "chartRangeWeeks_one": "{{count}} semana", "chartRangeWeeks_other": "{{count}} semanas", "chartRangeWeeks_many": "{{count}} semanas", - "chartRangeYears_one": "1 año", + "chartRangeYears_one": "{{count}} año", "chartRangeYears_other": "{{count}} años", "chartRangeYears_many": "{{count}} años", "customMeasurement": "Medición personalizada", @@ -476,8 +486,12 @@ "comment": "Comentar", "min": "Mínimo", "max": "Máximo", - "durationWeeks": "{{number}} semanas", - "durationWeeksDays": "{{nrWeeks}} semanas, {{nrDays}} días", + "durationWeeks_one": "{{count}} semana", + "durationWeeks_many": "{{count}} semanas", + "durationWeeks_other": "{{count}} semanas", + "durationDays_one": "{{count}} día", + "durationDays_many": "{{count}} días", + "durationDays_other": "{{count}} días", "undo": "Deshacer", "successfullyDeleted": "Borrado completado", "public": "Público", diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json index 7b91ca543..c39f93ae6 100644 --- a/public/locales/fr/translation.json +++ b/public/locales/fr/translation.json @@ -28,7 +28,9 @@ "notEnoughRightsHeader": "Vous ne pouvez pas contribuer aux exercices", "translateExerciseNow": "Traduire cet exercice maintenant", "variations": "Variations", - "notEnoughRights": "Vous pouvez contribuer aux exercices seulement si votre compte est vieux d'au moins {{days}} jours et votre email est vérifié", + "notEnoughRights_one": "Vous pouvez contribuer aux exercices seulement si votre compte est vieux d'au moins {{count}} jour et votre email est vérifié", + "notEnoughRights_many": "Vous pouvez contribuer aux exercices seulement si votre compte est vieux d'au moins {{count}} jours et votre email est vérifié", + "notEnoughRights_other": "Vous pouvez contribuer aux exercices seulement si votre compte est vieux d'au moins {{count}} jours et votre email est vérifié", "muscles": "Muscles", "deleteTranslation": "Supprimer la traduction", "identicalExercise": "Éviter les exercices en double", @@ -138,15 +140,21 @@ "valueTooShort": "La valeur est trop courte", "fieldRequired": "Le champ est requis", "valueTooLong": "La valeur est trop longue", - "minLength": "Veuillez saisir plus de {{chars}} caractères", - "maxLength": "Veuillez saisir moins de {{chars}} caractères", + "minLength_one": "Veuillez saisir plus de {{count}} caractère", + "minLength_many": "Veuillez saisir plus de {{count}} caractères", + "minLength_other": "Veuillez saisir plus de {{count}} caractères", + "maxLength_one": "Veuillez saisir moins de {{count}} caractère", + "maxLength_many": "Veuillez saisir moins de {{count}} caractères", + "maxLength_other": "Veuillez saisir moins de {{count}} caractères", "maxValue": "La valeur de ce champ doit être inférieure à {{value}}", "minValue": "La valeur de ce champ doit être supérieure à {{value}}", "enterNumber": "Veuillez entrer un nombre valide", "maxLessThanMin": "La valeur maximale doit être plus grande que la valeur minimale", "endBeforeStart": "La valeur de fin ne peut être avant le début", "enterInteger": "Veuillez entrer un nombre entier", - "minWords": "Veuillez saisir au moins {{words}} mots" + "minWords_one": "Veuillez saisir au moins {{count}} mot", + "minWords_many": "Veuillez saisir au moins {{count}} mots", + "minWords_other": "Veuillez saisir au moins {{count}} mots" }, "name": "Nom", "category": "Catégorie", @@ -187,8 +195,12 @@ "workoutNr": "Entraînement n° {{number}}", "weekNr": "Semaine {{number}}", "backToRoutine": "Retour à la routine", - "minLengthRoutine": "La routine doit durer au moins {{number}} semaines", - "maxLengthRoutine": "La routine peut durer au maximum {{number}} semaines", + "minLengthRoutine_one": "La routine doit durer au moins {{count}} semaine", + "minLengthRoutine_many": "La routine doit durer au moins {{count}} semaines", + "minLengthRoutine_other": "La routine doit durer au moins {{count}} semaines", + "maxLengthRoutine_one": "La routine peut durer au maximum {{count}} semaine", + "maxLengthRoutine_many": "La routine peut durer au maximum {{count}} semaines", + "maxLengthRoutine_other": "La routine peut durer au maximum {{count}} semaines", "deleteDayConfirmation": "Cela supprimera toutes les séries, exercices et règles de progression", "resultingRoutine": "Routine résultante", "routineHasNoDays": "La routine n'a pas de jours", @@ -411,15 +423,15 @@ "sluggish": "Lissée" }, "chartAverageWindow": "Moyenne sur", - "chartAverageWindowDays_one": "1 jour", + "chartAverageWindowDays_one": "{{count}} jour", "chartAverageWindowDays_other": "{{count}} jours", "chartAverageWindowDays_many": "{{count}} jours", "distributionMedian": "Médiane", "distributionLatest": "Actuel", - "distributionEntryCount_one": "1 entrée", + "distributionEntryCount_one": "{{count}} entrée", "distributionEntryCount_other": "{{count}} entrées", "distributionEntryCount_many": "{{count}} entrées", - "distributionDayCount_one": "1 jour", + "distributionDayCount_one": "{{count}} jour", "distributionDayCount_other": "{{count}} jours", "distributionDayCount_many": "{{count}} jours", "partOfGroup": "Fait partie du groupe", @@ -452,13 +464,13 @@ "noDataAvailable": "Aucune donnée disponible", "overallChangeWeight": "Changement global", "chartRangeAll": "Tout", - "chartRangeMonths_one": "1 mois", + "chartRangeMonths_one": "{{count}} mois", "chartRangeMonths_other": "{{count}} mois", "chartRangeMonths_many": "{{count}} mois", - "chartRangeWeeks_one": "1 semaine", + "chartRangeWeeks_one": "{{count}} semaine", "chartRangeWeeks_other": "{{count}} semaines", "chartRangeWeeks_many": "{{count}} semaines", - "chartRangeYears_one": "1 an", + "chartRangeYears_one": "{{count}} an", "chartRangeYears_other": "{{count}} ans", "chartRangeYears_many": "{{count}} ans", "customMeasurement": "Mesure personnalisée", @@ -480,9 +492,13 @@ "end": "Terminer", "min": "Min", "max": "Max", - "durationWeeks": "{{number}} semaines", + "durationWeeks_one": "{{count}} semaine", + "durationWeeks_many": "{{count}} semaines", + "durationWeeks_other": "{{count}} semaines", "successfullyDeleted": "Suppression effectuée", - "durationWeeksDays": "{{nrWeeks}} semaines, {{nrDays}} jours", + "durationDays_one": "{{count}} jour", + "durationDays_many": "{{count}} jours", + "durationDays_other": "{{count}} jours", "undo": "Annuler les modifications", "bmi": { "calculator": "Calculateur BMI", diff --git a/public/locales/gl/translation.json b/public/locales/gl/translation.json index 39853f8d4..7e6b9d909 100644 --- a/public/locales/gl/translation.json +++ b/public/locales/gl/translation.json @@ -66,7 +66,8 @@ "step1HeaderBasics": "Conceptos básicos en inglés", "variations": "Variacións", "notEnoughRightsHeader": "Non podes contribuir con exercicios", - "notEnoughRights": "Só podes contribuír exercicios se a túa conta ten máis de {{days}} días e verificaches o teu correo electrónico", + "notEnoughRights_one": "Só podes contribuír exercicios se a túa conta ten máis de {{count}} día e verificaches o teu correo electrónico", + "notEnoughRights_other": "Só podes contribuír exercicios se a túa conta ten máis de {{count}} días e verificaches o teu correo electrónico", "muscles": "Músculos", "secondaryMuscles": "Músculos secundarios" }, diff --git a/public/locales/hr/translation.json b/public/locales/hr/translation.json index ec322ba7b..5ca446897 100644 --- a/public/locales/hr/translation.json +++ b/public/locales/hr/translation.json @@ -46,7 +46,9 @@ "basics": "Osnove", "cacheWarning": "Zbog predmemoriranja, vidljivost promjena u aplikaciji može nešto potrajati.", "notEnoughRightsHeader": "Ne možeš dodati vježbe", - "notEnoughRights": "Vježbe možeš dodati samo ako je tvoj račun stariji od {{days}} dana i ako si potvrdio/la tvoju e-mail adresu", + "notEnoughRights_one": "Vježbe možeš dodati samo ako je tvoj račun stariji od {{count}} dana i ako si potvrdio/la tvoju e-mail adresu", + "notEnoughRights_few": "Vježbe možeš dodati samo ako je tvoj račun stariji od {{count}} dana i ako si potvrdio/la tvoju e-mail adresu", + "notEnoughRights_other": "Vježbe možeš dodati samo ako je tvoj račun stariji od {{count}} dana i ako si potvrdio/la tvoju e-mail adresu", "replacements": "Zamjene", "replacementsInfoText": "Opcionalno možeš odabrati i vježbu koja bi trebala zamijeniti ovu (npr. zato što je poslana dva puta ili jer je slična). To će zamijeniti vježbu u rutinama kao i dnevnike treninga, umjesto da se samo izbrišu. Ove promjene će se također proširiti na bilo koju instancu koja sinkronizira vježbe iz ove.", "deleteExerciseReplace": "Izbriši i zamijeni", @@ -132,8 +134,12 @@ "valueTooLong": "Vrijednost je predugačka", "valueTooShort": "Vrijednost je prekratka", "fieldRequired": "Ovo je obavezno polje", - "maxLength": "Upiši manje od {{chars}} znakova", - "minLength": "Upiši više od {{chars}} znakova", + "maxLength_one": "Upiši manje od {{count}} znaka", + "maxLength_few": "Upiši manje od {{count}} znaka", + "maxLength_other": "Upiši manje od {{count}} znakova", + "minLength_one": "Upiši više od {{count}} znaka", + "minLength_few": "Upiši više od {{count}} znaka", + "minLength_other": "Upiši više od {{count}} znakova", "minValue": "Vrijednost za ovo polje mora biti veća od {{value}}", "maxValue": "Vrijednost za ovo polje mora biti manja od {{value}}", "enterNumber": "Upiši valjani broj", @@ -195,8 +201,12 @@ "workoutNr": "Trening br. {{number}}", "weekNr": "{{number}}. tjedan", "backToRoutine": "Natrag na rutinu", - "minLengthRoutine": "Rutina mora trajati najmanje {{number}} tjedna", - "maxLengthRoutine": "Rutina mora trajati najviše {{number}} tjedna", + "minLengthRoutine_one": "Rutina mora trajati najmanje {{count}} tjedan", + "minLengthRoutine_few": "Rutina mora trajati najmanje {{count}} tjedna", + "minLengthRoutine_other": "Rutina mora trajati najmanje {{count}} tjedana", + "maxLengthRoutine_one": "Rutina mora trajati najviše {{count}} tjedan", + "maxLengthRoutine_few": "Rutina mora trajati najviše {{count}} tjedna", + "maxLengthRoutine_other": "Rutina mora trajati najviše {{count}} tjedana", "resultingRoutine": "Rezultirajuća rutina", "deleteDayConfirmation": "Ovo će ukloniti sve serije, vježbe i pravila napredovanja", "exerciseHasProgression": "Ova vježba ima pravila napredovanja i ne može se ovdje uređivati. Za uređivanje klikni gumb.", @@ -272,7 +282,8 @@ "retry": "Pokušaj ponovo", "empty": "Nema podataka za ove filtre i metriku. Pokušaj jednu drugu metriku ili dulji vremenski raspon.", "skipped_one": "{{count}} zapis sadrži nedostajuće vrijednosti ili nekompatibilne jedinice za ovu metriku i ne prikazuje se.", - "skipped_other": "{{count}} zapisa sadrže nedostajuće vrijednosti ili nekompatibilne jedinice za ovu metriku i ne prikazuju se.", + "skipped_few": "{{count}} zapisa sadrže nedostajuće vrijednosti ili nekompatibilne jedinice za ovu metriku i ne prikazuju se.", + "skipped_other": "{{count}} zapisa sadrži nedostajuće vrijednosti ili nekompatibilne jedinice za ovu metriku i ne prikazuje se.", "volumeHelp": "Dnevni volumen (težina × ponavljanja), pretvoren u kg × ponavljanja. Serije s tjelesnom težinom bez vanjske težine koriste ponavljanja; vremenski mjerene serije koriste sekunde. One se prikazuju zasebno.", "repsHelp": "Ukupan dnevni broj ponavljanja. Vremenski mjerene serije i serije temeljene na udaljenosti se ne računaju kao ponavljanja.", "muscleHelp": "Mišićne grupe uključuju primarne i sekundarne mišiće; svaka serija broji se samo jednom." @@ -338,9 +349,11 @@ "balanced": "Uravnoteženo", "sluggish": "Izglađeno" }, - "chartAverageWindowDays_one": "1 dan", + "chartAverageWindowDays_one": "{{count}} dan", + "chartAverageWindowDays_few": "{{count}} dana", "chartAverageWindowDays_other": "{{count}} dana", "distributionDayCount_other": "{{count}} dana", + "distributionDayCount_few": "{{count}} dana", "distributionMedian": "Medijan", "chartAverageWindow": "Prosjek za", "noDataAvailable": "Nema podataka", @@ -350,10 +363,13 @@ "indicatorAvg": "prosjek", "indicatorTrend": "trend", "chartRangeAll": "Sve", - "chartRangeMonths_one": "1 mjesec", - "distributionDayCount_one": "1 dan", + "chartRangeMonths_one": "{{count}} mjesec", + "chartRangeMonths_other": "{{count}} mjeseci", + "chartRangeMonths_few": "{{count}} mjeseca", + "distributionDayCount_one": "{{count}} dan", "distributionLatest": "Najnovija", - "distributionEntryCount_one": "1 unos", + "distributionEntryCount_one": "{{count}} unos", + "distributionEntryCount_few": "{{count}} unosa", "distributionEntryCount_other": "{{count}} unosa", "customMeasurement": "Prilagođeno mjerenje", "calculations": { @@ -387,8 +403,12 @@ "window_days": "Vremenski okvir u danima" } }, - "chartRangeWeeks_one": "1 tjedan", - "chartRangeYears_one": "1 godina", + "chartRangeWeeks_one": "{{count}} tjedan", + "chartRangeWeeks_other": "{{count}} tjedana", + "chartRangeWeeks_few": "{{count}} tjedna", + "chartRangeYears_one": "{{count}} godina", + "chartRangeYears_other": "{{count}} godina", + "chartRangeYears_few": "{{count}} godine", "categoryFormHelpText": "Kategorija mjerenja, kao što su „bicepsi” ili „tjelesna mast”", "metricAlreadyTracked": "Već se prati", "indicatorRaw": "neobrađeno" @@ -499,8 +519,12 @@ "public": "Javno", "min": "Min.", "max": "Maks.", - "durationWeeks": "{{number}} tjedna", - "durationWeeksDays": "{{number}} tjedna, {{nrDays}} dana", + "durationWeeks_one": "{{count}} tjedan", + "durationWeeks_few": "{{count}} tjedna", + "durationWeeks_other": "{{count}} tjedana", + "durationDays_one": "{{count}} dan", + "durationDays_few": "{{count}} dana", + "durationDays_other": "{{count}} dana", "undo": "Poništi", "trophies": { "trophies": "Trofeje" diff --git a/public/locales/hu/translation.json b/public/locales/hu/translation.json index e232b9bf2..41ce0adfd 100644 --- a/public/locales/hu/translation.json +++ b/public/locales/hu/translation.json @@ -78,7 +78,8 @@ "step1HeaderBasics": "Alapadatok angolul", "variations": "Változatok", "notEnoughRightsHeader": "Nem küldhetsz be gyakorlatokat", - "notEnoughRights": "Csak akkor küldhetsz be gyakorlatokat, ha a fiókod {{days}} napnál régebbi, és megerősítetted az e-mail-címedet", + "notEnoughRights_one": "Csak akkor küldhetsz be gyakorlatokat, ha a fiókod {{count}} napnál régebbi, és megerősítetted az e-mail-címedet", + "notEnoughRights_other": "Csak akkor küldhetsz be gyakorlatokat, ha a fiókod {{count}} napnál régebbi, és megerősítetted az e-mail-címedet", "muscles": "Izmok", "secondaryMuscles": "Másodlagos izmok", "whatVariationsExist": "Milyen változatai léteznek ennek a gyakorlatnak, ha vannak?", @@ -207,8 +208,10 @@ "enterNumber": "Adj meg egy érvényes számot", "enterInteger": "Adj meg egy egész számot", "fieldRequired": "A mező kitöltése kötelező", - "maxLength": "Legfeljebb {{chars}} karaktert adj meg", - "minLength": "Legalább {{chars}} karaktert adj meg", + "maxLength_one": "Legfeljebb {{count}} karaktert adj meg", + "maxLength_other": "Legfeljebb {{count}} karaktert adj meg", + "minLength_one": "Legalább {{count}} karaktert adj meg", + "minLength_other": "Legalább {{count}} karaktert adj meg", "minValue": "A mező értékének nagyobbnak kell lennie ennél: {{value}}", "maxValue": "A mező értékének kisebbnek kell lennie ennél: {{value}}", "maxLessThanMin": "A maximális értéknek nagyobbnak kell lennie a minimális értéknél", @@ -221,8 +224,10 @@ "save": "Mentés", "min": "Min.", "max": "Max.", - "durationWeeks": "{{number}} hét", - "durationWeeksDays": "{{nrWeeks}} hét, {{nrDays}} nap", + "durationWeeks_one": "{{count}} hét", + "durationWeeks_other": "{{count}} hét", + "durationDays_one": "{{count}} nap", + "durationDays_other": "{{count}} nap", "videos": "Videók", "undo": "Visszavonás", "successfullyDeleted": "Sikeresen törölve", @@ -244,8 +249,10 @@ "weekNr": "{{number}}. hét", "iterationNr": "{{number}}. ismétlési ciklus", "backToRoutine": "Vissza a gyakorlatsorhoz", - "minLengthRoutine": "A gyakorlatsornak legalább {{number}} hetesnek kell lennie", - "maxLengthRoutine": "A gyakorlatsor legfeljebb {{number}} hetes lehet", + "minLengthRoutine_one": "A gyakorlatsornak legalább {{count}} hetesnek kell lennie", + "minLengthRoutine_other": "A gyakorlatsornak legalább {{count}} hetesnek kell lennie", + "maxLengthRoutine_one": "A gyakorlatsor legfeljebb {{count}} hetes lehet", + "maxLengthRoutine_other": "A gyakorlatsor legfeljebb {{count}} hetes lehet", "resultingRoutine": "Eredményül kapott gyakorlatsor", "addDay": "Edzésnap hozzáadása", "deleteDayConfirmation": "Ezzel az összes sorozat, gyakorlat és progressziós szabály törlődik", diff --git a/public/locales/it/translation.json b/public/locales/it/translation.json index 47f19dd9b..2a4b6b1a3 100644 --- a/public/locales/it/translation.json +++ b/public/locales/it/translation.json @@ -26,7 +26,9 @@ "deleteExerciseFull": "Cancella tutto l'esercizio", "exerciseNotTranslated": "Nessuna traduzione disponibile", "notEnoughRightsHeader": "Non puoi contribuire agli esercizi", - "notEnoughRights": "Puoi contribuire agli esercizi solo se il tuo account è più vecchio di {{days}} giorni e hai verificato il tuo indirizzo mail", + "notEnoughRights_one": "Puoi contribuire agli esercizi solo se il tuo account è più vecchio di {{count}} giorno e hai verificato il tuo indirizzo mail", + "notEnoughRights_many": "Puoi contribuire agli esercizi solo se il tuo account è più vecchio di {{count}} giorni e hai verificato il tuo indirizzo mail", + "notEnoughRights_other": "Puoi contribuire agli esercizi solo se il tuo account è più vecchio di {{count}} giorni e hai verificato il tuo indirizzo mail", "alternativeNames": "Nomi alternativi", "changeExerciseLanguage": "Modifica la lingua dell'esercizio", "filterVariations": "Inserisci il nome dell'esercizio per filtrare le varianti", @@ -203,10 +205,14 @@ "forms": { "valueTooLong": "Il valore è troppo lungo", "fieldRequired": "Questo campo è richiesto", - "minLength": "Per favore inserisci più di {{chars}} caratteri", + "minLength_one": "Per favore inserisci più di {{count}} carattere", + "minLength_many": "Per favore inserisci più di {{count}} caratteri", + "minLength_other": "Per favore inserisci più di {{count}} caratteri", "supportedImageFormats": "Sono supportati solo file JPEG, PNG, WEBP e AVIF al di sotto dei 20Mb", "valueTooShort": "Il valore è troppo corto", - "maxLength": "Per favore inserisci meno di {{chars}} caratteri", + "maxLength_one": "Per favore inserisci meno di {{count}} carattere", + "maxLength_many": "Per favore inserisci meno di {{count}} caratteri", + "maxLength_other": "Per favore inserisci meno di {{count}} caratteri", "maxValue": "Il valore di questo campo deve essere minore di {{value}}", "minValue": "Il valore di questo campo deve essere maggiore di {{value}}", "enterNumber": "Inserisci un numero valido", @@ -290,8 +296,12 @@ "workoutNr": "Allenamento Nr. {{number}}", "weekNr": "Settimana {{number}}", "backToRoutine": "Torna al programma", - "minLengthRoutine": "Il programma deve durare almeno {{number}} settimane", - "maxLengthRoutine": "Il programma può durare massimo {{number}} settimane", + "minLengthRoutine_one": "Il programma deve durare almeno {{count}} settimana", + "minLengthRoutine_many": "Il programma deve durare almeno {{count}} settimane", + "minLengthRoutine_other": "Il programma deve durare almeno {{count}} settimane", + "maxLengthRoutine_one": "Il programma può durare massimo {{count}} settimana", + "maxLengthRoutine_many": "Il programma può durare massimo {{count}} settimane", + "maxLengthRoutine_other": "Il programma può durare massimo {{count}} settimane", "addSuperset": "Aggiungi serie combinata", "addExercise": "Aggiungi esercizio", "exerciseNr": "Esercizio {{number}}", @@ -360,8 +370,12 @@ }, "min": "Min", "max": "Max", - "durationWeeks": "{{number}} settimane", - "durationWeeksDays": "{{nrWeeks}} settimane, {{nrDays}} giorni", + "durationWeeks_one": "{{count}} settimana", + "durationWeeks_many": "{{count}} settimane", + "durationWeeks_other": "{{count}} settimane", + "durationDays_one": "{{count}} giorno", + "durationDays_many": "{{count}} giorni", + "durationDays_other": "{{count}} giorni", "undo": "Annulla", "successfullyDeleted": "Eliminato con successo", "private": "Privato", diff --git a/public/locales/ko/translation.json b/public/locales/ko/translation.json index 426ca0bae..323b620dd 100644 --- a/public/locales/ko/translation.json +++ b/public/locales/ko/translation.json @@ -27,7 +27,7 @@ "contributeExercise": "운동에 기여하다", "step1HeaderBasics": "영어를 기본으로", "variations": "변형", - "notEnoughRights": "계정이 {{days}}일 이상 경과하고 이메일을 인증한 경우에만 운동에 참여할 수 있습니다", + "notEnoughRights_other": "계정이 {{count}}일 이상 경과하고 이메일을 인증한 경우에만 운동에 참여할 수 있습니다", "notEnoughRightsHeader": "운동에 기여할 수 없습니다", "identicalExercisePleaseDiscard": "추가하려는 운동과 동일한 운동이 있는 경우, 초안을 삭제하고 대신 해당 운동을 편집하세요.", "newNote": "새 메모", @@ -52,10 +52,10 @@ }, "forms": { "valueTooLong": "값이 너무 깁니다", - "minLength": "{{chars}}자 이상을 입력하세요", + "minLength_other": "{{count}}자 이상을 입력하세요", "endBeforeStart": "종료 값은 시작 값보다 앞서 있을 수 없습니다", "enterNumber": "유효한 숫자를 입력하세요", - "maxLength": "{{chars}}자 이하로 입력해 주세요", + "maxLength_other": "{{count}}자 이하로 입력해 주세요", "fieldRequired": "필수 입력항목입니다", "valueTooShort": "값이 너무 짧습니다", "supportedImageFormats": "20Mb 이하의 JPEG, PNG, WEBP 및 AVIF 파일만 지원됩니다", @@ -163,7 +163,7 @@ "downloadPdfTable": "PDF 다운로드(표)", "templates": "템플릿", "volume": "볼륨", - "minLengthRoutine": "루틴은 최소 {{number}}주 동안 지속되어야 합니다", + "minLengthRoutine_other": "루틴은 최소 {{count}}주 동안 지속되어야 합니다", "copyAndUseTemplate": "템플릿 복사 및 사용", "simpleMode": "단순 모드", "restTime": "휴식 시간", @@ -174,7 +174,7 @@ "template": "템플릿", "backToRoutine": "루틴으로 돌아가기", "exerciseHasProgression": "이 연습에는 진행 규칙이 있으므로 여기서는 편집할 수 없습니다. 편집하려면 버튼을 클릭하세요.", - "maxLengthRoutine": "루틴은 최대 {{number}}주 동안 지속될 수 있습니다", + "maxLengthRoutine_other": "루틴은 최대 {{count}}주 동안 지속될 수 있습니다", "publicTemplates": "공용 템플릿", "fitDaysInWeek": "일주일에 맞는 요일", "addExercise": "운동 추가", @@ -294,7 +294,7 @@ "language": "언어", "success": "성공!", "English": "영어", - "durationWeeksDays": "{{nrWeeks}} 주, {{nrDays}} 일", + "durationDays_other": "{{count}} 일", "videos": "비디오", "undo": "실행취소", "noResultsDescription": "이 쿼리에 대한 결과가 없습니다. 필터 수를 줄이는 것이 좋습니다.", @@ -317,7 +317,7 @@ "preferences": "환경설정", "name": "이름", "category": "카테고리", - "durationWeeks": "{{number}} 주", + "durationWeeks_other": "{{count}} 주", "cancel": "취소", "cannotBeUndone": "이 작업은 실행 취소할 수 없습니다.", "min": "최소", diff --git a/public/locales/mk/translation.json b/public/locales/mk/translation.json index 74d65be9d..92feaa0b5 100644 --- a/public/locales/mk/translation.json +++ b/public/locales/mk/translation.json @@ -97,7 +97,8 @@ "equipment": "Опрема", "submitExercise": "Испрати вежба", "notEnoughRightsHeader": "Не можете да придонесите за вежбите", - "notEnoughRights": "Можете да придонесувате во вежбите само ако вашиот акаунт е по стар од {{days}} и има верифицирана емаил адреса", + "notEnoughRights_one": "Можете да придонесувате во вежбите само ако вашиот акаунт е по стар од {{count}} и има верифицирана емаил адреса", + "notEnoughRights_other": "Можете да придонесувате во вежбите само ако вашиот акаунт е по стар од {{count}} и има верифицирана емаил адреса", "exerciseNotTranslatedBody": "Оваа вежба моментално не е достапна во моменталиот избран јазик. Дали би сакал да придонесиш со превод?", "alsoKnownAs": "Иста така познато како:", "primaryMuscles": "Главни мускули" @@ -129,8 +130,10 @@ "forms": { "enterInteger": "Ве молиме внесете целосен број" }, - "durationWeeks": "{{number}} недели", - "durationWeeksDays": "{{nrWeeks}} недели, {{nrDays}} денови", + "durationWeeks_one": "{{count}} недела", + "durationWeeks_other": "{{count}} недели", + "durationDays_one": "{{count}} ден", + "durationDays_other": "{{count}} денови", "videos": "Видеа", "undo": "Назад", "successfullyDeleted": "Успешно избришано", diff --git a/public/locales/nl/translation.json b/public/locales/nl/translation.json index 580db4a3e..cd33dd4ca 100644 --- a/public/locales/nl/translation.json +++ b/public/locales/nl/translation.json @@ -44,7 +44,8 @@ "variations": "Variaties", "notEnoughRightsHeader": "Je kunt geen oefeningen toevoegen", "muscles": "Spieren", - "notEnoughRights": "Je kunt alleen oefeningen bijdragen als je account ouder is dan {{days}} dagen en je, je e-mail hebt geverifieerd", + "notEnoughRights_one": "Je kunt alleen oefeningen bijdragen als je account ouder is dan {{count}} dag en je, je e-mail hebt geverifieerd", + "notEnoughRights_other": "Je kunt alleen oefeningen bijdragen als je account ouder is dan {{count}} dagen en je, je e-mail hebt geverifieerd", "replacements": "Alternatieven", "replacementsInfoText": "Optioneel kun je ook een oefening selecteren die deze oefening moet vervangen (b.v. omdat deze twee keer is ingestuurd, of iets dergelijks). Dit zal de oefening vervangen in routines en trainingslogs, in plaats van deze gewoon te verwijderen. Deze wijzigingen worden ook doorgevoerd in elke instantie die de oefeningen van deze instantie synchroniseert.", "secondaryMuscles": "Secundaire spieren", @@ -170,8 +171,10 @@ "valueTooShort": "De waarde is te kort", "valueTooLong": "De waarde is te lang", "fieldRequired": "Dit veld is vereist", - "maxLength": "Voer minder dan {{chars}} tekens in", - "minLength": "Voer meer dan {{chars}} tekens in", + "maxLength_one": "Voer minder dan {{count}} teken in", + "maxLength_other": "Voer minder dan {{count}} tekens in", + "minLength_one": "Voer meer dan {{count}} teken in", + "minLength_other": "Voer meer dan {{count}} tekens in", "minValue": "De waarde voor dit veld moet hoger zijn dan {{value}}", "maxValue": "De waarde voor dit veld moet kleiner zijn dan {{value}}", "enterNumber": "Voer een geldig nummer in", @@ -210,8 +213,10 @@ "workoutNr": "Workout Nr. {{number}}", "weekNr": "Week {{number}}", "backToRoutine": "Terug naar routine", - "minLengthRoutine": "De routine moet minimaal {{number}} weken duren", - "maxLengthRoutine": "De routine kan maximaal {{number}} weken duren", + "minLengthRoutine_one": "De routine moet minimaal {{count}} week duren", + "minLengthRoutine_other": "De routine moet minimaal {{count}} weken duren", + "maxLengthRoutine_one": "De routine kan maximaal {{count}} week duren", + "maxLengthRoutine_other": "De routine kan maximaal {{count}} weken duren", "resultingRoutine": "Resulterende routine", "deleteDayConfirmation": "Hierdoor worden alle sets, oefeningen en progressieregels verwijderd", "routineHasNoDays": "De routine heeft geen dagen", @@ -353,8 +358,10 @@ }, "min": "Min", "max": "Max", - "durationWeeks": "{{number}} weken", - "durationWeeksDays": "{{nrWeeks}} weken, {{nrDays}} dagen", + "durationWeeks_one": "{{count}} week", + "durationWeeks_other": "{{count}} weken", + "durationDays_one": "{{count}} dag", + "durationDays_other": "{{count}} dagen", "undo": "Ongedaan maken", "successfullyDeleted": "Succesvol verwijderd", "trophies": { diff --git a/public/locales/pl/translation.json b/public/locales/pl/translation.json index 67a9be632..eb885a135 100644 --- a/public/locales/pl/translation.json +++ b/public/locales/pl/translation.json @@ -37,7 +37,9 @@ "alternativeNames": "Alternatywne nazwy", "successfullyUpdated": "Ćwiczenie zostało pomyślnie zaktualizowane. Ze względu na buforowanie może minąć trochę czasu zanim zmiany będą widoczne w całej aplikacji.", "exerciseNotTranslatedBody": "To ćwiczenie nie jest obecnie dostępne w aktualnie wybranym języku. Chcesz pomóc w tłumaczeniu?", - "notEnoughRights": "Możesz dodawać ćwiczenia tylko wtedy, gdy Twoje konto jest starsze niż {{days}} dni i zweryfikowałeś swój adres e-mail", + "notEnoughRights_one": "Możesz dodawać ćwiczenia tylko wtedy, gdy Twoje konto jest starsze niż {{count}} dzień i zweryfikowałeś swój adres e-mail", + "notEnoughRights_few": "Możesz dodawać ćwiczenia tylko wtedy, gdy Twoje konto jest starsze niż {{count}} dni i zweryfikowałeś swój adres e-mail", + "notEnoughRights_many": "Możesz dodawać ćwiczenia tylko wtedy, gdy Twoje konto jest starsze niż {{count}} dni i zweryfikowałeś swój adres e-mail", "translateExerciseNow": "Przetłumacz to ćwiczenie", "deleteExerciseBody": "Czy chcesz usunąć ćwiczenie „{{name}}”? Możesz usunąć bieżące tłumaczenie {{language}} lub całe ćwiczenie ze wszystkimi tłumaczeniami, obrazami itp.", "deleteExerciseFull": "Usuń całe ćwiczenie", @@ -120,8 +122,12 @@ "valueTooLong": "Wartość jest za długa", "supportedImageFormats": "Obsługiwane są tylko pliki JPEG, PNG, WEBP i AVIF poniżej 20 MB", "valueTooShort": "Wartość jest za krótka", - "minLength": "Wprowadź więcej niż {{chars}} znaków", - "maxLength": "Wprowadź mniej niż {{chars}} znaków", + "minLength_one": "Wprowadź więcej niż {{count}} znak", + "minLength_few": "Wprowadź więcej niż {{count}} znaki", + "minLength_many": "Wprowadź więcej niż {{count}} znaków", + "maxLength_one": "Wprowadź mniej niż {{count}} znak", + "maxLength_few": "Wprowadź mniej niż {{count}} znaki", + "maxLength_many": "Wprowadź mniej niż {{count}} znaków", "maxValue": "Wartość w tym polu nie może być mniejsza niż {{value}}", "minValue": "Wartość w tym polu nie może być większa niż {{value}}", "enterNumber": "Proszę wprowadzić poprawny numer", @@ -251,7 +257,12 @@ "lastMonth": "Ostatni miesiąc", "lastWeek": "Ostatni tydzień", "comment": "Komentarz", - "durationWeeksDays": "{{nrWeeks}} tygodni, {{nrDays}} dni", + "durationWeeks_one": "{{count}} tydzień", + "durationWeeks_few": "{{count}} tygodnie", + "durationWeeks_many": "{{count}} tygodni", + "durationDays_one": "{{count}} dzień", + "durationDays_few": "{{count}} dni", + "durationDays_many": "{{count}} dni", "undo": "Cofnij", "successfullyDeleted": "Usunięto", "editName": "Edytować {{name}}", diff --git a/public/locales/pt/translation.json b/public/locales/pt/translation.json index e35e97e9c..8caa1100f 100644 --- a/public/locales/pt/translation.json +++ b/public/locales/pt/translation.json @@ -61,7 +61,9 @@ "identicalExercise": "Evitar exercícios duplicados", "notesHelpText": "As notas são breves comentários sobre como realizar o exercício, tais como \"manter o corpo direito\"", "deleteExerciseBody": "Quer apagar o exercício \"{{nome}}\"? Pode apagar a tradução atual {{{língua}} ou o exercício completo com todas as traduções, imagens, etc.", - "notEnoughRights": "Você só pode contribuir com exercícios se sua conta tiver mais de {{days}} dias e tiver verificado seu e-mail", + "notEnoughRights_one": "Você só pode contribuir com exercícios se sua conta tiver mais de {{count}} dia e tiver verificado seu e-mail", + "notEnoughRights_many": "Você só pode contribuir com exercícios se sua conta tiver mais de {{count}} dias e tiver verificado seu e-mail", + "notEnoughRights_other": "Você só pode contribuir com exercícios se sua conta tiver mais de {{count}} dias e tiver verificado seu e-mail", "whatVariationsExist": "Que variações deste exercício existem, se é que existem?", "filterVariations": "Introduzir o nome do exercício para filtrar variações", "identicalExercisePleaseDiscard": "Se notar um exercício que seja idêntico ao que está a acrescentar, por favor descarte o seu rascunho e em vez disso edite esse exercício.", @@ -107,8 +109,12 @@ "valueTooShort": "O valor é muito curto", "valueTooLong": "O valor é muito longo", "minValue": "O valor para esse campo deve ser maior que {{value}}", - "maxLength": "Por favor, entre com menos de {{chars}} caracteres", - "minLength": "Por favor, use mais que {{chars}} caracteres", + "maxLength_one": "Por favor, entre com menos de {{count}} caractere", + "maxLength_many": "Por favor, entre com menos de {{count}} caracteres", + "maxLength_other": "Por favor, entre com menos de {{count}} caracteres", + "minLength_one": "Por favor, use mais que {{count}} caractere", + "minLength_many": "Por favor, use mais que {{count}} caracteres", + "minLength_other": "Por favor, use mais que {{count}} caracteres", "maxValue": "O valor para esse campo deve ser menor que {{value}}", "enterNumber": "Favor inserir um número válido", "enterInteger": "Favor inserir um número inteiro", @@ -188,8 +194,12 @@ "iteration": "Iteração", "workoutNr": "Treino n.º {{number}}", "weekNr": "Semana {{number}}", - "minLengthRoutine": "A rotina tem de ser, pelo menos, de {{number}} semanas", - "maxLengthRoutine": "A rotina pode ser, no máximo, de {{number}} semanas", + "minLengthRoutine_one": "A rotina tem de ser, pelo menos, de {{count}} semana", + "minLengthRoutine_many": "A rotina tem de ser, pelo menos, de {{count}} semanas", + "minLengthRoutine_other": "A rotina tem de ser, pelo menos, de {{count}} semanas", + "maxLengthRoutine_one": "A rotina pode ser, no máximo, de {{count}} semana", + "maxLengthRoutine_many": "A rotina pode ser, no máximo, de {{count}} semanas", + "maxLengthRoutine_other": "A rotina pode ser, no máximo, de {{count}} semanas", "resultingRoutine": "Rotina resultante", "deleteDayConfirmation": "Isto removerá todas as regras de séries, exercícios e progressões", "routineHasNoDays": "A rotina não tem dias", @@ -382,8 +392,12 @@ "end": "Fim", "min": "Min", "max": "Máximo", - "durationWeeks": "{{number}} semanas", - "durationWeeksDays": "{{nrWeeks}} semanas, {{nrDays}} dias", + "durationWeeks_one": "{{count}} semana", + "durationWeeks_many": "{{count}} semanas", + "durationWeeks_other": "{{count}} semanas", + "durationDays_one": "{{count}} dia", + "durationDays_many": "{{count}} dias", + "durationDays_other": "{{count}} dias", "dashboard": { "customizeDashboard": "Personalize o painel de controle", "dragWidgetsHelp": "Arraste os widgets para reposicioná-los ou redimensioná-los usando o canto inferior direito.", diff --git a/public/locales/pt_BR/translation.json b/public/locales/pt_BR/translation.json index c444c836c..8862e83ff 100644 --- a/public/locales/pt_BR/translation.json +++ b/public/locales/pt_BR/translation.json @@ -20,8 +20,12 @@ "restTime": "Tempo de descanso", "workoutNr": "Treino Nr. {{number}}", "backToRoutine": "Voltar para a rotina", - "minLengthRoutine": "A rotina precisa durar pelo menos {{number}} semanas", - "maxLengthRoutine": "A rotina pode durar no máximo {{number}} semanas", + "minLengthRoutine_one": "A rotina precisa durar pelo menos {{count}} semana", + "minLengthRoutine_many": "A rotina precisa durar pelo menos {{count}} semanas", + "minLengthRoutine_other": "A rotina precisa durar pelo menos {{count}} semanas", + "maxLengthRoutine_one": "A rotina pode durar no máximo {{count}} semana", + "maxLengthRoutine_many": "A rotina pode durar no máximo {{count}} semanas", + "maxLengthRoutine_other": "A rotina pode durar no máximo {{count}} semanas", "resultingRoutine": "Rotina resultante", "deleteDayConfirmation": "Isso removerá todas as séries, exercícios e regras de progressão", "routineHasNoDays": "A rotina não tem dias", @@ -145,9 +149,13 @@ "legs": "Pernas" }, "forms": { - "maxLength": "Insira menos de {{chars}} caracteres", + "maxLength_one": "Insira menos de {{count}} caractere", + "maxLength_many": "Insira menos de {{count}} caracteres", + "maxLength_other": "Insira menos de {{count}} caracteres", "minValue": "O valor desse campo deve ser maior que {{value}}", - "minLength": "Insira mais de {{chars}} caracteres", + "minLength_one": "Insira mais de {{count}} caractere", + "minLength_many": "Insira mais de {{count}} caracteres", + "minLength_other": "Insira mais de {{count}} caracteres", "maxValue": "O valor desse campo deve ser menor que {{value}}", "valueTooShort": "O valor é muito pequeno", "supportedImageFormats": "Apenas são suportados arquivos JPEG, PNG, WEBP e AVIF com menos de 20Mb", @@ -181,11 +189,11 @@ "reactive": "Reativo", "balanced": "Balanciado" }, - "chartAverageWindowDays_one": "1 dia", + "chartAverageWindowDays_one": "{{count}} dia", "chartAverageWindowDays_other": "{{count}} dias", "distributionMedian": "Mediana", "distributionLatest": "Recente", - "distributionDayCount_one": "1 dia", + "distributionDayCount_one": "{{count}} dia", "distributionDayCount_other": "{{count}} dias", "noGroup": "Sem grupo", "metricTypes": { @@ -213,7 +221,9 @@ "language": "Linguagem", "noResultsDescription": "Não foram encontrados resultados para essa consulta, considere a possibilidade de reduzir o número de filtros.", "exercises": { - "notEnoughRights": "Você só pode contribuir com exercícios se sua conta tiver mais de {{days}} dias e seu e-mail tiver sido verificado", + "notEnoughRights_one": "Você só pode contribuir com exercícios se sua conta tiver mais de {{count}} dia e seu e-mail tiver sido verificado", + "notEnoughRights_many": "Você só pode contribuir com exercícios se sua conta tiver mais de {{count}} dias e seu e-mail tiver sido verificado", + "notEnoughRights_other": "Você só pode contribuir com exercícios se sua conta tiver mais de {{count}} dias e seu e-mail tiver sido verificado", "notEnoughRightsHeader": "Você não pode contribuir com exercícios", "translateExerciseNow": "Traduza este exercício agora", "alternativeNames": "Nomes alternativos", @@ -394,8 +404,12 @@ "undo": "Desfazer", "public": "Público", "private": "Privado", - "durationWeeks": "{{number}} semanas", - "durationWeeksDays": "{{nrWeeks}} semanas, {{nrDays}} dias", + "durationWeeks_one": "{{count}} semana", + "durationWeeks_many": "{{count}} semanas", + "durationWeeks_other": "{{count}} semanas", + "durationDays_one": "{{count}} dia", + "durationDays_many": "{{count}} dias", + "durationDays_other": "{{count}} dias", "start": "Iniciar", "end": "Fim", "dashboard": { diff --git a/public/locales/pt_PT/translation.json b/public/locales/pt_PT/translation.json index 59192b130..9530774e3 100644 --- a/public/locales/pt_PT/translation.json +++ b/public/locales/pt_PT/translation.json @@ -54,7 +54,9 @@ "step1HeaderBasics": "Conceitos básicos em inglês", "variations": "Variações", "notEnoughRightsHeader": "Não podes contribuir com exercícios", - "notEnoughRights": "Só podes contribuir com exercícios se a tua conta tiver mais de {{days}} dias e o email estiver verificado", + "notEnoughRights_one": "Só podes contribuir com exercícios se a tua conta tiver mais de {{count}} dia e o email estiver verificado", + "notEnoughRights_many": "Só podes contribuir com exercícios se a tua conta tiver mais de {{count}} dias e o email estiver verificado", + "notEnoughRights_other": "Só podes contribuir com exercícios se a tua conta tiver mais de {{count}} dias e o email estiver verificado", "muscles": "Músculos", "secondaryMuscles": "Músculos secundários", "whatVariationsExist": "Que variações deste exercício existem, se houver?", @@ -188,8 +190,12 @@ "valueTooShort": "O valor é muito curto", "valueTooLong": "O valor é muito longo", "fieldRequired": "Campo obrigatório", - "maxLength": "Insere menos de {{chars}} caracteres", - "minLength": "Insere mais de {{chars}} caracteres", + "maxLength_one": "Insere menos de {{count}} caractere", + "maxLength_many": "Insere menos de {{count}} caracteres", + "maxLength_other": "Insere menos de {{count}} caracteres", + "minLength_one": "Insere mais de {{count}} caractere", + "minLength_many": "Insere mais de {{count}} caracteres", + "minLength_other": "Insere mais de {{count}} caracteres", "minValue": "O valor tem de ser maior que {{value}}", "maxValue": "O valor tem de ser menor que {{value}}", "maxLessThanMin": "O valor máximo tem de ser maior que o mínimo", @@ -202,8 +208,12 @@ "save": "Guardar", "min": "Mín", "max": "Máx", - "durationWeeks": "{{number}} semanas", - "durationWeeksDays": "{{nrWeeks}} semanas, {{nrDays}} dias", + "durationWeeks_one": "{{count}} semana", + "durationWeeks_many": "{{count}} semanas", + "durationWeeks_other": "{{count}} semanas", + "durationDays_one": "{{count}} dia", + "durationDays_many": "{{count}} dias", + "durationDays_other": "{{count}} dias", "videos": "Vídeos", "undo": "Desfazer", "successfullyDeleted": "Eliminado com sucesso", @@ -224,8 +234,12 @@ "workoutNr": "Treino nº {{number}}", "weekNr": "Semana {{number}}", "backToRoutine": "Voltar à rotina", - "minLengthRoutine": "A rotina tem de ter pelo menos {{number}} semanas", - "maxLengthRoutine": "A rotina pode ter no máximo {{number}} semanas", + "minLengthRoutine_one": "A rotina tem de ter pelo menos {{count}} semana", + "minLengthRoutine_many": "A rotina tem de ter pelo menos {{count}} semanas", + "minLengthRoutine_other": "A rotina tem de ter pelo menos {{count}} semanas", + "maxLengthRoutine_one": "A rotina pode ter no máximo {{count}} semana", + "maxLengthRoutine_many": "A rotina pode ter no máximo {{count}} semanas", + "maxLengthRoutine_other": "A rotina pode ter no máximo {{count}} semanas", "resultingRoutine": "Rotina resultante", "addDay": "Adicionar dia de treino", "deleteDayConfirmation": "Isto vai apagar todas as séries, exercícios e regras de progressão", diff --git a/public/locales/ro/translation.json b/public/locales/ro/translation.json index 9026547c3..f9dc9c038 100644 --- a/public/locales/ro/translation.json +++ b/public/locales/ro/translation.json @@ -67,7 +67,9 @@ "step1HeaderBasics": "Informații de bază în engleză", "variations": "Variații", "notEnoughRightsHeader": "Nu poți contribui cu exerciții", - "notEnoughRights": "Poți contribui cu exerciții doar dacă contul tău este mai vechi de {{days}} zile și ți-ai verificat adresa de email", + "notEnoughRights_one": "Poți contribui cu exerciții doar dacă contul tău este mai vechi de {{count}} zi și ți-ai verificat adresa de email", + "notEnoughRights_few": "Poți contribui cu exerciții doar dacă contul tău este mai vechi de {{count}} zile și ți-ai verificat adresa de email", + "notEnoughRights_other": "Poți contribui cu exerciții doar dacă contul tău este mai vechi de {{count}} de zile și ți-ai verificat adresa de email", "muscles": "Mușchi", "secondaryMuscles": "Mușchi secundari", "whatVariationsExist": "Ce variații ale acestui exercițiu există, dacă e cazul?", @@ -189,8 +191,12 @@ "enterNumber": "Te rugăm să introduci un număr valid", "enterInteger": "Te rugăm să introduci un număr întreg", "fieldRequired": "Acest câmp este obligatoriu", - "maxLength": "Te rugăm să introduci mai puțin de {{chars}} caractere", - "minLength": "Te rugăm să introduci mai mult de {{chars}} caractere", + "maxLength_one": "Te rugăm să introduci mai puțin de {{count}} caracter", + "maxLength_few": "Te rugăm să introduci mai puțin de {{count}} caractere", + "maxLength_other": "Te rugăm să introduci mai puțin de {{count}} de caractere", + "minLength_one": "Te rugăm să introduci mai mult de {{count}} caracter", + "minLength_few": "Te rugăm să introduci mai mult de {{count}} caractere", + "minLength_other": "Te rugăm să introduci mai mult de {{count}} de caractere", "minValue": "Valoarea acestui câmp trebuie să fie mai mare de {{value}}", "maxValue": "Valoarea acestui câmp trebuie să fie mai mică de {{value}}", "maxLessThanMin": "Valoarea maximă trebuie să fie mai mare decât valoarea minimă", @@ -203,8 +209,12 @@ "save": "Salvează", "min": "Min", "max": "Max", - "durationWeeks": "{{number}} săptămâni", - "durationWeeksDays": "{{nrWeeks}} săptămâni, {{nrDays}} zile", + "durationWeeks_one": "{{count}} săptămână", + "durationWeeks_few": "{{count}} săptămâni", + "durationWeeks_other": "{{count}} de săptămâni", + "durationDays_one": "{{count}} zi", + "durationDays_few": "{{count}} zile", + "durationDays_other": "{{count}} de zile", "videos": "Videoclipuri", "undo": "Anulează", "successfullyDeleted": "Șters cu succes", @@ -225,8 +235,12 @@ "workoutNr": "Antrenamentul Nr. {{number}}", "weekNr": "Săptămâna {{number}}", "backToRoutine": "Înapoi la rutină", - "minLengthRoutine": "Rutina trebuie să dureze cel puțin {{number}} săptămâni", - "maxLengthRoutine": "Rutina poate dura cel mult {{number}} săptămâni", + "minLengthRoutine_one": "Rutina trebuie să dureze cel puțin {{count}} săptămână", + "minLengthRoutine_few": "Rutina trebuie să dureze cel puțin {{count}} săptămâni", + "minLengthRoutine_other": "Rutina trebuie să dureze cel puțin {{count}} de săptămâni", + "maxLengthRoutine_one": "Rutina poate dura cel mult {{count}} săptămână", + "maxLengthRoutine_few": "Rutina poate dura cel mult {{count}} săptămâni", + "maxLengthRoutine_other": "Rutina poate dura cel mult {{count}} de săptămâni", "resultingRoutine": "Rutina rezultată", "addDay": "Adaugă zi de antrenament", "deleteDayConfirmation": "Asta va elimina toate seriile, exercițiile și regulile de progresie", diff --git a/public/locales/ru/translation.json b/public/locales/ru/translation.json index 1d7ecdb1c..765693224 100644 --- a/public/locales/ru/translation.json +++ b/public/locales/ru/translation.json @@ -31,7 +31,9 @@ "step1HeaderBasics": "Основы (на английском)", "notEnoughRightsHeader": "Вы не можете добавлять упражнения", "variations": "Варианты", - "notEnoughRights": "Вы можете добавлять упражнения только если ваш аккаунт старше {{days}} дней и вы подтвердили свою электронную почту", + "notEnoughRights_one": "Вы можете добавлять упражнения только если ваш аккаунт старше {{count}} дня и вы подтвердили свою электронную почту", + "notEnoughRights_few": "Вы можете добавлять упражнения только если ваш аккаунт старше {{count}} дней и вы подтвердили свою электронную почту", + "notEnoughRights_many": "Вы можете добавлять упражнения только если ваш аккаунт старше {{count}} дней и вы подтвердили свою электронную почту", "whatVariationsExist": "Какие существуют вариации этого упражнения, если таковые имеются?", "identicalExercise": "Избегайте дублирования упражнений", "compatibleImagesCC": "Изображения должны быть совместимы с лицензией CC BY SA. Если вы сомневаетесь, загрузите только фотографии, которые вы сделали сами.", @@ -145,8 +147,12 @@ "videos": "Видео", "min": "Минимум", "max": "Максимум", - "durationWeeks": "{{number}} недели", - "durationWeeksDays": "{{nrWeeks}} недели, {{nrDays}} дней", + "durationWeeks_one": "{{count}} неделя", + "durationWeeks_few": "{{count}} недели", + "durationWeeks_many": "{{count}} недель", + "durationDays_one": "{{count}} день", + "durationDays_few": "{{count}} дня", + "durationDays_many": "{{count}} дней", "undo": "Отменить", "successfullyDeleted": "Успешно удалено", "cannotBeUndone": "Это действие нельзя отменить.", diff --git a/public/locales/sk/translation.json b/public/locales/sk/translation.json index a916f01d9..8d79733c2 100644 --- a/public/locales/sk/translation.json +++ b/public/locales/sk/translation.json @@ -79,7 +79,9 @@ "step1HeaderBasics": "Základy v angličtine", "variations": "Variácie", "notEnoughRightsHeader": "Nemôžete pridávať cviky", - "notEnoughRights": "Cviky môžete pridávať iba ak je váš účet starší ako {{days}} dní a máte overený svoj e-mail", + "notEnoughRights_one": "Cviky môžete pridávať iba ak je váš účet starší ako {{count}} deň a máte overený svoj e-mail", + "notEnoughRights_few": "Cviky môžete pridávať iba ak je váš účet starší ako {{count}} dni a máte overený svoj e-mail", + "notEnoughRights_other": "Cviky môžete pridávať iba ak je váš účet starší ako {{count}} dní a máte overený svoj e-mail", "muscles": "Svaly", "secondaryMuscles": "Sekundárne svaly", "whatVariationsExist": "Aké variácie tohto cvičenia existujú, ak nejaké sú?", @@ -208,8 +210,12 @@ "enterNumber": "Zadajte platné číslo", "enterInteger": "Zadajte celé číslo", "fieldRequired": "Toto pole je povinné", - "maxLength": "Zadajte menej ako {{chars}} znakov", - "minLength": "Zadajte viac ako {{chars}} znakov", + "maxLength_one": "Zadajte menej ako {{count}} znak", + "maxLength_few": "Zadajte menej ako {{count}} znaky", + "maxLength_other": "Zadajte menej ako {{count}} znakov", + "minLength_one": "Zadajte viac ako {{count}} znak", + "minLength_few": "Zadajte viac ako {{count}} znaky", + "minLength_other": "Zadajte viac ako {{count}} znakov", "minValue": "Hodnota tohto poľa musí byť väčšia ako {{value}}", "maxValue": "Hodnota tohto poľa musí byť menšia ako {{value}}", "maxLessThanMin": "Maximálna hodnota musí byť väčšia ako minimálna", @@ -222,8 +228,12 @@ "save": "Uložiť", "min": "Min", "max": "Max", - "durationWeeks": "{{number}} týždňov", - "durationWeeksDays": "{{nrWeeks}} týždňov, {{nrDays}} dní", + "durationWeeks_one": "{{count}} týždeň", + "durationWeeks_few": "{{count}} týždne", + "durationWeeks_other": "{{count}} týždňov", + "durationDays_one": "{{count}} deň", + "durationDays_few": "{{count}} dni", + "durationDays_other": "{{count}} dní", "videos": "Videá", "undo": "Späť", "successfullyDeleted": "Úspešne odstránené", @@ -249,6 +259,7 @@ "retry": "Skúsiť znova", "empty": "Pre tieto filtre a metriku nie sú k dispozícii žiadne dáta. Skúste inú metriku alebo dlhšie časové obdobie.", "skipped_one": "{{count}} záznam má chýbajúce hodnoty alebo nekompatibilné jednotky pre túto metriku a nie je zobrazený.", + "skipped_few": "{{count}} záznamy majú chýbajúce hodnoty alebo nekompatibilné jednotky pre túto metriku a nie sú zobrazené.", "skipped_other": "{{count}} záznamov má chýbajúce hodnoty alebo nekompatibilné jednotky pre túto metriku a nie sú zobrazené." }, "sets": "Série", @@ -264,8 +275,12 @@ "weekNr": "Týždeň {{number}}", "iterationNr": "Iterácia {{number}}", "backToRoutine": "Späť k rutine", - "minLengthRoutine": "Rutina musí trvať minimálne {{number}} týždňov", - "maxLengthRoutine": "Rutina môže trvať maximálne {{number}} týždňov", + "minLengthRoutine_one": "Rutina musí trvať minimálne {{count}} týždeň", + "minLengthRoutine_few": "Rutina musí trvať minimálne {{count}} týždne", + "minLengthRoutine_other": "Rutina musí trvať minimálne {{count}} týždňov", + "maxLengthRoutine_one": "Rutina môže trvať maximálne {{count}} týždeň", + "maxLengthRoutine_few": "Rutina môže trvať maximálne {{count}} týždne", + "maxLengthRoutine_other": "Rutina môže trvať maximálne {{count}} týždňov", "resultingRoutine": "Výsledná rutina", "addDay": "Pridať tréningový deň", "deleteDayConfirmation": "Týmto sa odstránia všetky série, cvičenia a pravidlá postupu", @@ -388,13 +403,16 @@ "sluggish": "Plynulá" }, "chartAverageWindow": "Priemer za", - "chartAverageWindowDays_one": "1 deň", + "chartAverageWindowDays_one": "{{count}} deň", + "chartAverageWindowDays_few": "{{count}} dni", "chartAverageWindowDays_other": "{{count}} dní", "distributionMedian": "Medián", "distributionLatest": "Najnovšie", - "distributionEntryCount_one": "1 záznam", + "distributionEntryCount_one": "{{count}} záznam", + "distributionEntryCount_few": "{{count}} záznamy", "distributionEntryCount_other": "{{count}} záznamov", - "distributionDayCount_one": "1 deň", + "distributionDayCount_one": "{{count}} deň", + "distributionDayCount_few": "{{count}} dni", "distributionDayCount_other": "{{count}} dní", "partOfGroup": "Súčasť skupiny", "noGroup": "Žiadna skupina", @@ -426,12 +444,13 @@ "noDataAvailable": "Žiadne dáta k dispozícii", "overallChangeWeight": "Celková zmena", "chartRangeAll": "Všetko", - "chartRangeMonths_one": "1 mesiac", + "chartRangeMonths_one": "{{count}} mesiac", "chartRangeMonths_few": "{{count}} mesiace", "chartRangeMonths_other": "{{count}} mesiacov", - "chartRangeWeeks_one": "1 týždeň", + "chartRangeWeeks_one": "{{count}} týždeň", + "chartRangeWeeks_few": "{{count}} týždne", "chartRangeWeeks_other": "{{count}} týždňov", - "chartRangeYears_one": "1 rok", + "chartRangeYears_one": "{{count}} rok", "chartRangeYears_few": "{{count}} roky", "chartRangeYears_other": "{{count}} rokov", "customMeasurement": "Vlastné meranie", diff --git a/public/locales/sl/translation.json b/public/locales/sl/translation.json index f4cf8fe71..db126f8d3 100644 --- a/public/locales/sl/translation.json +++ b/public/locales/sl/translation.json @@ -54,7 +54,10 @@ "step1HeaderBasics": "Osnove v angleščini", "variations": "Različice", "notEnoughRightsHeader": "Ne morete prispevati vaj", - "notEnoughRights": "Vaje lahko prispevate le, če je vaš račun starejši od {{days}} dni in ste potrdili svoj epoštni naslov", + "notEnoughRights_one": "Vaje lahko prispevate le, če je vaš račun starejši od {{count}} dneva in ste potrdili svoj epoštni naslov", + "notEnoughRights_two": "Vaje lahko prispevate le, če je vaš račun starejši od {{count}} dni in ste potrdili svoj epoštni naslov", + "notEnoughRights_few": "Vaje lahko prispevate le, če je vaš račun starejši od {{count}} dni in ste potrdili svoj epoštni naslov", + "notEnoughRights_other": "Vaje lahko prispevate le, če je vaš račun starejši od {{count}} dni in ste potrdili svoj epoštni naslov", "muscles": "Mišice", "secondaryMuscles": "Sekundarne mišice", "whatVariationsExist": "Katere različice te vaje obstajajo, če sploh?", @@ -188,8 +191,14 @@ "valueTooShort": "Vrednost je prekratka", "valueTooLong": "Vrednost je predolga", "fieldRequired": "To polje je obvezno", - "maxLength": "Vnesite manj kot {{chars}} znakov", - "minLength": "Vnesite več kot {{chars}} znakov", + "maxLength_one": "Vnesite manj kot {{count}} znak", + "maxLength_two": "Vnesite manj kot {{count}} znaka", + "maxLength_few": "Vnesite manj kot {{count}} znake", + "maxLength_other": "Vnesite manj kot {{count}} znakov", + "minLength_one": "Vnesite več kot {{count}} znak", + "minLength_two": "Vnesite več kot {{count}} znaka", + "minLength_few": "Vnesite več kot {{count}} znake", + "minLength_other": "Vnesite več kot {{count}} znakov", "minValue": "Vrednost za to polje mora biti višja od {{value}}", "maxValue": "Vrednost za to polje mora biti manjša od {{value}}", "maxLessThanMin": "Največja vrednost mora biti večja od najmanjše", @@ -202,8 +211,14 @@ "save": "Shrani", "min": "Min.", "max": "Maks.", - "durationWeeks": "{{number}} tednov", - "durationWeeksDays": "{{nrWeeks}} tednov, {{nrDays}} dni", + "durationWeeks_one": "{{count}} teden", + "durationWeeks_two": "{{count}} tedna", + "durationWeeks_few": "{{count}} tedni", + "durationWeeks_other": "{{count}} tednov", + "durationDays_one": "{{count}} dan", + "durationDays_two": "{{count}} dneva", + "durationDays_few": "{{count}} dnevi", + "durationDays_other": "{{count}} dni", "videos": "Videoposnetki", "undo": "Razveljavi", "successfullyDeleted": "Uspešno izbrisano", @@ -224,8 +239,14 @@ "workoutNr": "{{number}}. trening", "weekNr": "{{number}}. teden", "backToRoutine": "Nazaj k rutini", - "minLengthRoutine": "Rutina mora trajati vsaj {{number}} tednov", - "maxLengthRoutine": "Rutina lahko traja največ {{number}} tednov", + "minLengthRoutine_one": "Rutina mora trajati vsaj {{count}} teden", + "minLengthRoutine_two": "Rutina mora trajati vsaj {{count}} tedna", + "minLengthRoutine_few": "Rutina mora trajati vsaj {{count}} tedne", + "minLengthRoutine_other": "Rutina mora trajati vsaj {{count}} tednov", + "maxLengthRoutine_one": "Rutina lahko traja največ {{count}} teden", + "maxLengthRoutine_two": "Rutina lahko traja največ {{count}} tedna", + "maxLengthRoutine_few": "Rutina lahko traja največ {{count}} tedne", + "maxLengthRoutine_other": "Rutina lahko traja največ {{count}} tednov", "resultingRoutine": "Končna rutina", "addDay": "Dodaj dan treninga", "deleteDayConfirmation": "S tem boste odstranili vse nize, vaje in pravila napredovanja", diff --git a/public/locales/sr/translation.json b/public/locales/sr/translation.json index d76afa044..d0a0a6c7d 100644 --- a/public/locales/sr/translation.json +++ b/public/locales/sr/translation.json @@ -11,7 +11,9 @@ "step1HeaderBasics": "Основе на енглеском", "variations": "Варијације", "notEnoughRightsHeader": "Не можете допринети вежбом", - "notEnoughRights": "Можете допринети вежбом само ако је ваш налог старији од {{days}} дана и имате верификовану е-мејл адресу", + "notEnoughRights_one": "Можете допринети вежбом само ако је ваш налог старији од {{count}} дана и имате верификовану е-мејл адресу", + "notEnoughRights_few": "Можете допринети вежбом само ако је ваш налог старији од {{count}} дана и имате верификовану е-мејл адресу", + "notEnoughRights_other": "Можете допринети вежбом само ако је ваш налог старији од {{count}} дана и имате верификовану е-мејл адресу", "muscles": "Мишићи", "secondaryMuscles": "Секундарни мишићи", "whatVariationsExist": "Које варијације ове вежбе постоје, ако их има?", @@ -95,8 +97,12 @@ "supportedImageFormats": "Подржани су само JPEG, PNG, WEBP и AVIF фајлови испод 20Mb", "valueTooShort": "Вредност је сувише кратка", "fieldRequired": "Ово је обавезно поље", - "maxLength": "Молимо унесите манје од {{chars}} карактера", - "minLength": "Молимо унесите барем {{chars}} карактера", + "maxLength_one": "Молимо унесите манје од {{count}} карактера", + "maxLength_few": "Молимо унесите манје од {{count}} карактера", + "maxLength_other": "Молимо унесите манје од {{count}} карактера", + "minLength_one": "Молимо унесите барем {{count}} карактер", + "minLength_few": "Молимо унесите барем {{count}} карактера", + "minLength_other": "Молимо унесите барем {{count}} карактера", "maxValue": "Вредност за ово поље мора бити мања од {{value}}", "minValue": "Вредност за ово поље мора бити већа од {{value}}" }, diff --git a/public/locales/sv/translation.json b/public/locales/sv/translation.json index e8ec7ba33..16c0af073 100644 --- a/public/locales/sv/translation.json +++ b/public/locales/sv/translation.json @@ -48,7 +48,8 @@ "variations": "Varianter", "notEnoughRightsHeader": "Du kan inte lägga till övningar", "replacementsSearch": "Sök efter en övning eller klistra in ett känt ID i fältet och klicka på knappen \"Hämta\".", - "notEnoughRights": "Du kan bara lägga till övningar om ditt konto är äldre än {{days}} dagar och du har verifierat din e-postadress", + "notEnoughRights_one": "Du kan bara lägga till övningar om ditt konto är äldre än {{count}} dag och du har verifierat din e-postadress", + "notEnoughRights_other": "Du kan bara lägga till övningar om ditt konto är äldre än {{count}} dagar och du har verifierat din e-postadress", "muscles": "Muskler", "whatVariationsExist": "Vilka varianter av den här övningen finns det?", "identicalExercise": "Undvik dubbletter av övningar", @@ -111,8 +112,10 @@ "valueTooShort": "Värdet är för kort", "valueTooLong": "Värdet är för långt", "fieldRequired": "Detta fält är obligatoriskt", - "maxLength": "Ange färre än {{chars}} tecken", - "minLength": "Ange fler än {{chars}} tecken", + "maxLength_one": "Ange färre än {{count}} tecken", + "maxLength_other": "Ange färre än {{count}} tecken", + "minLength_one": "Ange fler än {{count}} tecken", + "minLength_other": "Ange fler än {{count}} tecken", "minValue": "Värdet för detta fält måste överstiga {{value}}", "maxValue": "Värdet för detta fält måste vara mindre än {{value}}", "enterNumber": "Ange ett giltigt tal", @@ -181,8 +184,10 @@ "workoutNr": "Träningspass nr {{number}}", "iterationNr": "Omgång {{number}}", "backToRoutine": "Tillbaka till programmet", - "minLengthRoutine": "Programmet måste vara minst {{number}} veckor långt", - "maxLengthRoutine": "Programmet får vara högst {{number}} veckor långt", + "minLengthRoutine_one": "Programmet måste vara minst {{count}} vecka långt", + "minLengthRoutine_other": "Programmet måste vara minst {{count}} veckor långt", + "maxLengthRoutine_one": "Programmet får vara högst {{count}} vecka långt", + "maxLengthRoutine_other": "Programmet får vara högst {{count}} veckor långt", "resultingRoutine": "Resulterande program", "deleteDayConfirmation": "Detta tar bort alla set, övningar och progressionsregler", "routineHasNoDays": "Programmet har inga dagar", @@ -335,8 +340,10 @@ "calculator": "BMI-kalkylator", "obese": "Fetma" }, - "durationWeeks": "{{number}} veckor", - "durationWeeksDays": "{{nrWeeks}} veckor, {{nrDays}} dagar", + "durationWeeks_one": "{{count}} vecka", + "durationWeeks_other": "{{count}} veckor", + "durationDays_one": "{{count}} dag", + "durationDays_other": "{{count}} dagar", "downloadAsPdf": "Ladda ned som PDF", "comment": "Kommentar", "dashboard": { @@ -390,13 +397,13 @@ "sluggish": "Utjämnad" }, "chartAverageWindow": "Medelvärde över", - "chartAverageWindowDays_one": "1 dag", + "chartAverageWindowDays_one": "{{count}} dag", "chartAverageWindowDays_other": "{{count}} dagar", "distributionMedian": "Median", "distributionLatest": "Senaste värdet", - "distributionEntryCount_one": "1 registrering", + "distributionEntryCount_one": "{{count}} registrering", "distributionEntryCount_other": "{{count}} registreringar", - "distributionDayCount_one": "1 dag", + "distributionDayCount_one": "{{count}} dag", "distributionDayCount_other": "{{count}} dagar", "partOfGroup": "Ingår i grupp", "noGroup": "Ingen grupp", @@ -428,11 +435,11 @@ "noDataAvailable": "Inga data tillgängliga", "overallChangeWeight": "Total förändring", "chartRangeAll": "Alla", - "chartRangeMonths_one": "1 månad", + "chartRangeMonths_one": "{{count}} månad", "chartRangeMonths_other": "{{count}} månader", - "chartRangeWeeks_one": "1 vecka", + "chartRangeWeeks_one": "{{count}} vecka", "chartRangeWeeks_other": "{{count}} veckor", - "chartRangeYears_one": "1 år", + "chartRangeYears_one": "{{count}} år", "chartRangeYears_other": "{{count}} år", "customMeasurement": "Egen mätning", "metricAlreadyTracked": "Registreras redan", diff --git a/public/locales/ta/translation.json b/public/locales/ta/translation.json index aeb416b48..d937059d3 100644 --- a/public/locales/ta/translation.json +++ b/public/locales/ta/translation.json @@ -15,7 +15,8 @@ "replacementsSearch": "ஒரு உடற்பயிற்சியைத் தேடுங்கள் அல்லது அறியப்பட்ட ஐடியை புலத்தில் நகலெடுத்து ஒட்டவும், \"சுமை\" பொத்தானைக் சொடுக்கு செய்யவும்.", "noReplacementSelected": " மாற்றுவதற்கு எந்த உடற்பயிற்சியும் தேர்ந்தெடுக்கப்படவில்லை", "notEnoughRightsHeader": "நீங்கள் பயிற்சிகளை பங்களிக்க முடியாது", - "notEnoughRights": "உங்கள் கணக்கு {{days}} நாட்களை விட பழையதாக இருந்தால் மட்டுமே நீங்கள் பயிற்சிகளை பங்களிக்க முடியும், மேலும் உங்கள் மின்னஞ்சலை சரிபார்த்துள்ளீர்கள்", + "notEnoughRights_one": "உங்கள் கணக்கு {{count}} நாட்களை விட பழையதாக இருந்தால் மட்டுமே நீங்கள் பயிற்சிகளை பங்களிக்க முடியும், மேலும் உங்கள் மின்னஞ்சலை சரிபார்த்துள்ளீர்கள்", + "notEnoughRights_other": "உங்கள் கணக்கு {{count}} நாட்களை விட பழையதாக இருந்தால் மட்டுமே நீங்கள் பயிற்சிகளை பங்களிக்க முடியும், மேலும் உங்கள் மின்னஞ்சலை சரிபார்த்துள்ளீர்கள்", "muscles": "தசைகள்", "secondaryMuscles": "இரண்டாம் நிலை தசைகள்", "whatVariationsExist": "இந்த பயிற்சியின் எந்த மாறுபாடுகள் உள்ளன, ஏதேனும் இருந்தால்?", @@ -115,8 +116,10 @@ }, "description": "விவரம்", "forms": { - "maxLength": "தயவுசெய்து {{chars}} எழுத்துக்களை விட குறைவாக உள்ளிடவும்", - "minLength": "தயவுசெய்து {{chars}} எழுத்துக்களை விட அதிகமாக உள்ளிடவும்", + "maxLength_one": "தயவுசெய்து {{count}} எழுத்துக்களை விட குறைவாக உள்ளிடவும்", + "maxLength_other": "தயவுசெய்து {{count}} எழுத்துக்களை விட குறைவாக உள்ளிடவும்", + "minLength_one": "தயவுசெய்து {{count}} எழுத்துக்களை விட அதிகமாக உள்ளிடவும்", + "minLength_other": "தயவுசெய்து {{count}} எழுத்துக்களை விட அதிகமாக உள்ளிடவும்", "supportedImageFormats": "20MB க்குக் கீழே உள்ள JPEG, PNG, WEBP மற்றும் AVIF கோப்புகள் மட்டுமே ஆதரிக்கப்படுகின்றன", "valueTooShort": "மதிப்பு மிகக் குறைவு", "minValue": "இந்த புலத்திற்கான மதிப்பு {{value}} ஐ விட அதிகமாக இருக்க வேண்டும்", @@ -181,8 +184,10 @@ "workoutNr": "ஒர்க்அவுட் என்.ஆர். {{number}}", "weekNr": "வாரம் {{number}}", "backToRoutine": "வழக்கத்திற்கு திரும்பவும்", - "minLengthRoutine": "வழக்கம் குறைந்தது {{number}} வாரங்கள் நீளமாக இருக்க வேண்டும்", - "maxLengthRoutine": "வழக்கம் அதிகபட்சம் {{number}} வாரங்கள் நீளமாக இருக்கலாம்", + "minLengthRoutine_one": "வழக்கம் குறைந்தது {{count}} வாரங்கள் நீளமாக இருக்க வேண்டும்", + "minLengthRoutine_other": "வழக்கம் குறைந்தது {{count}} வாரங்கள் நீளமாக இருக்க வேண்டும்", + "maxLengthRoutine_one": "வழக்கம் அதிகபட்சம் {{count}} வாரங்கள் நீளமாக இருக்கலாம்", + "maxLengthRoutine_other": "வழக்கம் அதிகபட்சம் {{count}} வாரங்கள் நீளமாக இருக்கலாம்", "resultingRoutine": "இதன் விளைவாக வழக்கமான", "deleteDayConfirmation": "இது அனைத்து செட், பயிற்சிகள் மற்றும் முன்னேற்ற விதிகளை அகற்றும்", "fitDaysInWeekHelpText": "பல வாரங்களில் உங்கள் வழக்கமான நாட்கள் எவ்வாறு திட்டமிடப்பட்டுள்ளன என்பதை இந்த அமைப்பு கட்டுப்படுத்துகிறது. இயக்கப்பட்டால், வாரங்கள் வாராந்திர சுழற்சியில் மீண்டும் நிகழும். எடுத்துக்காட்டாக, திங்கள், அறிவன் மற்றும் வெள்ளிக்கிழமைகளில் உடற்பயிற்சிகளுடன் ஒரு வழக்கம் அடுத்த திங்கள், அறிவன் மற்றும் வெள்ளிக்கிழமைகளில் இந்த முறையைத் தொடரும். முடக்கப்பட்டால், ஒரு புதிய வாரத்தின் தொடக்கத்தைப் பொருட்படுத்தாமல் நாட்கள் தொடர்ச்சியாக பின்பற்றப்படும். கடுமையான வாராந்திர அட்டவணையைப் பின்பற்றாத நடைமுறைகளுக்கு இது பயனுள்ளதாக இருக்கும்.", @@ -324,9 +329,11 @@ "start": "தொடங்கு", "end": "முடிவு", "comment": "கருத்து", - "durationWeeks": "{{number}} வாரங்கள்", + "durationWeeks_one": "{{count}} வாரம்", + "durationWeeks_other": "{{count}} வாரங்கள்", "undo": "செயல்தவிர்", - "durationWeeksDays": "{{nrWeeks}} வாரங்கள், {{nrDays}} நாட்கள்", + "durationDays_one": "{{count}} நாள்", + "durationDays_other": "{{count}} நாட்கள்", "successfullyDeleted": "வெற்றிகரமாக நீக்கப்பட்டது", "core": { "customize": "தனிப்பயனாக்கு" diff --git a/public/locales/tr/translation.json b/public/locales/tr/translation.json index 15147d7fe..d4bc75e64 100644 --- a/public/locales/tr/translation.json +++ b/public/locales/tr/translation.json @@ -30,7 +30,8 @@ "exerciseNotTranslatedBody": "Seçtiğiniz egzersiz şu anda dilinde mevcut değil. Çeviriye katkıda bulunmak ister misiniz?", "changeExerciseLanguage": "Egzersizin dilini değiştir", "exerciseNotTranslated": "Çeviri mevcut değil", - "notEnoughRights": "Yalnızca hesabınız {{days}} günden eskiyse ve e-posta adresinizi doğruladıysanız egzersizlere katkıda bulunabilirsiniz", + "notEnoughRights_one": "Yalnızca hesabınız {{count}} günden eskiyse ve e-posta adresinizi doğruladıysanız egzersizlere katkıda bulunabilirsiniz", + "notEnoughRights_other": "Yalnızca hesabınız {{count}} günden eskiyse ve e-posta adresinizi doğruladıysanız egzersizlere katkıda bulunabilirsiniz", "description": "Açıklama", "notEnoughRightsHeader": "Egzersizlere katkıda bulunamazsın", "translateExerciseNow": "Bu egzersizi şimdi çevir", @@ -129,8 +130,10 @@ "valueTooShort": "Değer çok kısa", "valueTooLong": "Değer çok uzun", "fieldRequired": "Bu alan gereklidir", - "maxLength": "Lütfen {{chars}} karakterden daha az girin", - "minLength": "Lütfen {{chars}} karakterden daha fazla girin", + "maxLength_one": "Lütfen {{count}} karakterden daha az girin", + "maxLength_other": "Lütfen {{count}} karakterden daha az girin", + "minLength_one": "Lütfen {{count}} karakterden daha fazla girin", + "minLength_other": "Lütfen {{count}} karakterden daha fazla girin", "minValue": "Bu alanın değeri {{value}} değerinden fazla olmalıdır", "maxValue": "Bu alanın değeri {{value}} değerinden az olmalıdır", "enterNumber": "Lütfen geçerli bir sayı girin", @@ -248,8 +251,10 @@ "restTime": "Dinlenme süresi", "workoutNr": "Egzersiz No. {{number}}", "weekNr": "{{number}}. hafta", - "minLengthRoutine": "Program en az {{number}} hafta sürmelidir", - "maxLengthRoutine": "Bu program en fazla {{number}} hafta sürebilir", + "minLengthRoutine_one": "Program en az {{count}} hafta sürmelidir", + "minLengthRoutine_other": "Program en az {{count}} hafta sürmelidir", + "maxLengthRoutine_one": "Bu program en fazla {{count}} hafta sürebilir", + "maxLengthRoutine_other": "Bu program en fazla {{count}} hafta sürebilir", "resultingRoutine": "Ortaya çıkan rutin", "deleteDayConfirmation": "Bu işlem tüm setleri, egzersizleri ve ilerleme kurallarını silecektir", "routineHasNoDays": "Bu programın belirli günleri yoktur", @@ -380,8 +385,10 @@ "public": "Herkese açık", "min": "Minimum", "max": "Maksimum", - "durationWeeks": "{{number}} hafta", - "durationWeeksDays": "{{nrWeeks}} hafta, {{nrDays}} gün", + "durationWeeks_one": "{{count}} hafta", + "durationWeeks_other": "{{count}} hafta", + "durationDays_one": "{{count}} gün", + "durationDays_other": "{{count}} gün", "undo": "Geri al", "successfullyDeleted": "Silme işlemi başarıyla gerçekleştirildi", "calendar": "Takvim", diff --git a/public/locales/uk/translation.json b/public/locales/uk/translation.json index c9e66f2f4..b254a55f8 100644 --- a/public/locales/uk/translation.json +++ b/public/locales/uk/translation.json @@ -28,7 +28,9 @@ "newNote": "Нова нотатка", "notesHelpText": "Нотатки - це короткі коментарі щодо виконання вправи. Наприклад: \"тримати корпус рівно\"", "notEnoughRightsHeader": "Ви не маєте права пропонувати нові вправи", - "notEnoughRights": "Щоб рекомендувати вправу, ваш обліковий запис має бути створений понад {{days}} днів тому та підтверджена електронна пошта", + "notEnoughRights_one": "Щоб рекомендувати вправу, ваш обліковий запис має бути створений понад {{count}} день тому та підтверджена електронна пошта", + "notEnoughRights_few": "Щоб рекомендувати вправу, ваш обліковий запис має бути створений понад {{count}} дні тому та підтверджена електронна пошта", + "notEnoughRights_many": "Щоб рекомендувати вправу, ваш обліковий запис має бути створений понад {{count}} днів тому та підтверджена електронна пошта", "compatibleImagesCC": "Зображення мають відповідати ліцензії CC BY-SA. Якщо є сумніви, завантажуйте лише власні фотографії.", "alternativeNames": "Альтернативні назви", "submitExercise": "Надіслати вправу", @@ -132,8 +134,12 @@ "valueTooLong": "Значення задовге", "fieldRequired": "Це поле є обов'язковим", "maxValue": "Значення для цього поля має бути меншим за {{value}}", - "maxLength": "Будь ласка, введіть менше {{chars}} символів", - "minLength": "Будь ласка, введіть більше {{chars}} символів", + "maxLength_one": "Будь ласка, введіть менше {{count}} символу", + "maxLength_few": "Будь ласка, введіть менше {{count}} символів", + "maxLength_many": "Будь ласка, введіть менше {{count}} символів", + "minLength_one": "Будь ласка, введіть більше {{count}} символу", + "minLength_few": "Будь ласка, введіть більше {{count}} символів", + "minLength_many": "Будь ласка, введіть більше {{count}} символів", "minValue": "Значення для цього поля має бути більшим за {{value}}", "endBeforeStart": "Кінцеве значення не може передувати початку", "enterNumber": "Введіть дійсне число", @@ -170,7 +176,9 @@ "daily": "Щодня", "workoutNr": "Тренування № {{number}}", "weekNr": "Тиждень {{number}}", - "maxLengthRoutine": "Програма тренувань щонайбільше {{number}} тижнів", + "maxLengthRoutine_one": "Програма тренувань щонайбільше {{count}} тиждень", + "maxLengthRoutine_few": "Програма тренувань щонайбільше {{count}} тижні", + "maxLengthRoutine_many": "Програма тренувань щонайбільше {{count}} тижнів", "deleteDayConfirmation": "Це видалить усі підходи, вправи та прогресію навантажень", "routineHasNoDays": "У програмі тренувань немає днів", "setHasNoExercises": "У цьому підході немає вправ", @@ -221,7 +229,9 @@ "weekly": "Щотижня", "restTime": "Відпочинок", "requirementsHelpText": "Виберіть результати тренування (з попередніх записів), які мають бути виконані, щоб це правило вступило в силу. Правила порівнюються із запланованими значеннями; варіанти «максимум діапазону» — зі запланованим максимумом. Для подвійної прогресії встановіть обмеження ваги на основі показника «Повторення (діапазон)» та вимагайте виконання всіх підходів.", - "minLengthRoutine": "Програма має тривати принаймні {{number}} тижнів", + "minLengthRoutine_one": "Програма має тривати принаймні {{count}} тиждень", + "minLengthRoutine_few": "Програма має тривати принаймні {{count}} тижні", + "minLengthRoutine_many": "Програма має тривати принаймні {{count}} тижнів", "confirmRestDayHelpText": "Будь ласка, зверніть увагу, що всі підходи та вправи буде вилучено, коли ви позначите день як вихідний.", "resultingRoutine": "Готова програма", "fitDaysInWeek": "Фіксований тижневий розклад", @@ -283,7 +293,8 @@ "retry": "Повторити", "empty": "Немає даних для цих фільтрів та показника. Спробуйте інший показник або довший період часу.", "skipped_one": "{{count}} запис має пропущені значення або несумісні одиниці вимірювання для цього показника й не відображається.", - "skipped_few": "{{count}} записи мають пропущені значення або несумісні одиниці вимірювання для цього показника й не відображаються." + "skipped_few": "{{count}} записи мають пропущені значення або несумісні одиниці вимірювання для цього показника й не відображаються.", + "skipped_many": "{{count}} записів мають пропущені значення або несумісні одиниці вимірювання для цього показника й не відображаються." }, "deleteSessionInfo": "Це видалить тренування, а також усі записані в ньому підходи" }, @@ -297,8 +308,10 @@ "unitFormHelpText": "Одиниця, в якій буде вимірюватися категорія, наприклад, см або %", "deleteInfo": "Це видалить категорію та всі її записи", "metricType": "Тип метрики", - "chartAverageWindowDays_one": "За останній день", - "distributionDayCount_one": "1 день", + "chartAverageWindowDays_one": "Середнє за {{count}} день", + "chartAverageWindowDays_few": "Середнє за {{count}} дні", + "distributionDayCount_one": "{{count}} день", + "distributionDayCount_few": "{{count}} дні", "calculations": { "paramsHelp": { "window_days": "Діапазон від {{min}} до {{max}}. Це період часу, який враховується для розрахунку найкращого показника.", @@ -350,7 +363,8 @@ "chartAverageWindowDays_many": "Середнє за {{count}} днів", "distributionMedian": "Медіана", "distributionLatest": "Останнє", - "distributionEntryCount_one": "1 запис", + "distributionEntryCount_one": "{{count}} запис", + "distributionEntryCount_few": "{{count}} записи", "distributionEntryCount_many": "{{count}} записів", "distributionDayCount_many": "{{count}} днів", "partOfGroup": "У складі групи", @@ -383,11 +397,14 @@ "noDataAvailable": "Немає даних", "overallChangeWeight": "Загальна зміна ваги", "chartRangeAll": "Весь період", - "chartRangeMonths_one": "За останній місяць", + "chartRangeMonths_one": "{{count}} місяць", + "chartRangeMonths_few": "{{count}} місяці", "chartRangeMonths_many": "{{count}} місяців", - "chartRangeWeeks_one": "За останній тиждень", + "chartRangeWeeks_one": "{{count}} тиждень", + "chartRangeWeeks_few": "{{count}} тижні", "chartRangeWeeks_many": "{{count}} тижнів", - "chartRangeYears_one": "За останній рік", + "chartRangeYears_one": "{{count}} рік", + "chartRangeYears_few": "{{count}} роки", "chartRangeYears_many": "{{count}} років", "customMeasurement": "Власне вимірювання", "metricAlreadyTracked": "Вже відстежується", @@ -498,10 +515,14 @@ "end": "Кінець", "min": "Мін", "max": "Макс", - "durationWeeks": "{{number}} тижнів", + "durationWeeks_one": "{{count}} тиждень", + "durationWeeks_few": "{{count}} тижні", + "durationWeeks_many": "{{count}} тижнів", "undo": "Скасувати", "successfullyDeleted": "Успішно вилучено", - "durationWeeksDays": "{{nrWeeks}} тижнів, {{nrDays}} днів", + "durationDays_one": "{{count}} день", + "durationDays_few": "{{count}} дні", + "durationDays_many": "{{count}} днів", "private": "Приватний", "public": "Публічний", "dashboard": { diff --git a/public/locales/vi/translation.json b/public/locales/vi/translation.json index f3ea33358..8a0e361b3 100644 --- a/public/locales/vi/translation.json +++ b/public/locales/vi/translation.json @@ -36,7 +36,7 @@ "basics": "Cơ bản bài tập", "equipment": "Thiết bị", "step1HeaderBasics": "Tên đơn giản trong tiếng Anh", - "notEnoughRights": "Bạn chỉ có thể đóng góp các bài tập nếu tài khoản của bạn tạo được nhiều hơn {{days}} ngày và đã xác nhận email", + "notEnoughRights_other": "Bạn chỉ có thể đóng góp các bài tập nếu tài khoản của bạn tạo được nhiều hơn {{count}} ngày và đã xác nhận email", "successfullyUpdated": "Bài tập đã được cập nhật. Bởi vì cache nên sẽ mất chút thời gian để thay đổi được cập nhật trên ứng dụng.", "exerciseNotTranslated": "Không có dịch", "replacements": "Các bài tập thay thế", diff --git a/public/locales/zh_Hans/translation.json b/public/locales/zh_Hans/translation.json index d2a9cabf2..f9b8b963b 100644 --- a/public/locales/zh_Hans/translation.json +++ b/public/locales/zh_Hans/translation.json @@ -48,7 +48,7 @@ "deleteTranslation": "删除翻译", "deleteExerciseFull": "删除整个训练", "changeExerciseLanguage": "更改此训练的语言", - "notEnoughRights": "只有当您的帐户已超过 {days} 天并且已验证您的电子邮件时,您才可以贡献训练", + "notEnoughRights_other": "只有当您的帐户已超过 {{count}} 天并且已验证您的电子邮件时,您才可以贡献训练", "identicalExercisePleaseDiscard": "如果你注意到已有训练跟你要添加的练习相同,请丢弃草稿并编辑该训练。", "compatibleImagesCC": "影像必须与 CC BY SA 授权相容。如有疑问,请仅上传你自己拍摄的照片。", "replacementsInfoText": "你也可以选择一个训练取替这个训练(例如,因为它被提交了两次,或类似情况)。这将取代日常训练和训练日志中的训练,而不仅仅是删除它。这些变更还将传播到同步此训练的任何实例。", @@ -192,8 +192,8 @@ "valueTooShort": "此项过短", "valueTooLong": "此项过长", "fieldRequired": "此项必填", - "maxLength": "请勿超过{{chars}}字", - "minLength": "请勿少于{{chars}}字", + "maxLength_other": "请勿超过{{count}}字", + "minLength_other": "请勿少于{{count}}字", "maxValue": "此项必须小于{{value}}", "minValue": "此项必须大于{{value}}", "enterInteger": "请输入全数字", @@ -217,8 +217,8 @@ "daily": "日", "weekNr": "周 {{number}}", "backToRoutine": "返回 routine", - "minLengthRoutine": "此计划至少需要持续 {{number}} 周", - "maxLengthRoutine": "此计划最多持续 {{number}} 周", + "minLengthRoutine_other": "此计划至少需要持续 {{count}} 周", + "maxLengthRoutine_other": "此计划最多持续 {{count}} 周", "deleteDayConfirmation": "这将移除所有训练计划、训练内容与训练进度信息", "routineHasNoDays": "此计划不包含任何日期", "setHasNoExercises": "此计划没有任何练习", @@ -338,8 +338,8 @@ "comment": "评论", "min": "分钟", "max": "最大", - "durationWeeks": "{{number}} 周", - "durationWeeksDays": "{{nrWeeks}} 周, {{nrDays}} 天", + "durationWeeks_other": "{{count}} 周", + "durationDays_other": "{{count}} 天", "undo": "撤销", "successfullyDeleted": "成功删除", "end": "结束", diff --git a/public/locales/zh_Hant/translation.json b/public/locales/zh_Hant/translation.json index 43fae24f0..1f4b092fd 100644 --- a/public/locales/zh_Hant/translation.json +++ b/public/locales/zh_Hant/translation.json @@ -43,7 +43,7 @@ "replacementsInfoText": "你也可以選擇一個訓練取替這個訓練(例如,因為它被提交了兩次,或類似情況)。這將取代日常訓練和訓練日誌中的訓練,而不僅僅是刪除它。這些變更還將傳播到同步此訓練的任何實例。", "contributeExercise": "貢獻一個訓練", "variations": "變體", - "notEnoughRights": "只有當您的帳戶已超過 {days} 天並且已驗證您的電子郵件時,您才可以貢獻訓練", + "notEnoughRights_other": "只有當您的帳戶已超過 {{count}} 天並且已驗證您的電子郵件時,您才可以貢獻訓練", "notEnoughRightsHeader": "你不能貢獻訓練", "muscles": "肌肉", "secondaryMuscles": "輔助肌", @@ -144,8 +144,8 @@ "name": "名稱", "forms": { "fieldRequired": "此欄位是必需的", - "maxLength": "請輸入少於 {{chars}} 個字元", - "minLength": "請輸入多於 {{chars}} 個字元", + "maxLength_other": "請輸入少於 {{count}} 個字元", + "minLength_other": "請輸入多於 {{count}} 個字元", "minValue": "該欄位的值必須高於 {{value}}", "valueTooLong": "數值過長", "valueTooShort": "數值過短", @@ -202,8 +202,8 @@ "workoutNr": "第 {{number}} 次訓練", "weekNr": "第 {{number}} 週", "backToRoutine": "返回訓練計畫", - "minLengthRoutine": "訓練計畫至少需持續 {{number}} 週", - "maxLengthRoutine": "訓練計畫最多只能持續 {{number}} 週", + "minLengthRoutine_other": "訓練計畫至少需持續 {{count}} 週", + "maxLengthRoutine_other": "訓練計畫最多只能持續 {{count}} 週", "resultingRoutine": "產生的訓練計畫", "deleteDayConfirmation": "這會移除所有組數、動作與漸進規則。", "routineHasNoDays": "此訓練計畫尚未設定任何訓練日", @@ -337,8 +337,8 @@ "dragWidgetsHelp": "拖曳即可移動小工具,拖拉右下角可縮放大小。", "resetLayout": "重設為預設佈局" }, - "durationWeeks": "{{number}} 週", - "durationWeeksDays": "{{nrWeeks}} 週, {{nrDays}} 天", + "durationWeeks_other": "{{count}} 週", + "durationDays_other": "{{count}} 天", "undo": "復原", "preview": "預覽", "useMarkdownHint": "您可以使用基本的 Markdown 來格式化文字:*斜體*、**粗體**、-清單", diff --git a/src/components/Exercises/forms/yupValidators.ts b/src/components/Exercises/forms/yupValidators.ts index fd696aab7..1c4b9d1c9 100644 --- a/src/components/Exercises/forms/yupValidators.ts +++ b/src/components/Exercises/forms/yupValidators.ts @@ -12,8 +12,8 @@ const MIN_NOTE_LENGTH = 15; export const nameValidator = () => yup .string() - .min(MIN_CHAR_NAME, i18n.t("forms.minLength", { 'chars': MIN_CHAR_NAME })) - .max(MAX_CHAR_NAME, i18n.t("forms.maxLength", { 'chars': MAX_CHAR_NAME })) + .min(MIN_CHAR_NAME, i18n.t("forms.minLength", { count: MIN_CHAR_NAME })) + .max(MAX_CHAR_NAME, i18n.t("forms.maxLength", { count: MAX_CHAR_NAME })) .required(i18n.t("forms.fieldRequired")); export const alternativeNameValidator = () => yup @@ -24,8 +24,8 @@ export const alternativeNameValidator = () => yup yup.object({ id: yup.number().nullable(), alias: yup.string() - .min(MIN_CHAR_NAME, i18n.t("forms.minLength", { 'chars': MIN_CHAR_NAME })) - .max(MAX_CHAR_NAME, i18n.t("forms.maxLength", { 'chars': MAX_CHAR_NAME })) + .min(MIN_CHAR_NAME, i18n.t("forms.minLength", { count: MIN_CHAR_NAME })) + .max(MAX_CHAR_NAME, i18n.t("forms.maxLength", { count: MAX_CHAR_NAME })) .required() }) ); @@ -42,12 +42,12 @@ export const descriptionValidator = (unchanged?: string) => yup .required(i18n.t("forms.fieldRequired")) .test( 'minLength', - i18n.t("forms.minLength", { 'chars': MIN_DESC_LENGTH }), + i18n.t("forms.minLength", { count: MIN_DESC_LENGTH }), value => value === unchanged || (value ?? '').length >= MIN_DESC_LENGTH ) .test( 'minWords', - i18n.t("forms.minWords", { 'words': MIN_DESC_WORDS }), + i18n.t("forms.minWords", { count: MIN_DESC_WORDS }), value => value === unchanged || countWords(value ?? '') >= MIN_DESC_WORDS ); @@ -58,7 +58,7 @@ export const noteValidator = () => yup .of( yup .string() - .min(MIN_NOTE_LENGTH, i18n.t("forms.minLength", { 'chars': MIN_NOTE_LENGTH })) + .min(MIN_NOTE_LENGTH, i18n.t("forms.minLength", { count: MIN_NOTE_LENGTH })) ); export const authorValidator = () => yup diff --git a/src/components/Exercises/screens/Add/NotEnoughRights.tsx b/src/components/Exercises/screens/Add/NotEnoughRights.tsx index bdca376df..890a6f65c 100644 --- a/src/components/Exercises/screens/Add/NotEnoughRights.tsx +++ b/src/components/Exercises/screens/Add/NotEnoughRights.tsx @@ -21,7 +21,8 @@ export const NotEnoughRights = () => { textAlign: "center", }} > - {t('exercises.notEnoughRights', { days: MIN_ACCOUNT_AGE })} + {t('exercises.notEnoughRights', { count: Number(MIN_ACCOUNT_AGE) })} {!contributeQuery.anonymous && !contributeQuery.emailVerified && diff --git a/src/components/Measurements/widgets/CategoryForm.tsx b/src/components/Measurements/widgets/CategoryForm.tsx index d4e8bf58f..98ba4d6da 100644 --- a/src/components/Measurements/widgets/CategoryForm.tsx +++ b/src/components/Measurements/widgets/CategoryForm.tsx @@ -77,14 +77,14 @@ export const CategoryForm = ({ category, closeFn }: CategoryFormProps) => { name: yup .string() .required(t('forms.fieldRequired')) - .max(100, t('forms.maxLength', { chars: '100' })), + .max(100, t('forms.maxLength', { count: 100 })), // Required only where the field is offered: a typed category takes // its unit from the metric type (a step count has none at all), and a // calculation defines what the number is, which may be a bare ratio unit: isCustom ? yup .string() - .max(30, t('forms.maxLength', { chars: '30' })) + .max(30, t('forms.maxLength', { count: 30 })) .when('calculation', { is: CALCULATION_NONE, then: schema => schema.required(t('forms.fieldRequired')), diff --git a/src/components/Measurements/widgets/EntryForm.tsx b/src/components/Measurements/widgets/EntryForm.tsx index 892cf97bc..6696c3c96 100644 --- a/src/components/Measurements/widgets/EntryForm.tsx +++ b/src/components/Measurements/widgets/EntryForm.tsx @@ -57,7 +57,7 @@ export const EntryForm = ({ entry, closeFn, category }: EntryFormProps) => { .required(t('forms.fieldRequired')), notes: yup .string() - .max(100, t('forms.maxLength', { value: '100' })), + .max(100, t('forms.maxLength', { count: 100 })), }); const initialDate = entry ? entry.date : new Date(); diff --git a/src/components/Nutrition/widgets/forms/MealForm.tsx b/src/components/Nutrition/widgets/forms/MealForm.tsx index 0783be243..894873a7b 100644 --- a/src/components/Nutrition/widgets/forms/MealForm.tsx +++ b/src/components/Nutrition/widgets/forms/MealForm.tsx @@ -32,8 +32,8 @@ export const MealForm = ({ meal, planId, closeFn }: MealFormProps) => { name: yup .string() .required() - .max(25, t('forms.maxLength', { chars: '25' })) - .min(3, t('forms.minLength', { chars: '3' })), + .max(25, t('forms.maxLength', { count: 25 })) + .min(3, t('forms.minLength', { count: 3 })), time: yup .date() .required() diff --git a/src/components/Nutrition/widgets/forms/PlanForm.tsx b/src/components/Nutrition/widgets/forms/PlanForm.tsx index d71c59c14..9c54da9ae 100644 --- a/src/components/Nutrition/widgets/forms/PlanForm.tsx +++ b/src/components/Nutrition/widgets/forms/PlanForm.tsx @@ -67,8 +67,8 @@ export const PlanForm = ({ plan, closeFn }: PlanFormProps) => { description: yup .string() .required() - .max(25, t('forms.maxLength', { chars: '25' })) - .min(3, t('forms.minLength', { chars: '3' })), + .max(25, t('forms.maxLength', { count: 25 })) + .min(3, t('forms.minLength', { count: 3 })), onlyLogging: yup .boolean(), goalEnergy: yup diff --git a/src/components/Routines/models/Routine.test.ts b/src/components/Routines/models/Routine.test.ts index 519727131..538d919ce 100644 --- a/src/components/Routines/models/Routine.test.ts +++ b/src/components/Routines/models/Routine.test.ts @@ -9,6 +9,7 @@ import { testMuscleRectusAbdominis } from "@/tests/exerciseTestdata"; import { testRoutine1, testRoutineDayData1 } from "@/tests/workoutRoutinesTestData"; +import i18n from "i18next"; import { DateTime } from "luxon"; describe('Routine model tests', () => { @@ -55,7 +56,7 @@ describe('Routine model tests', () => { // Assert expect(duration.days).toEqual(1); expect(duration.weeks).toEqual(0); - expect(durationText).toEqual('durationWeeksDays'); + expect(durationText).toEqual('durationWeeks, durationDays'); }); test('correctly calculates the routine duration - exactly one week', () => { @@ -85,7 +86,23 @@ describe('Routine model tests', () => { // Assert expect(duration.days).toEqual(2); expect(duration.weeks).toEqual(1); - expect(durationText).toEqual('durationWeeksDays'); + expect(durationText).toEqual('durationWeeks, durationDays'); + }); + + test('passes the numeric weeks and days as plural counts', () => { + // Arrange + routine.start = new Date('2025-01-01'); + routine.end = new Date('2025-01-16'); + const translate = vi.spyOn(i18n, 't'); + + // Act + const durationText = routine.durationText; + + // Assert + expect(durationText).toEqual('durationWeeks, durationDays'); + expect(translate).toHaveBeenCalledWith('durationWeeks', { count: 2 }); + expect(translate).toHaveBeenCalledWith('durationDays', { count: 1 }); + translate.mockRestore(); }); test('correctly returns all the trained muscles', () => { diff --git a/src/components/Routines/models/Routine.ts b/src/components/Routines/models/Routine.ts index d0b48d52b..08989b15b 100644 --- a/src/components/Routines/models/Routine.ts +++ b/src/components/Routines/models/Routine.ts @@ -135,10 +135,9 @@ export class Routine { const durationDays = this.duration.days; const durationWeeks = this.duration.weeks; - return durationDays === 0 ? i18n.t('durationWeeks', { number: durationWeeks }) : i18n.t('durationWeeksDays', { - nrWeeks: durationWeeks, - nrDays: durationDays - }); + const weeksText = i18n.t('durationWeeks', { count: durationWeeks }); + + return durationDays === 0 ? weeksText : `${weeksText}, ${i18n.t('durationDays', { count: durationDays })}`; } get mainMuscles() { diff --git a/src/components/Routines/screens/Detail/RoutineEdit.test.tsx b/src/components/Routines/screens/Detail/RoutineEdit.test.tsx index c60cae65f..5a2654b1e 100644 --- a/src/components/Routines/screens/Detail/RoutineEdit.test.tsx +++ b/src/components/Routines/screens/Detail/RoutineEdit.test.tsx @@ -44,7 +44,7 @@ describe("Smoke tests the RoutineEdit component", () => { }); expect(screen.getByText('editName')).toBeInTheDocument(); expect(screen.queryAllByText('Every day is leg day 🦵🏻')).toHaveLength(3); - expect(screen.getByText('durationWeeksDays')).toBeInTheDocument(); + expect(screen.getByText('durationWeeks, durationDays')).toBeInTheDocument(); expect(screen.queryAllByText('routines.restDay')).toHaveLength(4); expect(screen.queryAllByText('Pull day')).toHaveLength(3); expect(screen.queryAllByText('Full body routine')).toHaveLength(2); diff --git a/src/components/Routines/widgets/forms/DayForm.tsx b/src/components/Routines/widgets/forms/DayForm.tsx index 8f9fc4f88..0a5b17b5a 100644 --- a/src/components/Routines/widgets/forms/DayForm.tsx +++ b/src/components/Routines/widgets/forms/DayForm.tsx @@ -78,11 +78,11 @@ export const DayForm = (props: { const validationSchema = Yup.object().shape({ name: Yup.string() - .max(nameMaxLength, t('forms.maxLength', { chars: nameMaxLength })) - .min(nameMinLength, t('forms.minLength', { chars: nameMinLength })) + .max(nameMaxLength, t('forms.maxLength', { count: nameMaxLength })) + .min(nameMinLength, t('forms.minLength', { count: nameMinLength })) .required('Name is required'), description: Yup.string() - .max(descriptionMaxLength, t('forms.maxLength', { chars: descriptionMaxLength })), + .max(descriptionMaxLength, t('forms.maxLength', { count: descriptionMaxLength })), isRest: Yup.boolean(), needsLogsToAdvance: Yup.boolean(), type: Yup.string(), diff --git a/src/components/Routines/widgets/forms/RoutineForm.tsx b/src/components/Routines/widgets/forms/RoutineForm.tsx index 1d9e20581..8a5ea28ad 100644 --- a/src/components/Routines/widgets/forms/RoutineForm.tsx +++ b/src/components/Routines/widgets/forms/RoutineForm.tsx @@ -73,11 +73,11 @@ export const RoutineForm = ({ name: yup .string() .required() - .max(NAME_MAX_LENGTH, t('forms.maxLength', { chars: NAME_MAX_LENGTH })) - .min(NAME_MIN_LENGTH, t('forms.minLength', { chars: NAME_MIN_LENGTH })), + .max(NAME_MAX_LENGTH, t('forms.maxLength', { count: NAME_MAX_LENGTH })) + .min(NAME_MIN_LENGTH, t('forms.minLength', { count: NAME_MIN_LENGTH })), description: yup .string() - .max(DESCRIPTION_MAX_LENGTH, t('forms.maxLength', { chars: DESCRIPTION_MAX_LENGTH })), + .max(DESCRIPTION_MAX_LENGTH, t('forms.maxLength', { count: DESCRIPTION_MAX_LENGTH })), start: yup .date() .required(), @@ -90,7 +90,7 @@ export const RoutineForm = ({ ) .test( 'hasMinimumDuration', - t('routines.minLengthRoutine', { number: MIN_WORKOUT_DURATION }), + t('routines.minLengthRoutine', { count: MIN_WORKOUT_DURATION }), function (value) { const startDate = this.parent.start; if (startDate && value) { @@ -104,7 +104,7 @@ export const RoutineForm = ({ ) .test( 'hasMaximumDuration', - t('routines.maxLengthRoutine', { number: MAX_WORKOUT_DURATION }), + t('routines.maxLengthRoutine', { count: MAX_WORKOUT_DURATION }), function (value) { const startDate = this.parent.start; if (startDate && value) { @@ -236,10 +236,8 @@ export const RoutineForm = ({ textAlign: "center" }} > - {durationDays === 0 ? t('durationWeeks', { number: durationWeeks }) : t('durationWeeksDays', { - nrWeeks: durationWeeks, - nrDays: durationDays - })} + {t('durationWeeks', { count: durationWeeks })} + {durationDays > 0 && `, ${t('durationDays', { count: durationDays })}`} diff --git a/src/components/Routines/widgets/forms/SessionForm.tsx b/src/components/Routines/widgets/forms/SessionForm.tsx index 934864535..dd3794536 100644 --- a/src/components/Routines/widgets/forms/SessionForm.tsx +++ b/src/components/Routines/widgets/forms/SessionForm.tsx @@ -116,7 +116,7 @@ const SessionFormFields = ( const validationSchema = yup.object({ notes: yup .string() - .max(NOTES_MAX_LENGTH, t('forms.maxLength', { chars: NOTES_MAX_LENGTH })), + .max(NOTES_MAX_LENGTH, t('forms.maxLength', { count: NOTES_MAX_LENGTH })), date: yup .date() .required(), From fe412ad8db944075b6f947286ee46fa184c39e16 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Wed, 4 Nov 2026 20:54:37 +0100 Subject: [PATCH 19/30] Accept null event in snackbar close handlers --- src/components/Dashboard/NutritionCard.tsx | 2 +- src/components/Nutrition/widgets/MealDetailDropdown.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Dashboard/NutritionCard.tsx b/src/components/Dashboard/NutritionCard.tsx index 75653341f..42e39543c 100644 --- a/src/components/Dashboard/NutritionCard.tsx +++ b/src/components/Dashboard/NutritionCard.tsx @@ -114,7 +114,7 @@ const MealListItem = (props: { meal: Meal; planId: string }) => { const handleToggleExpand = () => setExpandView(!expandView); - const handleCloseSnackbar = (event?: React.SyntheticEvent | Event, reason?: string) => { + const handleCloseSnackbar = (event?: React.SyntheticEvent | Event | null, reason?: string) => { if (reason === "clickaway") { return; } diff --git a/src/components/Nutrition/widgets/MealDetailDropdown.tsx b/src/components/Nutrition/widgets/MealDetailDropdown.tsx index b3ae22dca..3c65eea1c 100644 --- a/src/components/Nutrition/widgets/MealDetailDropdown.tsx +++ b/src/components/Nutrition/widgets/MealDetailDropdown.tsx @@ -61,7 +61,7 @@ export const MealDetailDropdown = (props: { const handleOpenDeleteModal = () => setOpenDeleteModal(true); const handleCloseDeleteModal = () => setOpenDeleteModal(false); - const handleCloseSnackbar = (event?: React.SyntheticEvent | Event, reason?: string) => { + const handleCloseSnackbar = (event?: React.SyntheticEvent | Event | null, reason?: string) => { if (reason === 'clickaway') { return; } From 08cd72566070b090222c45d4b66ae98ff89a2d20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Nov 2026 19:56:48 +0000 Subject: [PATCH 20/30] Bump the mui group across 1 directory with 5 updates Bumps the mui group with 5 updates in the / directory: | Package | From | To | | --- | --- | --- | | [@mui/icons-material](https://github.com/mui/material-ui/tree/HEAD/packages/mui-icons-material) | `9.4.0` | `9.5.0` | | [@mui/material](https://github.com/mui/material-ui/tree/HEAD/packages/mui-material) | `9.4.0` | `9.5.0` | | [@mui/system](https://github.com/mui/material-ui/tree/HEAD/packages/mui-system) | `9.4.0` | `9.5.0` | | [@mui/x-data-grid](https://github.com/mui/mui-x/tree/HEAD/packages/x-data-grid) | `9.14.0` | `9.17.0` | | [@mui/x-date-pickers](https://github.com/mui/mui-x/tree/HEAD/packages/x-date-pickers) | `9.14.0` | `9.17.0` | Updates `@mui/icons-material` from 9.4.0 to 9.5.0 - [Release notes](https://github.com/mui/material-ui/releases) - [Changelog](https://github.com/mui/material-ui/blob/v9.5.0/CHANGELOG.md) - [Commits](https://github.com/mui/material-ui/commits/v9.5.0/packages/mui-icons-material) Updates `@mui/material` from 9.4.0 to 9.5.0 - [Release notes](https://github.com/mui/material-ui/releases) - [Changelog](https://github.com/mui/material-ui/blob/v9.5.0/CHANGELOG.md) - [Commits](https://github.com/mui/material-ui/commits/v9.5.0/packages/mui-material) Updates `@mui/system` from 9.4.0 to 9.5.0 - [Release notes](https://github.com/mui/material-ui/releases) - [Changelog](https://github.com/mui/material-ui/blob/v9.5.0/CHANGELOG.md) - [Commits](https://github.com/mui/material-ui/commits/v9.5.0/packages/mui-system) Updates `@mui/x-data-grid` from 9.14.0 to 9.17.0 - [Release notes](https://github.com/mui/mui-x/releases) - [Changelog](https://github.com/mui/mui-x/blob/master/CHANGELOG.md) - [Commits](https://github.com/mui/mui-x/commits/v9.17.0/packages/x-data-grid) Updates `@mui/x-date-pickers` from 9.14.0 to 9.17.0 - [Release notes](https://github.com/mui/mui-x/releases) - [Changelog](https://github.com/mui/mui-x/blob/master/CHANGELOG.md) - [Commits](https://github.com/mui/mui-x/commits/v9.17.0/packages/x-date-pickers) --- updated-dependencies: - dependency-name: "@mui/icons-material" dependency-version: 9.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: mui - dependency-name: "@mui/material" dependency-version: 9.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: mui - dependency-name: "@mui/system" dependency-version: 9.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: mui - dependency-name: "@mui/x-data-grid" dependency-version: 9.16.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: mui - dependency-name: "@mui/x-date-pickers" dependency-version: 9.16.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: mui ... Signed-off-by: dependabot[bot] --- package-lock.json | 170 +++++++++++++++++++++------------------------- 1 file changed, 78 insertions(+), 92 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62f0a38ff..3da221a0e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -396,15 +396,15 @@ } }, "node_modules/@base-ui/utils": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@base-ui/utils/-/utils-0.3.2.tgz", - "integrity": "sha512-oWy1aq/I2GmYjpl4PhEAhzflF8VPGKgZeq0xAWTbfD5KBWyxcN0ZP2+WHSUm/5Z6lVMBDLReLcoXwSYoRc/zNQ==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@base-ui/utils/-/utils-0.5.0.tgz", + "integrity": "sha512-dYGGcEttjkYiMoa5nHm8vLaJ2UcuTWxo3BFAwOYXeRg/q7UVVvA6cacEIXEs3FgBfK1CGtW1ptElqs7wsx+t9A==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.29.2", + "@babel/runtime": "^7.29.7 || ^8.0.0", "@floating-ui/utils": "^0.2.12", - "reselect": "^5.2.0", - "use-sync-external-store": "^1.6.0" + "reselect": "^5.3.0", + "use-sync-external-store": "^1.7.0" }, "peerDependencies": { "@types/react": "^17 || ^18 || ^19", @@ -1711,9 +1711,9 @@ } }, "node_modules/@mui/core-downloads-tracker": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-9.4.0.tgz", - "integrity": "sha512-d+gIYM1raJP87yrVQcVg+Q3vycVMArMkgu/TjJLi2vTvO9FHKWNRR1xs9nnN4eLpM9nGxxm02UMvc9BrmcUKvQ==", + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-9.5.0.tgz", + "integrity": "sha512-PErEpl3Lp+1ZqWYKI7GQU8XSiciAFmLbUAZ7IoaUL598HLy1UAFuEUMEJu8yAS1v8vkXYzWprMVZzky4UwXoOA==", "license": "MIT", "funding": { "type": "opencollective", @@ -1721,12 +1721,12 @@ } }, "node_modules/@mui/icons-material": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-9.4.0.tgz", - "integrity": "sha512-5PVgBYtLOXTk6u0YUAjoV9GoTUQDbeZ8g+pus2h0GphLT/rpmftRnB5D/Kw6QCAovB7EyBX7UxKdZqPBBAHUKw==", + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-9.5.0.tgz", + "integrity": "sha512-dahtVaqnRUIBgaZ4WC9EdP+LgJ5d2rslASYIX+nDFG6+ssUiM11jQ+Gd1wH8vhUGoNA9ES40MYics5BI8zJFXQ==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.29.7" + "@babel/runtime": "^7.29.7 || ^8.0.5" }, "engines": { "node": ">=14.0.0" @@ -1736,7 +1736,7 @@ "url": "https://opencollective.com/mui-org" }, "peerDependencies": { - "@mui/material": "^9.4.0", + "@mui/material": "^9.5.0", "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0" }, @@ -1747,22 +1747,22 @@ } }, "node_modules/@mui/material": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-9.4.0.tgz", - "integrity": "sha512-6KKUIvkQ2r/s48s9VZV9JEZ1W2dRa7RndVsF+Ipx4CYxDOQeozeRsS5r9NiheFf8A5hpbqJJIGoX7hjg5X4XUw==", + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-9.5.0.tgz", + "integrity": "sha512-QgqvdVjZoKxP8E8SBxYY6LrdV+kw00moXweZQWBbMMdifPKZAGfUaaXhGKIca6fjKnCL6HJIe/AWWCpqNvyHVw==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.29.7", - "@mui/core-downloads-tracker": "^9.4.0", - "@mui/system": "^9.4.0", - "@mui/types": "^9.4.0", - "@mui/utils": "^9.4.0", + "@babel/runtime": "^7.29.7 || ^8.0.5", + "@mui/core-downloads-tracker": "^9.5.0", + "@mui/system": "^9.5.0", + "@mui/types": "^9.5.0", + "@mui/utils": "^9.5.0", "@popperjs/core": "^2.11.8", "@types/react-transition-group": "^4.4.12", "clsx": "^2.1.1", "csstype": "^3.2.3", "prop-types": "^15.8.1", - "react-is": "^19.2.8", + "react-is": "^19.3.0", "react-transition-group": "^4.4.5" }, "engines": { @@ -1775,7 +1775,7 @@ "peerDependencies": { "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", - "@mui/material-pigment-css": "^9.4.0", + "@mui/material-pigment-css": "^9.5.0", "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" @@ -1796,13 +1796,13 @@ } }, "node_modules/@mui/private-theming": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-9.4.0.tgz", - "integrity": "sha512-qQpX/2XPGDz5F2OIWzo4kkorURlDeXGKytRQudXCdLS5TuwKsMKaZyx77LZEVSB73c7o3UrLWwQ/goRuHBdtjw==", + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-9.5.0.tgz", + "integrity": "sha512-UHZKySlr4ZJeA5HEhe/Tq1fhsR5573ViKYn7JV80dCVJtgqRQIplRSer1DHPg2Yi22llX7QRhgM0Vtrx4kZHSA==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.29.7", - "@mui/utils": "^9.4.0", + "@babel/runtime": "^7.29.7 || ^8.0.5", + "@mui/utils": "^9.5.0", "prop-types": "^15.8.1" }, "engines": { @@ -1823,12 +1823,12 @@ } }, "node_modules/@mui/styled-engine": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-9.4.0.tgz", - "integrity": "sha512-SlqVEYqnyEgXMFW4JuIDMelyhKzoWBJ85v2mNCQd0XtU0uk7U9E1zaJZ06XqodhA8oJrb+4Q+3E/JlwBe4jWkw==", + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-9.5.0.tgz", + "integrity": "sha512-IX1ceHnZ0bJgzJRWO/Ayl4ME1rNmpWVYwV28yb089UAMR17rJkV1qfr7ApsWQXXPi1oi+2JapJrWQAiAnTlJHQ==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.29.7", + "@babel/runtime": "^7.29.7 || ^8.0.5", "@emotion/cache": "^11.14.0", "@emotion/serialize": "^1.3.3", "@emotion/sheet": "^1.4.0", @@ -1857,16 +1857,16 @@ } }, "node_modules/@mui/system": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/@mui/system/-/system-9.4.0.tgz", - "integrity": "sha512-AZz9z13oGS1J0BYeAFHTbV7PegCtPiE/uMEIi7TJ1kTx3Vkt+jUpLyXF/2uV8B6Y79iTh98kVeOH9fX3x3zXXg==", + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/@mui/system/-/system-9.5.0.tgz", + "integrity": "sha512-OZuAwvoiaaHpvn0a540VH1DUwwmojJubGfNmO2g+nb2ybNDP4/gF7t7aA6AMduELSuJ5yxwlzyFvUO3CfLv1Yg==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.29.7", - "@mui/private-theming": "^9.4.0", - "@mui/styled-engine": "^9.4.0", - "@mui/types": "^9.4.0", - "@mui/utils": "^9.4.0", + "@babel/runtime": "^7.29.7 || ^8.0.5", + "@mui/private-theming": "^9.5.0", + "@mui/styled-engine": "^9.5.0", + "@mui/types": "^9.5.0", + "@mui/utils": "^9.5.0", "clsx": "^2.1.1", "csstype": "^3.2.3", "prop-types": "^15.8.1" @@ -1897,12 +1897,12 @@ } }, "node_modules/@mui/types": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/@mui/types/-/types-9.4.0.tgz", - "integrity": "sha512-13DH0Oniua4WmGqeYbQAZqmiN7r4nfd0zwIoGJ5QeJwyIHgEmf+LkRw/jV1HZb6AiUoHX8Oxf4xgalq3vYHcIw==", + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/@mui/types/-/types-9.5.0.tgz", + "integrity": "sha512-O0S6xS80qEQqW2CYNrd4GlBEQ1xpMOHZ5b4zO/DaLu6NZmtthM6smEg0Gz/u9gX5vL+8NB3EiBIxmxSCcG590Q==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.29.7" + "@babel/runtime": "^7.29.7 || ^8.0.5" }, "peerDependencies": { "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0" @@ -1914,17 +1914,17 @@ } }, "node_modules/@mui/utils": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-9.4.0.tgz", - "integrity": "sha512-WkzY8uYtqUDyGKPShrRQRBomfMQHddlsyKu/gRRESYO24tDPD2z0xRE8CBoUsWqpBa+YrFs9KixiS7kQRjsPAQ==", + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-9.5.0.tgz", + "integrity": "sha512-8m0LfSgE2pj58znY3kZ+anwRKbnBkcu/7AJPA8L/77wEjN0QnpX4/zRAccyplp1VEUnMsUBADeTRin5Mkf7epA==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.29.7", - "@mui/types": "^9.4.0", + "@babel/runtime": "^7.29.7 || ^8.0.5", + "@mui/types": "^9.5.0", "@types/prop-types": "^15.7.15", "clsx": "^2.1.1", "prop-types": "^15.8.1", - "react-is": "^19.2.8" + "react-is": "^19.3.0" }, "engines": { "node": ">=14.0.0" @@ -1944,23 +1944,20 @@ } }, "node_modules/@mui/x-data-grid": { - "version": "9.14.0", - "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-9.14.0.tgz", - "integrity": "sha512-DvQpyg3rkNs4GePo3x8NARoeco/EU7IaFLj4hNoAkuD5sWXMKNWLKERWLZvihVani2ypYYJ56FV4SmbNkFuv/g==", + "version": "9.17.0", + "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-9.17.0.tgz", + "integrity": "sha512-oSETp3t3tEMeuOPzQYpDMJ0/PbKPos4aK6f8ldC7ufpmMIiiZ8VUkQjWOEJ/gw6NAuMWYxDmNtj3Z+B1k3RXNQ==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.29.7", - "@base-ui/utils": "^0.3.2", - "@mui/utils": "^9.4.0", - "@mui/x-internals": "^9.14.0", - "@mui/x-virtualizer": "0.7.2", + "@babel/runtime": "^7.29.7 || ^8.0.0", + "@base-ui/utils": "^0.5.0", + "@mui/utils": "^9.5.0", + "@mui/x-internals": "9.17.0", + "@mui/x-virtualizer": "0.7.5", "clsx": "^2.1.1", "prop-types": "^15.8.1", "use-sync-external-store": "^1.7.0" }, - "engines": { - "node": ">=14.0.0" - }, "funding": { "type": "opencollective", "url": "https://opencollective.com/mui-org" @@ -1983,22 +1980,19 @@ } }, "node_modules/@mui/x-date-pickers": { - "version": "9.14.0", - "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-9.14.0.tgz", - "integrity": "sha512-b/TbCmIM/yqvD8CFHDKyOrneRWE5k2tKJ0DMFj+7udpziI30nWnnZ8IfOq7QTXrYfguXspiCecF1O2wmuckOYA==", + "version": "9.17.0", + "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-9.17.0.tgz", + "integrity": "sha512-pgD3ieXtJGHeOWUHN9tJchRT7FM6eXxqsLLjCzPvXIpN1cgpHxQYQbPZUApRItmASAi6Bxo9/mHwPmIj1yMcUw==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.29.7", - "@mui/utils": "^9.4.0", - "@mui/x-internals": "^9.14.0", + "@babel/runtime": "^7.29.7 || ^8.0.0", + "@mui/utils": "^9.5.0", + "@mui/x-internals": "9.17.0", "@types/react-transition-group": "^4.4.12", "clsx": "^2.1.1", "prop-types": "^15.8.1", "react-transition-group": "^4.4.5" }, - "engines": { - "node": ">=14.0.0" - }, "funding": { "type": "opencollective", "url": "https://opencollective.com/mui-org" @@ -2049,19 +2043,14 @@ } }, "node_modules/@mui/x-internals": { - "version": "9.14.0", - "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-9.14.0.tgz", - "integrity": "sha512-m4XkKIihP+uWvz18BgSOHtwxCBWtE3Qi2X9hZUdEGW5mk50umziYaCLn9B/3cT9qBU7LirEC8agqpWxDSYjaNw==", + "version": "9.17.0", + "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-9.17.0.tgz", + "integrity": "sha512-rk9yNkDR/ty/zpzdObwqLbax3V1lNqz5inat5IVC3KHWj64K9uEBoHLxMBZNtQd8WtPfHR7RS2KjuAI35rcusg==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.29.7", - "@base-ui/utils": "^0.3.2", - "@mui/utils": "^9.4.0", - "reselect": "^5.2.0", - "use-sync-external-store": "^1.7.0" - }, - "engines": { - "node": ">=14.0.0" + "@babel/runtime": "^7.29.7 || ^8.0.0", + "@base-ui/utils": "^0.5.0", + "@mui/utils": "^9.5.0" }, "funding": { "type": "opencollective", @@ -2073,18 +2062,15 @@ } }, "node_modules/@mui/x-virtualizer": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/@mui/x-virtualizer/-/x-virtualizer-0.7.2.tgz", - "integrity": "sha512-8JYK1KZe7rVMzBRxvEZYt0BYS5zXRDV0HPXqTSwe4TPPuldCjTII7IvlzkSC8yS24+2iDlYo5kBKdTJ8uzfMjg==", + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@mui/x-virtualizer/-/x-virtualizer-0.7.5.tgz", + "integrity": "sha512-f7ImV9WshZLi9mqkqMD0cyx+LLhxox32KGWltp0UpgFLL29fhCIa05nserf4oZm6iNdJfHu3kNK6u2zw0uGX5w==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.29.7", - "@base-ui/utils": "^0.3.2", - "@mui/utils": "^9.4.0", - "@mui/x-internals": "^9.14.0" - }, - "engines": { - "node": ">=14.0.0" + "@babel/runtime": "^7.29.7 || ^8.0.0", + "@base-ui/utils": "^0.5.0", + "@mui/utils": "^9.5.0", + "@mui/x-internals": "9.17.0" }, "funding": { "type": "opencollective", From 7be1f65a48520cbfe9b4cb3176f53809150c80f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Nov 2026 19:58:39 +0000 Subject: [PATCH 21/30] Bump follow-redirects from 1.16.1 to 1.16.2 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.16.1 to 1.16.2. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.16.1...v1.16.2) --- updated-dependencies: - dependency-name: follow-redirects dependency-version: 1.16.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4d881aca9..9b33ee4e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5656,15 +5656,16 @@ "license": "ISC" }, "node_modules/follow-redirects": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.1.tgz", - "integrity": "sha512-FNvFGzoMLWmE6Yj9spb/zjd7yiNCHiAW9/Tg9CXrQ8wuu32HtlJOwWO11OJafl5FfY3DxTdQ0vj42zU1kvv5jg==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.2.tgz", + "integrity": "sha512-/kVP2U8z596Ia0gwFrwyIeo74ta5aVmSeU1FfAUMAmcEP5EP7zydmag3SLiN64NaRKef3lxsq7i/g7ltJQDGow==", "funding": [ { "type": "individual", "url": "https://github.com/sponsors/RubenVerborgh" } ], + "license": "MIT", "engines": { "node": ">=4.0" }, From 7c649ca8eab438efe84b8a29e74e48242f575e3c Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Wed, 4 Nov 2026 21:01:28 +0100 Subject: [PATCH 22/30] Let Dependabot raise versions in package.json --- .github/dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1c35651a0..3971b572b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,6 +7,7 @@ version: 2 updates: - package-ecosystem: "npm" directory: "/" + versioning-strategy: increase schedule: interval: "monthly" From cecbf68857bce794107e1dbe7add3806f19815cc Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Wed, 4 Nov 2026 21:01:49 +0100 Subject: [PATCH 23/30] Mention plural rules for strings --- AGENTS.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AGENTS.md b/AGENTS.md index 48d6693e0..c80544699 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -84,7 +84,8 @@ components// - **i18n:** any new user-visible string goes through `t()` / ``. No hard-coded English/German in JSX. Add new keys only to `public/locales/en/translation.json` (`npm run i18n` extracts them); the other languages come from Weblate. If the flutter app already has the string (`../flutter/lib/l10n/app_*.arb`), use its English text - byte-for-byte so Weblate can cross-suggest translations. + byte-for-byte so Weblate can cross-suggest translations. Strings with a number use plural keys (`_one`, `_other`) + and a numeric `count`, also keep `{{count}}` in `_one`: in some languages that form also covers numbers like 21. - **Dates:** everything is in the browser's local timezone. Use the helpers in `core/lib/date` (`dateToYYYYMMDD`, `yyyymmddToDate`, `isSameDay`, …) for calendar days, never `toISOString().slice(0, 10)`, which shifts the day. `core/lib/date.test.ts` re-runs under several `TZ` values in its own vitest project. From 2b68bc5aa8956844f8364a922d9d62cf103aaff9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Nov 2026 20:03:43 +0000 Subject: [PATCH 24/30] Bump eslint from 10.11.0 to 10.14.0 Bumps [eslint](https://github.com/eslint/eslint) from 10.11.0 to 10.14.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Commits](https://github.com/eslint/eslint/compare/v10.11.0...v10.14.0) --- updated-dependencies: - dependency-name: eslint dependency-version: 10.14.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index e73b286af..a7c5dc24a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -58,7 +58,7 @@ "@types/react-is": "^19.3.0", "@types/slug": "^5.0.9", "@vitest/coverage-v8": "^5.0.2", - "eslint": "^10.11.0", + "eslint": "^10.14.0", "eslint-plugin-import-x": "^4.17.1", "eslint-plugin-react-hooks": "^7.1.1", "happy-dom": "^21.0.4", @@ -4994,9 +4994,9 @@ } }, "node_modules/eslint": { - "version": "10.11.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.11.0.tgz", - "integrity": "sha512-P7a6UEEqb9G95MYAtqkmsTbVXIYyzIfl6NGOIJk162PaahFxFyeGcrlXYFSiagECg4sEm8IseJdZBKR3rx6MsQ==", + "version": "10.14.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.14.0.tgz", + "integrity": "sha512-T0pNsxkb9IKmtQjhpK3d7nWOpFv+YHuMbTJnSVMoQblF0onvXfErrtp4V1jHtsQPan7dKaGVD0q1WCXnzMF31A==", "dev": true, "license": "MIT", "workspaces": [ @@ -5009,7 +5009,7 @@ "@eslint/config-helpers": "^0.7.0", "@eslint/core": "^1.2.1", "@eslint/plugin-kit": "^0.7.3", - "@humanfs/node": "^0.16.6", + "@humanfs/node": "^0.16.8", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", @@ -5030,7 +5030,7 @@ "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "json-stable-stringify-without-jsonify": "^1.0.1", - "minimatch": "^10.2.5", + "minimatch": "^10.2.6", "natural-compare": "^1.4.0", "optionator": "^0.9.3" }, diff --git a/package.json b/package.json index cd3abc742..4b4473f86 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "@types/react-is": "^19.3.0", "@types/slug": "^5.0.9", "@vitest/coverage-v8": "^5.0.2", - "eslint": "^10.11.0", + "eslint": "^10.14.0", "eslint-plugin-import-x": "^4.17.1", "eslint-plugin-react-hooks": "^7.1.1", "happy-dom": "^21.0.4", From a73651732f6ce2545ce317261085e6c91cee59eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Nov 2026 20:03:54 +0000 Subject: [PATCH 25/30] Bump i18next-cli from 1.74.2 to 1.81.0 Bumps [i18next-cli](https://github.com/i18next/i18next-cli) from 1.74.2 to 1.81.0. - [Changelog](https://github.com/i18next/i18next-cli/blob/main/CHANGELOG.md) - [Commits](https://github.com/i18next/i18next-cli/compare/v1.74.2...v1.81.0) --- updated-dependencies: - dependency-name: i18next-cli dependency-version: 1.81.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 994 +++++++++------------------------------------- package.json | 2 +- 2 files changed, 189 insertions(+), 807 deletions(-) diff --git a/package-lock.json b/package-lock.json index e73b286af..fde6be049 100644 --- a/package-lock.json +++ b/package-lock.json @@ -62,7 +62,7 @@ "eslint-plugin-import-x": "^4.17.1", "eslint-plugin-react-hooks": "^7.1.1", "happy-dom": "^21.0.4", - "i18next-cli": "^1.74.1", + "i18next-cli": "^1.81.0", "jsdom": "^30.1.1", "typescript-eslint": "^8.70.1", "vite": "^8.3.1", @@ -1165,6 +1165,23 @@ "integrity": "sha512-HpCo8tmWzLVad5s2d19EhAz5zqrrQ6s69qd6moPMQvkOuSwDT1YgRfWSVuc4ennqrgv3OHppiOGMQ7oC13yIww==", "license": "MIT" }, + "node_modules/@formatjs/icu-messageformat-parser": { + "version": "3.5.22", + "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-3.5.22.tgz", + "integrity": "sha512-YuwN+dDKgssfuYwtOyGQD0CSn7K46g9cv1Fp0VgKpjZDDFvv8b8crzP990IcJhRPWHhKzCGsbUSJVIguyyFA5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@formatjs/icu-skeleton-parser": "2.1.12" + } + }, + "node_modules/@formatjs/icu-skeleton-parser": { + "version": "2.1.12", + "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-2.1.12.tgz", + "integrity": "sha512-ca7tZMLpfHX3sUD7hP6gE/qr6Iq89EDd3ZLeRhbsB7r0UD55DGJq+tmFLzrGrnx5StahUevQmQQVtbDRHsfDHA==", + "dev": true, + "license": "MIT" + }, "node_modules/@hello-pangea/dnd": { "version": "18.0.1", "resolved": "https://registry.npmjs.org/@hello-pangea/dnd/-/dnd-18.0.1.tgz", @@ -1249,48 +1266,24 @@ } }, "node_modules/@inquirer/ansi": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/@inquirer/ansi/-/ansi-2.0.8.tgz", - "integrity": "sha512-WpQM+Ti6Z40EFwwt+uL2p4UabT+W179zHp6HhLVOzfbwnVn05IPO/eXIZXGNqcT1jbQ15SujNLzQ39k4QPPxBQ==", + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/@inquirer/ansi/-/ansi-2.0.10.tgz", + "integrity": "sha512-dwrc+1aqVZpHNkNDswXGtn1typ+Pxpo5FHZRyBw1le7onEJUkPUkYOY1FIFC1LvFMYUqqLuWBwElhAmencL7MQ==", "dev": true, "license": "MIT", "engines": { "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" } }, - "node_modules/@inquirer/checkbox": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-5.2.5.tgz", - "integrity": "sha512-bRt8J8m+Fot9CXv+zNQGXUq2ET0MggR1fPz7v6edN6MFYmsbfGnMmkmWZJEegMKqrAC8ej/o1sqisHZXZJMAfQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/ansi": "^2.0.8", - "@inquirer/core": "^12.0.3", - "@inquirer/figures": "^2.0.9", - "@inquirer/type": "4.1.1" - }, - "engines": { - "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" - }, - "peerDependencies": { - "@types/node": ">=18" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, "node_modules/@inquirer/confirm": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-6.3.2.tgz", - "integrity": "sha512-Xvr/0HggjddPtGppuqVmxhTw+Hr8PvsZ/k0HmOEaAqQEt80OITNkFWnsdNmyT0/eM4Ab+iJLx2R8rctlEyfSVg==", + "version": "6.3.5", + "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-6.3.5.tgz", + "integrity": "sha512-BJ59BOyURiZiAxdr9AuRu38/k+rV+DcTIM2fUF/c/BXrab6H8zMZTTOl3LgkSJH96Xob2vOJxDiBkHiz32Xx2w==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^12.0.3", - "@inquirer/type": "4.1.1" + "@inquirer/core": "^12.0.6", + "@inquirer/type": "4.2.1" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" @@ -1305,15 +1298,15 @@ } }, "node_modules/@inquirer/core": { - "version": "12.0.3", - "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-12.0.3.tgz", - "integrity": "sha512-wsSy0sznmXwkty+2PzZwx00Cazc/E0r0B7mAzdGROz2Ct+DFZXaK7WDjGZvgjRldxH5ZhFVfF2lgkYrqgOw2KA==", + "version": "12.0.6", + "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-12.0.6.tgz", + "integrity": "sha512-5yxn2LsJ8Tu4ei2a+yNkmFRhM/cb+JMEsEs/AW6CCOnBnpMy4IjYiPMFyHtYq8weOmlTyqqCx40y0DsD7OsEPw==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/ansi": "^2.0.8", - "@inquirer/figures": "^2.0.9", - "@inquirer/type": "4.1.1", + "@inquirer/ansi": "^2.0.10", + "@inquirer/figures": "^2.0.10", + "@inquirer/type": "4.2.1", "cli-width": "^4.1.0", "fast-wrap-ansi": "^0.2.0", "mute-stream": "^3.0.0", @@ -1331,77 +1324,10 @@ } } }, - "node_modules/@inquirer/editor": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-5.3.3.tgz", - "integrity": "sha512-YsKkS2q63IiLtaDK/9nqzdComN97SDQrmKiyNggN+ceP4ty+Z6VwyTz3FpjeUWeW1Efss2xHFKCC9sx7hnrsxg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/core": "^12.0.3", - "@inquirer/external-editor": "^3.0.5", - "@inquirer/type": "4.1.1" - }, - "engines": { - "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" - }, - "peerDependencies": { - "@types/node": ">=18" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, - "node_modules/@inquirer/expand": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-5.1.5.tgz", - "integrity": "sha512-uHuXLmXW+TtIfT/9vSBotypAkqn1n34Ul+CLGPos/xANyO4Ff5xZzkYhbKR4NEcfVK4a9mHQOpwVZzluSHFRGw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/core": "^12.0.3", - "@inquirer/type": "4.1.1" - }, - "engines": { - "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" - }, - "peerDependencies": { - "@types/node": ">=18" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, - "node_modules/@inquirer/external-editor": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-3.0.5.tgz", - "integrity": "sha512-f3QQJRIX5ZEneBHNUIuPjmbdzHnmRFJA8r2dkcb8q+OM5Uv5KtnuAttQumnrjcBVBM3mcTX1CkmtAkU58VRZxg==", - "dev": true, - "license": "MIT", - "dependencies": { - "chardet": "^2.1.1", - "iconv-lite": "^0.7.2" - }, - "engines": { - "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" - }, - "peerDependencies": { - "@types/node": ">=18" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, "node_modules/@inquirer/figures": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-2.0.9.tgz", - "integrity": "sha512-EAWgUTGQ/Umgga51dE3B2PUHbufuXarDfg86uVgoSgNHNNQnyFKcOrQLWVqYMghuSyHh8+2HUH0Js9cTC1WAdg==", + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-2.0.10.tgz", + "integrity": "sha512-51elrUJV3jZpvD0ygz8+U10Kc6+Lzqln+/tYmnbhy6jo5oXpE6hMCcv+OTBC0enwJXsb3JIuT3VtEinRNCSK2A==", "dev": true, "license": "MIT", "engines": { @@ -1409,36 +1335,14 @@ } }, "node_modules/@inquirer/input": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-5.1.6.tgz", - "integrity": "sha512-HtcJhB2QFVXbLuJ5S3syhNbTUVxYvwqV4VRBDkQceBloC9bmTViUoRFP5PbSaDZb3HzfPmpuU/gG4ybVBz4FHA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/core": "^12.0.3", - "@inquirer/type": "4.1.1" - }, - "engines": { - "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" - }, - "peerDependencies": { - "@types/node": ">=18" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, - "node_modules/@inquirer/number": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-4.2.3.tgz", - "integrity": "sha512-6Yuwh1NGSbu1Lo4N1EWjXs1jKRntLg/ZCwhmeorEHde90v1XxAozdbd4Iu30eOQLW+6h1hp2O9ujNfLSbTPJnA==", + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-5.1.9.tgz", + "integrity": "sha512-2Vd5T7lTxfgJMpAd3aOu6bQpbUnCU7tBgvTQIZkP/7juJzmRmTM2t5XfOCuirFduWLTSJI/WZp32Cq1E01TVeg==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^12.0.3", - "@inquirer/type": "4.1.1" + "@inquirer/core": "^12.0.6", + "@inquirer/type": "4.2.1" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" @@ -1453,90 +1357,15 @@ } }, "node_modules/@inquirer/password": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-5.2.2.tgz", - "integrity": "sha512-W9zYdyzogK+6110mqwaSJWCBu2yA5Q/OfnGSjjZB1bNpHlmUozXxTl0+QOZBNeVd6Qo81/qT75gW05gLAtITxw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/ansi": "^2.0.8", - "@inquirer/core": "^12.0.3", - "@inquirer/type": "4.1.1" - }, - "engines": { - "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" - }, - "peerDependencies": { - "@types/node": ">=18" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, - "node_modules/@inquirer/prompts": { - "version": "8.7.2", - "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-8.7.2.tgz", - "integrity": "sha512-QoRB4wFIjgH5iOhSjoIKMkTvSHDuV+O3OITlIqAYO0oK5x364GJILXiMBvlPiE+klg7Xx9tq5XVqQHcGUDYYPA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/checkbox": "^5.2.5", - "@inquirer/confirm": "^6.3.2", - "@inquirer/editor": "^5.3.3", - "@inquirer/expand": "^5.1.5", - "@inquirer/input": "^5.1.6", - "@inquirer/number": "^4.2.3", - "@inquirer/password": "^5.2.2", - "@inquirer/rawlist": "^5.3.5", - "@inquirer/search": "^4.3.3", - "@inquirer/select": "^5.2.5" - }, - "engines": { - "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" - }, - "peerDependencies": { - "@types/node": ">=18" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, - "node_modules/@inquirer/rawlist": { - "version": "5.3.5", - "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-5.3.5.tgz", - "integrity": "sha512-1oHky1ONfCOwNrnkQGDE1oaSij/3fI6HFMSf2H/WsGO2lEyDX9My82iggITSy9ddSZ8yk8j9v41OI0fVoSIoaA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/core": "^12.0.3", - "@inquirer/type": "4.1.1" - }, - "engines": { - "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" - }, - "peerDependencies": { - "@types/node": ">=18" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, - "node_modules/@inquirer/search": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-4.3.3.tgz", - "integrity": "sha512-fyuIU1Nbpvwlikjg3gXwJFDI11+EFjqQ7P+iByfmivIKQ1vmaykNrD/vy5unHuUqUpsOsnvJ25//tPF7E/RBRA==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-5.2.5.tgz", + "integrity": "sha512-0v0wLQA4uhWbybmdH6oPl7ooxCiymNylkvi2gCSc+mA5ZQB6QoJLVhoHq12T82lhozpp9fpMJnJkC1nJrU/A+A==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^12.0.3", - "@inquirer/figures": "^2.0.9", - "@inquirer/type": "4.1.1" + "@inquirer/ansi": "^2.0.10", + "@inquirer/core": "^12.0.6", + "@inquirer/type": "4.2.1" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" @@ -1551,16 +1380,16 @@ } }, "node_modules/@inquirer/select": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-5.2.5.tgz", - "integrity": "sha512-9kc15hr8r/kI+3DO/xLog5nOzTz1jqsHXa6JBFzmQKhkoJ8Slda1I1L/uD8ZSZ9tF1yp79wwXe7mclvX1rqR2Q==", + "version": "5.2.8", + "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-5.2.8.tgz", + "integrity": "sha512-BklkkAAOpjdCfuQw5fVGcDuhKxA7T1iBpn6b2JUvDDdkIsO3Ftlg+WnWUCVpkUBFagL2o036OFW+xL4lC9wIPw==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/ansi": "^2.0.8", - "@inquirer/core": "^12.0.3", - "@inquirer/figures": "^2.0.9", - "@inquirer/type": "4.1.1" + "@inquirer/ansi": "^2.0.10", + "@inquirer/core": "^12.0.6", + "@inquirer/figures": "^2.0.10", + "@inquirer/type": "4.2.1" }, "engines": { "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" @@ -1575,9 +1404,9 @@ } }, "node_modules/@inquirer/type": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-4.1.1.tgz", - "integrity": "sha512-yJoHYrMnxIsJZCY+0Vb66Dy3he3kL3e2wOBKhoSwWWAzZAY82emlxwgprCtp6yRixvNRNq9ztfRWQYPNr3Go7A==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-4.2.1.tgz", + "integrity": "sha512-lDkPsnv5M5CcYB2T1qTc3dobNTPkVr4DU3Ic2Q6SW8/qVRHgvzdRdmVZ6YqG9Ag1aJTeMsLU0s0WPRh3CZWDQQ==", "dev": true, "license": "MIT", "engines": { @@ -2394,26 +2223,6 @@ "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==", "license": "MIT" }, - "node_modules/@sec-ant/readable-stream": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz", - "integrity": "sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==", - "dev": true, - "license": "MIT" - }, - "node_modules/@sindresorhus/merge-streams": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-4.0.0.tgz", - "integrity": "sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/@solid-primitives/event-listener": { "version": "2.4.6", "resolved": "https://registry.npmjs.org/@solid-primitives/event-listener/-/event-listener-2.4.6.tgz", @@ -2614,9 +2423,9 @@ } }, "node_modules/@swc/core": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.16.2.tgz", - "integrity": "sha512-95I4kiSMeveI/Mhi+tE4fiWcWLUMfzfKrk0jtr8LRMqHgOgq+xHS+zExkDqoO4b5OeeuXHMWVdD5MeP3X6sULw==", + "version": "1.16.21", + "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.16.21.tgz", + "integrity": "sha512-sE2asan0US6gcp11oBDFJb5+s+ltaAPBcagVQGub1+qo+8TsQET2TmXfJCw/Oy0w1eEPp1rV1wsR/Umx2KXGcw==", "dev": true, "hasInstallScript": true, "license": "Apache-2.0", @@ -2632,18 +2441,18 @@ "url": "https://opencollective.com/swc" }, "optionalDependencies": { - "@swc/core-darwin-arm64": "1.16.2", - "@swc/core-darwin-x64": "1.16.2", - "@swc/core-linux-arm-gnueabihf": "1.16.2", - "@swc/core-linux-arm64-gnu": "1.16.2", - "@swc/core-linux-arm64-musl": "1.16.2", - "@swc/core-linux-ppc64-gnu": "1.16.2", - "@swc/core-linux-s390x-gnu": "1.16.2", - "@swc/core-linux-x64-gnu": "1.16.2", - "@swc/core-linux-x64-musl": "1.16.2", - "@swc/core-win32-arm64-msvc": "1.16.2", - "@swc/core-win32-ia32-msvc": "1.16.2", - "@swc/core-win32-x64-msvc": "1.16.2" + "@swc/core-darwin-arm64": "1.16.21", + "@swc/core-darwin-x64": "1.16.21", + "@swc/core-linux-arm-gnueabihf": "1.16.21", + "@swc/core-linux-arm64-gnu": "1.16.21", + "@swc/core-linux-arm64-musl": "1.16.21", + "@swc/core-linux-ppc64-gnu": "1.16.21", + "@swc/core-linux-s390x-gnu": "1.16.21", + "@swc/core-linux-x64-gnu": "1.16.21", + "@swc/core-linux-x64-musl": "1.16.21", + "@swc/core-win32-arm64-msvc": "1.16.21", + "@swc/core-win32-ia32-msvc": "1.16.21", + "@swc/core-win32-x64-msvc": "1.16.21" }, "peerDependencies": { "@swc/helpers": ">=0.5.17" @@ -2655,9 +2464,9 @@ } }, "node_modules/@swc/core-darwin-arm64": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.16.2.tgz", - "integrity": "sha512-i/j0HNbnn79qnTVPicvay92Nark8fW8NQqn1e2mGERjUXNpBV0+SwQxlRpk2zBhn6laJ8PDI6Kn1nHZhnz3LCA==", + "version": "1.16.21", + "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.16.21.tgz", + "integrity": "sha512-VRreJpbRygpSD1hj3HBEOIA1xjXYnhB+IfcKsxZRhCIBGRP4UkqxZH4/ipFh/heIRp7EKQ56E8ygwEftLNCWXw==", "cpu": [ "arm64" ], @@ -2672,9 +2481,9 @@ } }, "node_modules/@swc/core-darwin-x64": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.16.2.tgz", - "integrity": "sha512-HrwqHyEyHVXO3qTk8EkNK7/b6sOZSEoNh+pot6RdE5x0LbNqfo8LtJUvi3UTXr+5ja/o5HbJdW80eCXo+NjbiA==", + "version": "1.16.21", + "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.16.21.tgz", + "integrity": "sha512-KqCJ04pMYDBUYpAOFGUFR8TEjqo4h0Vtwe/za9xNRDKsxSDnjgM7HVhfO0uNNpMMlM2ao2E6d0iLpApIRvNGnA==", "cpu": [ "x64" ], @@ -2689,9 +2498,9 @@ } }, "node_modules/@swc/core-linux-arm-gnueabihf": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.16.2.tgz", - "integrity": "sha512-MdXi83Z/gGp1LIrg+h7HKxiul/z/Bty/ZJSvYAFqDl9zteC1XLSAZdScquKtXPp50rdyXqritTDCqQBhwVfZKA==", + "version": "1.16.21", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.16.21.tgz", + "integrity": "sha512-tLkw3uWxQj69qBRX5Xm8vbq+5iX5e/ktoPXhrDeFFa2jNMc+AWcxa0bqwatvVGK40v5mcmz6Ulu5Nk9jF8ciMA==", "cpu": [ "arm" ], @@ -2706,13 +2515,16 @@ } }, "node_modules/@swc/core-linux-arm64-gnu": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.16.2.tgz", - "integrity": "sha512-/jcTmK6Ktz3owM3YtiKvjofV6p3VpHnYzTIrOGwDIOsDigRAAVuZ8east33wYO/7UTdKYFlyHNnJNT0WJqOA3Q==", + "version": "1.16.21", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.16.21.tgz", + "integrity": "sha512-lFHVlHB0B5C7FwyprWJQp7b2iF/ohj2RqnMiv8uCnFJc+rYP0Py2I7ftZ+rOX4Zu7Ra9eMk7GnmuxAywCZYUJQ==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "Apache-2.0 AND MIT", "optional": true, "os": [ @@ -2723,13 +2535,16 @@ } }, "node_modules/@swc/core-linux-arm64-musl": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.16.2.tgz", - "integrity": "sha512-4gFarKaFnlJTSlJYKmMhV4u+3YE4uYfiydpBoYjmgQhCf9lAieOq+WilZaK9vVSHeqLuQpTEiGULZqAdsRX5Dw==", + "version": "1.16.21", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.16.21.tgz", + "integrity": "sha512-gXDgrMMDsWT7r5gZsml10snBS9yaoVYwU9vGffa+DAts4ctEMrMHv+G8AH+ZxCV9gr5MfdgtGGQKjXjLay4mXQ==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "Apache-2.0 AND MIT", "optional": true, "os": [ @@ -2740,13 +2555,16 @@ } }, "node_modules/@swc/core-linux-ppc64-gnu": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/@swc/core-linux-ppc64-gnu/-/core-linux-ppc64-gnu-1.16.2.tgz", - "integrity": "sha512-syqSLGd6KlZ1PciNzs6bIUlhOuFztZufebOHaERjc4N4SqNZxyqYd4I+jj/EfOYnpe0kNjccn9HJLN1p5dz3+w==", + "version": "1.16.21", + "resolved": "https://registry.npmjs.org/@swc/core-linux-ppc64-gnu/-/core-linux-ppc64-gnu-1.16.21.tgz", + "integrity": "sha512-hZF7J2YzXiADZ4eQxTFOWJcSSy3fbUR8/DcCXqiBHh0bVyLl2Y+O5pVWxk/r/XV5tA9n7DnnLlvkPPsHoajE9w==", "cpu": [ "ppc64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "Apache-2.0 AND MIT", "optional": true, "os": [ @@ -2757,13 +2575,16 @@ } }, "node_modules/@swc/core-linux-s390x-gnu": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/@swc/core-linux-s390x-gnu/-/core-linux-s390x-gnu-1.16.2.tgz", - "integrity": "sha512-ZBBLK+ewGyXLzWeMS7wbKtWBdnif6etn7xvPY/iOfbdsjX/+bgkp1pQt2lWF2wlu2hXYZuhJ/tHZE/QR8/apzg==", + "version": "1.16.21", + "resolved": "https://registry.npmjs.org/@swc/core-linux-s390x-gnu/-/core-linux-s390x-gnu-1.16.21.tgz", + "integrity": "sha512-rmtGwkAlbl+fQMGrGUMklUmByueOmt1ju9sKsE5YWVA0KfFYM0W87WVx4lFYQXt+E4P3zkLjeqo/AUa5mFbF1A==", "cpu": [ "s390x" ], "dev": true, + "libc": [ + "glibc" + ], "license": "Apache-2.0 AND MIT", "optional": true, "os": [ @@ -2774,13 +2595,16 @@ } }, "node_modules/@swc/core-linux-x64-gnu": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.16.2.tgz", - "integrity": "sha512-LyHJgxCA4Tje0ysBMbEb0tt/ie8kgUKoFE3JAKFhpevmTmhYEoC0H9s47WuDsqiFckF1ITUguZIXJG6K5e0dvg==", + "version": "1.16.21", + "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.16.21.tgz", + "integrity": "sha512-EUJsyrFw3aNE64iQzk3bDqjADgl4l0vpxfwVMjMuZIooNg35yKqvkw3bYNEhQyrBDY0+5kKoiirGLpth3Wf3lA==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "Apache-2.0 AND MIT", "optional": true, "os": [ @@ -2791,13 +2615,16 @@ } }, "node_modules/@swc/core-linux-x64-musl": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.16.2.tgz", - "integrity": "sha512-PghXJlVM1cgtLfNUR1vxFo1z+PDRAe8cWAJlZZ7spmeiN7BospGXg/MHUg7oNSgwSX7Zo//YKv9P5yD9apsFJQ==", + "version": "1.16.21", + "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.16.21.tgz", + "integrity": "sha512-ZXUnLjxTHxvNhVmQmYlb8XNKArfi/MiGoW5DmfuME8ttCLH9OJTqJVFy7g1yYxUCgw3tU6dF1uU59N8P/Yr5Pw==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "Apache-2.0 AND MIT", "optional": true, "os": [ @@ -2808,9 +2635,9 @@ } }, "node_modules/@swc/core-win32-arm64-msvc": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.16.2.tgz", - "integrity": "sha512-StTOSefYBxemvNYYUI3UmO1a8y+hSPjjfHogC2TEHL+Z1PlEBim/XtLas5rS04jAzT9RrNmbtX911SZ42H9jSQ==", + "version": "1.16.21", + "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.16.21.tgz", + "integrity": "sha512-jnnQpAHiWZgEobVfOPvJJzm1Jh4ZEIKh2IqcDqHv6zJcjvaEkHdkt+qdRsJ9AqvK7g18WBRHTnvKm5IxdbkagA==", "cpu": [ "arm64" ], @@ -2825,9 +2652,9 @@ } }, "node_modules/@swc/core-win32-ia32-msvc": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.16.2.tgz", - "integrity": "sha512-fycER209DYIzsibpTMC+chND05OfOjgztWL9U8OE6/uUlsOUZH3eh98isBLEnOymYUhlJLEt5++W1+KL/FOh5Q==", + "version": "1.16.21", + "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.16.21.tgz", + "integrity": "sha512-TaVTnNm9c1I+VG3hJUt11uspwbTrTQ9+fUPzODlvx4tj/ChYqUm4cKTIHw3O97hILxpmhBR0hbvLEs9seOV59A==", "cpu": [ "ia32" ], @@ -2842,9 +2669,9 @@ } }, "node_modules/@swc/core-win32-x64-msvc": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.16.2.tgz", - "integrity": "sha512-cSd1z6ivSrJPVr+moVwOHWjeKy6TpO4/Shwcv5KCrKYXCccxwh4pRy1C3fDioNx2PF1jPZWHKZjtXt+Be9VbaQ==", + "version": "1.16.21", + "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.16.21.tgz", + "integrity": "sha512-aPv58Clf6SdAQtouzDYKbEtcCETY2hOXlrHgSFnFIJQOlMWINHSGazaM1Iv63/9wOUDPq6+0ZFytMqnPtER9OQ==", "cpu": [ "x64" ], @@ -4400,13 +4227,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/chardet": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-2.2.0.tgz", - "integrity": "sha512-rddelWYNPRrXq6PtNEN2S3f6t9ILzvqaN5pVgi4kqt9jHQaXIial9PznB5iSPVlQSLNaaH22ItWz3EJtQ10+OA==", - "dev": true, - "license": "MIT" - }, "node_modules/chokidar": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", @@ -4423,35 +4243,6 @@ "url": "https://paulmillr.com/funding/" } }, - "node_modules/cli-cursor": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz", - "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==", - "dev": true, - "license": "MIT", - "dependencies": { - "restore-cursor": "^5.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-spinners": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-3.4.0.tgz", - "integrity": "sha512-bXfOC4QcT1tKXGorxL3wbJm6XJPDqEnij2gQ2m7ESQuE+/z9YFIWnl/5RpTiKWbMq3EVKR4fRLJGn6DVfu0mpw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/cli-width": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz", @@ -5450,33 +5241,6 @@ "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==", "license": "MIT" }, - "node_modules/execa": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-10.0.1.tgz", - "integrity": "sha512-ge98qjkRK4IB7tL7Ju/6qmm5LHoH1eEMt5FNZrz3f4UIYhF28lggX20z3FaX1sgc67msLEn0N0BscOs29iuwyw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sindresorhus/merge-streams": "^4.0.0", - "figures": "^6.1.0", - "get-stream": "^9.0.1", - "human-signals": "^8.0.1", - "is-plain-obj": "^4.1.0", - "is-stream": "^4.0.1", - "npm-run-path": "^6.0.0", - "pretty-ms": "^9.3.0", - "signal-exit": "^4.1.0", - "strip-final-newline": "^4.0.0", - "which-command": "^0.1.0", - "yoctocolors": "^2.1.2" - }, - "engines": { - "node": ">=22" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, "node_modules/expect-type": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.4.0.tgz", @@ -5558,22 +5322,6 @@ } } }, - "node_modules/figures": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-6.1.0.tgz", - "integrity": "sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-unicode-supported": "^2.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/file-entry-cache": { "version": "11.1.5", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-11.1.5.tgz", @@ -5694,19 +5442,6 @@ "node": ">=6.9.0" } }, - "node_modules/get-east-asian-width": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.7.0.tgz", - "integrity": "sha512-XjH1AECxf0giL2V1aU8vKyRR2ppRUb5c0EvT7zuJTokQ74bNo52zOtghqdWIqrhUD79fo3x0WfKZdOqxF6LG1Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/get-intrinsic": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", @@ -5744,23 +5479,6 @@ "node": ">= 0.4" } }, - "node_modules/get-stream": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz", - "integrity": "sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sec-ant/readable-stream": "^0.4.1", - "is-stream": "^4.0.1" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/get-tsconfig": { "version": "4.14.3", "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.14.3.tgz", @@ -5982,16 +5700,6 @@ "node": ">= 6" } }, - "node_modules/human-signals": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-8.0.1.tgz", - "integrity": "sha512-eKCa6bwnJhvxj14kZk5NCPc6Hb6BdsU9DZcOnmQKSnO1VKrfV0zCvtttPZUsBvjmNDn8rpcJfpwSYnHBjc95MQ==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=18.18.0" - } - }, "node_modules/i18next": { "version": "26.5.11", "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.5.11.tgz", @@ -6030,27 +5738,33 @@ } }, "node_modules/i18next-cli": { - "version": "1.74.2", - "resolved": "https://registry.npmjs.org/i18next-cli/-/i18next-cli-1.74.2.tgz", - "integrity": "sha512-y32hOiVNLs85f+TKCl4XqERjD0dFy274IOEXe7/Zyp+WMaQC9VhF33JLO0hQZZKK4PUmYwbRDXaSObeE3PbsmA==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/i18next-cli/-/i18next-cli-1.81.0.tgz", + "integrity": "sha512-w5Uw5/F9S9XdfAle40sXq1FrK/Pd0XoQyJ9T6+9EdaocAwPx3xOwjJQg+TDOHgR86lWr4EI7qjP0dhSNnY2CkA==", "dev": true, + "license": "MIT", "dependencies": { "@croct/json5-parser": "^0.2.2", - "@swc/core": "^1.16.2", + "@formatjs/icu-messageformat-parser": "^3.5.22", + "@inquirer/confirm": "^6.3.5", + "@inquirer/input": "^5.1.9", + "@inquirer/password": "^5.2.5", + "@inquirer/select": "^5.2.8", + "@swc/core": "^1.16.20", "chokidar": "^5.0.0", "commander": "^15.0.0", - "execa": "^10.0.1", "glob": "^13.0.6", - "i18next": "^26.4.2", - "i18next-resources-for-ts": "^2.1.1", - "inquirer": "^14.2.2", + "i18next": "^26.5.10", + "i18next-resources-for-ts": "^2.1.2", "jiti": "^2.7.0", "jsonc-parser": "^3.3.1", - "magic-string": "^1.4.2", + "magic-string": "^1.4.3", + "messageformat": "^4.1.0", "minimatch": "^10.2.6", - "ora": "^9.4.1", - "react-i18next": "^17.0.15", - "yaml": "^2.9.1" + "nano-spawn": "^2.1.0", + "react-i18next": "^17.1.8", + "yaml": "^2.9.1", + "yocto-spinner": "^1.2.2" }, "bin": { "i18next-cli": "dist/esm/cli.js" @@ -6069,9 +5783,9 @@ } }, "node_modules/i18next-resources-for-ts": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/i18next-resources-for-ts/-/i18next-resources-for-ts-2.1.1.tgz", - "integrity": "sha512-Xhz8S8dtNIPawzeWdmssnsII1JYsbvPWOLmstJakNcgKSFLCneA+xN7qajj/zlk5nf9sx1KGDTx8RNZ73h68tw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/i18next-resources-for-ts/-/i18next-resources-for-ts-2.1.2.tgz", + "integrity": "sha512-1SwWSlbgpMx/AyWYJvPrg2ns1CzXsaM0olmqfDSm2fIzwbChdkxeaiAXw0xhdNPuo/v8nuwxVTLfpf8NxrdlNw==", "dev": true, "license": "MIT", "dependencies": { @@ -6084,23 +5798,6 @@ "i18next-resources-for-ts": "bin/i18next-resources-for-ts.js" } }, - "node_modules/iconv-lite": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz", - "integrity": "sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, "node_modules/ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", @@ -6157,32 +5854,6 @@ "node": ">=8" } }, - "node_modules/inquirer": { - "version": "14.2.2", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-14.2.2.tgz", - "integrity": "sha512-WGerZIIb7mTtaFFskkD/P0europ8xBWf1OXACMiugzKPSmVzoqhcPSuSUzbzMch/t3rf1ncBT3v/0WU73cLqJQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/ansi": "^2.0.8", - "@inquirer/core": "^12.0.3", - "@inquirer/prompts": "^8.7.2", - "@inquirer/type": "4.1.1", - "mute-stream": "^3.0.0", - "run-async": "^4.0.6" - }, - "engines": { - "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" - }, - "peerDependencies": { - "@types/node": ">=18" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, "node_modules/internmap": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz", @@ -6236,32 +5907,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-interactive": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz", - "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-plain-obj": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz", - "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-potential-custom-element-name": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", @@ -6269,32 +5914,6 @@ "dev": true, "license": "MIT" }, - "node_modules/is-stream": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz", - "integrity": "sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-unicode-supported": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz", - "integrity": "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -6731,23 +6350,6 @@ "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", "license": "MIT" }, - "node_modules/log-symbols": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-7.0.1.tgz", - "integrity": "sha512-ja1E3yCr9i/0hmBVaM0bfwDjnGy8I/s6PP4DFp+yP+a+mrHO4Rm7DtmnqROTUkHIkqffC84YY7AeqX6oFk0WFg==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-unicode-supported": "^2.0.0", - "yoctocolors": "^2.1.1" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/loose-envify": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", @@ -6855,6 +6457,16 @@ "dev": true, "license": "CC0-1.0" }, + "node_modules/messageformat": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/messageformat/-/messageformat-4.1.0.tgz", + "integrity": "sha512-ZLId0BYfsNhC6/MRwVFw1yTLgG9cbJwfTsjYSS2C59PdfJWVRsX7hthADvsXefBtTg2FKso0VAJmMJJOtnJ75w==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^20.19 || ^22.12 || >=24" + } + }, "node_modules/mime-db": { "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", @@ -6876,19 +6488,6 @@ "node": ">= 0.6" } }, - "node_modules/mimic-function": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz", - "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/min-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", @@ -6941,6 +6540,19 @@ "node": "^20.17.0 || >=22.9.0" } }, + "node_modules/nano-spawn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/nano-spawn/-/nano-spawn-2.1.0.tgz", + "integrity": "sha512-yTW+2okrElHiH4fsiz/+/zc0EDo9BDDoC3iKk8dpv1GeRc9nUWzUZHx6TofMWErchhUQR8hY9/Eu1Uja9x1nqA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=20.17" + }, + "funding": { + "url": "https://github.com/sindresorhus/nano-spawn?sponsor=1" + } + }, "node_modules/nanoid": { "version": "3.3.20", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.20.tgz", @@ -6991,36 +6603,6 @@ "node": ">=18" } }, - "node_modules/npm-run-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-6.0.0.tgz", - "integrity": "sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-key": "^4.0.0", - "unicorn-magic": "^0.3.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/npm-run-path/node_modules/path-key": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", - "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -7044,22 +6626,6 @@ "node": ">=12.20.0" } }, - "node_modules/onetime": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", - "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-function": "^5.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/optionator": { "version": "0.9.4", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", @@ -7078,42 +6644,6 @@ "node": ">= 0.8.0" } }, - "node_modules/ora": { - "version": "9.4.1", - "resolved": "https://registry.npmjs.org/ora/-/ora-9.4.1.tgz", - "integrity": "sha512-6VlU9MLXbjVQD04AZCMX28hVtA5bUoadvUqO76MUCVA0ilwJbMiHsITRPfyVm6p/BC0Av/BXMujx39WCe1LEqw==", - "dev": true, - "license": "MIT", - "dependencies": { - "chalk": "^5.6.2", - "cli-cursor": "^5.0.0", - "cli-spinners": "^3.2.0", - "is-interactive": "^2.0.0", - "is-unicode-supported": "^2.1.0", - "log-symbols": "^7.0.1", - "stdin-discarder": "^0.3.2", - "string-width": "^8.1.0" - }, - "engines": { - "node": ">=20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ora/node_modules/chalk": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz", - "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -7176,19 +6706,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/parse-ms": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-4.0.0.tgz", - "integrity": "sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/parse5": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/parse5/-/parse5-8.0.1.tgz", @@ -7367,22 +6884,6 @@ "dev": true, "license": "MIT" }, - "node_modules/pretty-ms": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.3.1.tgz", - "integrity": "sha512-HzMy3Geq23nVALD/M2LliU+F+M+gVNsvkQWWqeBZ8HDiCgzo6YPJ/Omrmtq24EFrIsk0a3EkQGEd7bDOo+IhGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "parse-ms": "^4.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/prop-types": { "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", @@ -7505,9 +7006,9 @@ } }, "node_modules/react-i18next": { - "version": "17.0.15", - "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-17.0.15.tgz", - "integrity": "sha512-7uYpx/oBkesLto7cOzOmfITlUBaXHCAcFahmgETMfWr8nbbWRRnVGvz8wsH/xpbNcyoH+NpCcnOQEqWPMO6/hw==", + "version": "17.1.10", + "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-17.1.10.tgz", + "integrity": "sha512-XuUuA/rxukE4hXuR//PN308DuSQkWqKNNWBUj0dDTR087l3+6WLid3NC/w55ALrXA/dtWb7lychJ4rQLR3DCDg==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.29.7", @@ -7785,23 +7286,6 @@ "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" } }, - "node_modules/restore-cursor": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", - "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==", - "dev": true, - "license": "MIT", - "dependencies": { - "onetime": "^7.0.0", - "signal-exit": "^4.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/rolldown": { "version": "1.2.14", "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.14.tgz", @@ -7834,23 +7318,6 @@ "@rolldown/binding-win32-x64-msvc": "1.2.14" } }, - "node_modules/run-async": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-4.0.6.tgz", - "integrity": "sha512-IoDlSLTs3Yq593mb3ZoKWKXMNu3UpObxhgA/Xuid5p4bbfi2jdY1Hj0m1K+0/tEuQTxIGMhQDqGjKb7RuxGpAQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true, - "license": "MIT" - }, "node_modules/saxes": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", @@ -8044,84 +7511,12 @@ "dev": true, "license": "MIT" }, - "node_modules/stdin-discarder": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.3.2.tgz", - "integrity": "sha512-eCPu1qRxPVkl5605OTWF8Wz40b4Mf45NY5LQmVPQ599knfs5QhASUm9GbJ5BDMDOXgrnh0wyEdvzmL//YMlw0A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/string-ts": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/string-ts/-/string-ts-2.3.1.tgz", "integrity": "sha512-xSJq+BS52SaFFAVxuStmx6n5aYZU571uYUnUrPXkPFCfdHyZMMlbP2v2Wx5sNBnAVzq/2+0+mcBLBa3Xa5ubYw==", "dev": true }, - "node_modules/string-width": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.3.0.tgz", - "integrity": "sha512-ZbmZM0JCihQN91dWnxoipT2KOEyHqEyfRXUyjuRhW8b/xnqPDoq4gWEVApTVa9db2wN8mmoikgFBbjh71+cGeQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "get-east-asian-width": "^1.5.0", - "strip-ansi": "^7.1.2" - }, - "engines": { - "node": ">=20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/strip-ansi": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", - "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.2.2" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/strip-ansi/node_modules/ansi-regex": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.3.0.tgz", - "integrity": "sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/strip-final-newline": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-4.0.0.tgz", - "integrity": "sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/strip-indent": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", @@ -8394,19 +7789,6 @@ "devOptional": true, "license": "MIT" }, - "node_modules/unicorn-magic": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz", - "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/unrs-resolver": { "version": "1.12.2", "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.12.2.tgz", @@ -8740,22 +8122,6 @@ "node": ">= 8" } }, - "node_modules/which-command": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/which-command/-/which-command-0.1.0.tgz", - "integrity": "sha512-XZyoF5/5hZtXitIwzrU4NKK+Wtbb9aB9CezUEw2Q0wlYK8NUYQxC1rRXgNueYLtBAJwXIb+/tFVk4dozciNJMA==", - "dev": true, - "license": "MIT", - "bin": { - "which-command": "cli.js" - }, - "engines": { - "node": ">=22" - }, - "funding": { - "url": "https://github.com/sindresorhus/which-command?sponsor=1" - } - }, "node_modules/why-is-node-running": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-3.2.1.tgz", @@ -8854,6 +8220,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/yocto-spinner": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/yocto-spinner/-/yocto-spinner-1.2.2.tgz", + "integrity": "sha512-DODGl1wJjA/s5pnJFKau9lIYHT81lnhob1i3e1TjxZRxEhWRKl74nTbWE6H5KlkViQQTo/Z29YFdxzTZAMY3ng==", + "dev": true, + "license": "MIT", + "dependencies": { + "yoctocolors": "^2.1.1" + }, + "engines": { + "node": ">=18.19" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/yoctocolors": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.2.0.tgz", diff --git a/package.json b/package.json index cd3abc742..19fdfac46 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "eslint-plugin-import-x": "^4.17.1", "eslint-plugin-react-hooks": "^7.1.1", "happy-dom": "^21.0.4", - "i18next-cli": "^1.74.1", + "i18next-cli": "^1.81.0", "jsdom": "^30.1.1", "typescript-eslint": "^8.70.1", "vite": "^8.3.1", From 31c7a2d625ea14665ce3e759ff4a2c2446945305 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Nov 2026 20:04:08 +0000 Subject: [PATCH 26/30] Bump @tanstack/react-query from 5.104.0 to 5.105.1 Bumps [@tanstack/react-query](https://github.com/TanStack/query/tree/HEAD/packages/react-query) from 5.104.0 to 5.105.1. - [Release notes](https://github.com/TanStack/query/releases) - [Changelog](https://github.com/TanStack/query/blob/main/packages/react-query/CHANGELOG.md) - [Commits](https://github.com/TanStack/query/commits/@tanstack/react-query@5.105.1/packages/react-query) --- updated-dependencies: - dependency-name: "@tanstack/react-query" dependency-version: 5.105.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 27 ++++++++++++++++++++++----- package.json | 2 +- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index e73b286af..917b10dcd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "@mui/x-data-grid": "^9.14.0", "@mui/x-date-pickers": "^9.14.0", "@tanstack/react-form": "^1.33.5", - "@tanstack/react-query": "^5.104.0", + "@tanstack/react-query": "^5.105.1", "@vitejs/plugin-react": "^6.1.1", "axios": "^1.20.0", "i18next": "^26.4.2", @@ -2950,6 +2950,7 @@ "version": "5.104.0", "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.104.0.tgz", "integrity": "sha512-JrC2r/JQlXt7khBSdUpsgxNvybzOg+aITa+ARRMlP2AFo93Y8vIqz077rp+e61mJetSZ0T6AJbwW1JHer1vrPQ==", + "dev": true, "license": "MIT", "funding": { "type": "github", @@ -3003,19 +3004,25 @@ } }, "node_modules/@tanstack/react-query": { - "version": "5.104.0", - "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.104.0.tgz", - "integrity": "sha512-e1TZmDCQnWIfiDVryIHeA6Idj+Lfx1hORLOhXS/l5wcgvtVD4yYqbTDl378sGQKIi2cSgb0TEMC9cKK8GGoJEw==", + "version": "5.105.1", + "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.105.1.tgz", + "integrity": "sha512-qcu+/+PtBOjW8qU4/0l47QVmNG7hPOWsCLzP0bTRhE1X7HYa757C4732wXTUH0QhCjTV1yedX8onsCiEwlNYrA==", "license": "MIT", "dependencies": { - "@tanstack/query-core": "5.104.0" + "@tanstack/query-core": "5.105.1" }, "funding": { "type": "github", "url": "https://github.com/sponsors/tannerlinsley" }, "peerDependencies": { + "@types/react": "^18 || ^19", "react": "^18 || ^19" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } }, "node_modules/@tanstack/react-query-devtools": { @@ -3037,6 +3044,16 @@ "react": "^18 || ^19" } }, + "node_modules/@tanstack/react-query/node_modules/@tanstack/query-core": { + "version": "5.105.1", + "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.105.1.tgz", + "integrity": "sha512-B/rNlZoZ54w1dlddiUt9oEe1SLM+37c00SKLJEg9YH+7as3Y54P81o9Fh+2ujZ36tXPnQJ5oVe7AcyEWkyFhPg==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + } + }, "node_modules/@tanstack/react-store": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/@tanstack/react-store/-/react-store-0.11.1.tgz", diff --git a/package.json b/package.json index cd3abc742..41b5531fe 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@mui/x-data-grid": "^9.14.0", "@mui/x-date-pickers": "^9.14.0", "@tanstack/react-form": "^1.33.5", - "@tanstack/react-query": "^5.104.0", + "@tanstack/react-query": "^5.105.1", "@vitejs/plugin-react": "^6.1.1", "axios": "^1.20.0", "i18next": "^26.4.2", From 70ce488f06a09f47e76edc7007a38c35f03d8eee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Nov 2026 20:04:23 +0000 Subject: [PATCH 27/30] Bump vite from 8.3.4 to 8.3.5 Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 8.3.4 to 8.3.5. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v8.3.5/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-version: 8.3.5 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 15 ++++++++------- package.json | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index e73b286af..c92c0b9a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -65,7 +65,7 @@ "i18next-cli": "^1.74.1", "jsdom": "^30.1.1", "typescript-eslint": "^8.70.1", - "vite": "^8.3.1", + "vite": "^8.3.5", "vitest": "^5.0.2" } }, @@ -8518,14 +8518,15 @@ } }, "node_modules/vite": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.4.tgz", - "integrity": "sha512-IftLE8phJhdNRIGNEV4JCCvfNScoZQVfcXaN8TQropWGJtOHcu+iAB9pHcuGvmEb/kddw0LBe/jS8ztdC6xdiQ==", + "version": "8.3.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.5.tgz", + "integrity": "sha512-z1YpjieJ9g0ebTmQpLBv/oq9E3F9EIlOe+7LahW8SrE3LTiG3udBRUXQOlYXP9b+IC2q2phHeVxj9xGlw34OEQ==", + "license": "MIT", "dependencies": { "lightningcss": "^1.33.0", "picomatch": "^4.0.7", - "postcss": "^8.5.29", - "rolldown": "~1.2.12", + "postcss": "^8.5.30", + "rolldown": "~1.2.14", "tinyglobby": "^0.2.17" }, "bin": { @@ -8542,7 +8543,7 @@ }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", - "@vitejs/devtools": "^0.7.1", + "@vitejs/devtools": "^0.7.1 || ^0.8.0", "esbuild": "^0.27.0 || ^0.28.0", "jiti": ">=1.21.0", "less": "^4.0.0", diff --git a/package.json b/package.json index cd3abc742..4334f5a23 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "i18next-cli": "^1.74.1", "jsdom": "^30.1.1", "typescript-eslint": "^8.70.1", - "vite": "^8.3.1", + "vite": "^8.3.5", "vitest": "^5.0.2" }, "scripts": { From 0d169f1edd4d6342be2d5aba9576068f8c1a766f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Nov 2026 20:04:30 +0000 Subject: [PATCH 28/30] Bump react-i18next from 17.0.15 to 17.1.10 Bumps [react-i18next](https://github.com/i18next/react-i18next) from 17.0.15 to 17.1.10. - [Changelog](https://github.com/i18next/react-i18next/blob/master/CHANGELOG.md) - [Commits](https://github.com/i18next/react-i18next/compare/v17.0.15...v17.1.10) --- updated-dependencies: - dependency-name: react-i18next dependency-version: 17.1.10 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index e73b286af..e4326dda8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "react": "^19.3.0", "react-dom": "^19.3.0", "react-grid-layout": "^2.2.4", - "react-i18next": "^17.0.15", + "react-i18next": "^17.1.10", "react-is": "^19.3.0", "react-router-dom": "^7.18.4", "react-simple-wysiwyg": "^3.4.1", @@ -7505,9 +7505,9 @@ } }, "node_modules/react-i18next": { - "version": "17.0.15", - "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-17.0.15.tgz", - "integrity": "sha512-7uYpx/oBkesLto7cOzOmfITlUBaXHCAcFahmgETMfWr8nbbWRRnVGvz8wsH/xpbNcyoH+NpCcnOQEqWPMO6/hw==", + "version": "17.1.10", + "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-17.1.10.tgz", + "integrity": "sha512-XuUuA/rxukE4hXuR//PN308DuSQkWqKNNWBUj0dDTR087l3+6WLid3NC/w55ALrXA/dtWb7lychJ4rQLR3DCDg==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.29.7", diff --git a/package.json b/package.json index cd3abc742..502ea4575 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "react": "^19.3.0", "react-dom": "^19.3.0", "react-grid-layout": "^2.2.4", - "react-i18next": "^17.0.15", + "react-i18next": "^17.1.10", "react-is": "^19.3.0", "react-router-dom": "^7.18.4", "react-simple-wysiwyg": "^3.4.1", From c8ff46e9d86f67d516c7de47de2a64a066752d0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Nov 2026 20:04:42 +0000 Subject: [PATCH 29/30] Bump @testing-library/user-event from 14.6.7 to 14.6.8 Bumps [@testing-library/user-event](https://github.com/testing-library/user-event) from 14.6.7 to 14.6.8. - [Release notes](https://github.com/testing-library/user-event/releases) - [Changelog](https://github.com/testing-library/user-event/blob/main/CHANGELOG.md) - [Commits](https://github.com/testing-library/user-event/compare/v14.6.7...v14.6.8) --- updated-dependencies: - dependency-name: "@testing-library/user-event" dependency-version: 14.6.8 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index e73b286af..ee12e8618 100644 --- a/package-lock.json +++ b/package-lock.json @@ -49,7 +49,7 @@ "@testing-library/dom": "^10.4.2", "@testing-library/jest-dom": "^7.0.1", "@testing-library/react": "^16.3.3", - "@testing-library/user-event": "^14.6.7", + "@testing-library/user-event": "^14.6.8", "@types/lodash": "^4.17.25", "@types/luxon": "^3.7.5", "@types/node": "^24.19.0", @@ -3150,9 +3150,9 @@ } }, "node_modules/@testing-library/user-event": { - "version": "14.6.7", - "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.6.7.tgz", - "integrity": "sha512-MPCpX8bxe8zS+JmmTwLp8jd0dy1rAm60Te/SL8JrQM3qvQJcBOs1d7IefJMyZzqM3EWBrDn/LWDt1BCGu4ASfg==", + "version": "14.6.8", + "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.6.8.tgz", + "integrity": "sha512-vgSSqnANMnkcYR/vUNDbwS7aM3OErRLNUG8vCVVlj4oc6cKffUrccX7UAS5AmJQQNZTSibi9z5GvvRZ0aYgUCQ==", "dev": true, "license": "MIT", "engines": { diff --git a/package.json b/package.json index cd3abc742..94f2d1e5f 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "@testing-library/dom": "^10.4.2", "@testing-library/jest-dom": "^7.0.1", "@testing-library/react": "^16.3.3", - "@testing-library/user-event": "^14.6.7", + "@testing-library/user-event": "^14.6.8", "@types/lodash": "^4.17.25", "@types/luxon": "^3.7.5", "@types/node": "^24.19.0", From 5916aee1a1428d37f89f3ddf7880c27fca24cb56 Mon Sep 17 00:00:00 2001 From: "Matthew Emerson Spotnitz, PhD" Date: Wed, 4 Nov 2026 23:02:19 -0700 Subject: [PATCH 30/30] fix: preserve repeated-hour diary timestamps in the date picker --- .../forms/NutritionDiaryEntryForm.test.tsx | 26 +++++++++++++++++++ .../widgets/forms/NutritionDiaryEntryForm.tsx | 10 ++++--- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.test.tsx b/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.test.tsx index 01f915acd..9222486e7 100644 --- a/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.test.tsx +++ b/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.test.tsx @@ -16,6 +16,7 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; import { render, screen, within } from '@testing-library/react'; import userEvent, { UserEvent } from "@testing-library/user-event"; import React from 'react'; +import { Settings } from 'luxon'; import type { Mock } from 'vitest'; vi.mock('@/components/Nutrition/queries'); @@ -63,6 +64,31 @@ describe('Test the NutritionDiaryEntryForm component', () => { (useSearchIngredientQuery as Mock).mockImplementation(() => searchIngredient); }); + test.each([ + ['2026-10-25T00:30:15.123Z', '25', '2026-10-25T00:30:15.123Z'], + ['2026-10-25T01:30:15.123Z', '25', '2026-10-25T01:30:15.123Z'], + ['2026-10-25T00:30:15.123Z', '26', '2026-10-26T01:30:15.123Z'], + ])('calendar selection preserves the intended instant (%s, day %s)', async (initial, day, expected) => { + const previousZone = Settings.defaultZone; + Settings.defaultZone = 'Europe/Berlin'; + try { + const user = userEvent.setup(); + const entry = DiaryEntry.clone(TEST_DIARY_ENTRY_1, { datetime: new Date(initial) }); + render(); + await user.click(screen.getByRole('button', { name: /choose date/i })); + await user.click(await screen.findByRole('gridcell', { name: day })); + const accept = screen.queryByRole('button', { name: 'OK' }); + if (accept) await user.click(accept); + await user.click(screen.getByRole('button', { name: 'submit' })); + expect(mutateEditMock).toHaveBeenCalledOnce(); + const saved = mutateEditMock.mock.calls[0][0] as DiaryEntry; + expect(saved.datetime.toISOString()).toBe(expected); + expect(entry.datetime.toISOString()).toBe(initial); + } finally { + Settings.defaultZone = previousZone; + } + }); + test('clearing a serving unit saves null without mutating the source entry', async () => { const user = userEvent.setup(); diff --git a/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.tsx b/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.tsx index eb490ce34..d3e665901 100644 --- a/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.tsx +++ b/src/components/Nutrition/widgets/forms/NutritionDiaryEntryForm.tsx @@ -181,9 +181,13 @@ export const NutritionDiaryEntryForm = ({ planId, entry, mealId, meals, closeFn, value={dateValue} disableFuture={true} onChange={(newValue) => { - form.setFieldValue('datetime', newValue?.toJSDate() ?? null); - - setDateValue(newValue); + // Calendar selection starts at midnight, whose offset can + // differ from the selected occurrence of a repeated hour. + const resolved = newValue?.isValid && dateValue?.isValid + ? newValue.getPossibleOffsets().find(candidate => candidate.offset === dateValue.offset) ?? newValue + : newValue; + form.setFieldValue('datetime', resolved?.toJSDate() ?? null); + setDateValue(resolved); }} shouldDisableDate={(date) => {