cjones/immich
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(web): i18n race condition in load function (#10693)

Browse Source
This commit is contained in:
Michel Heusschen
2024-06-29 18:29:56 +02:00
committed by GitHub
parent 24c1855899
commit 8f553ddb39
31 changed files with 74 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/routes/(user)/people/+page.ts
+2 -3
View File
@@ -1,14 +1,13 @@
import { authenticate } from '$lib/utils/auth';
import { getFormatter } from '$lib/utils/i18n';
import { getAllPeople } from '@immich/sdk';
import { t } from 'svelte-i18n';
import { get } from 'svelte/store';
import type { PageLoad } from './$types';
export const load = (async () => {
await authenticate();
const people = await getAllPeople({ withHidden: true });
const $t = get(t);
const $t = await getFormatter();
return {
people,
web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.ts
+2 -3
View File
@@ -1,8 +1,7 @@
import { authenticate } from '$lib/utils/auth';
import { getFormatter } from '$lib/utils/i18n';
import { getAssetInfoFromParam } from '$lib/utils/navigation';
import { getPerson, getPersonStatistics } from '@immich/sdk';
import { t } from 'svelte-i18n';
import { get } from 'svelte/store';
import type { PageLoad } from './$types';
export const load = (async ({ params }) => {
@@ -13,7 +12,7 @@ export const load = (async ({ params }) => {
getPersonStatistics({ id: params.personId }),
getAssetInfoFromParam(params),
]);
const $t = get(t);
const $t = await getFormatter();
return {
person,