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/auth/change-password/+page.ts
+2 -2
View File
@@ -1,8 +1,8 @@
import { AppRoute } from '$lib/constants';
import { user } from '$lib/stores/user.store';
import { authenticate } from '$lib/utils/auth';
import { getFormatter } from '$lib/utils/i18n';
import { redirect } from '@sveltejs/kit';
import { t } from 'svelte-i18n';
import { get } from 'svelte/store';
import type { PageLoad } from './$types';
@@ -12,7 +12,7 @@ export const load = (async () => {
redirect(302, AppRoute.PHOTOS);
}
const $t = get(t);
const $t = await getFormatter();
return {
meta: {
web/src/routes/auth/login/+page.ts
+2 -3
View File
@@ -1,8 +1,7 @@
import { AppRoute } from '$lib/constants';
import { getFormatter } from '$lib/utils/i18n';
import { defaults, getServerConfig } from '@immich/sdk';
import { redirect } from '@sveltejs/kit';
import { t } from 'svelte-i18n';
import { get } from 'svelte/store';
import type { PageLoad } from './$types';
export const load = (async ({ fetch }) => {
@@ -13,7 +12,7 @@ export const load = (async ({ fetch }) => {
redirect(302, AppRoute.AUTH_REGISTER);
}
const $t = get(t);
const $t = await getFormatter();
return {
meta: {
title: $t('login'),
web/src/routes/auth/onboarding/+page.ts
+2 -3
View File
@@ -1,14 +1,13 @@
import { loadConfig } from '$lib/stores/server-config.store';
import { authenticate } from '$lib/utils/auth';
import { t } from 'svelte-i18n';
import { get } from 'svelte/store';
import { getFormatter } from '$lib/utils/i18n';
import type { PageLoad } from './$types';
export const load = (async () => {
await authenticate({ admin: true });
await loadConfig();
const $t = get(t);
const $t = await getFormatter();
return {
meta: {
web/src/routes/auth/register/+page.ts
+2 -3
View File
@@ -1,8 +1,7 @@
import { AppRoute } from '$lib/constants';
import { getFormatter } from '$lib/utils/i18n';
import { getServerConfig } from '@immich/sdk';
import { redirect } from '@sveltejs/kit';
import { t } from 'svelte-i18n';
import { get } from 'svelte/store';
import type { PageLoad } from './$types';
export const load = (async () => {
@@ -12,7 +11,7 @@ export const load = (async () => {
redirect(302, AppRoute.AUTH_LOGIN);
}
const $t = get(t);
const $t = await getFormatter();
return {
meta: {