diff --git a/package.json b/package.json index 9dd0c54b..2c3f51f5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photon-lemmy", - "version": "2.4.0", + "version": "2.4.3", "license": "AGPL-3.0-only", "devDependencies": { "@capacitor/android": "^8.4.2", diff --git a/src/app.html b/src/app.html index f57b7c66..f5d196bd 100644 --- a/src/app.html +++ b/src/app.html @@ -1,5 +1,5 @@ - + diff --git a/src/hooks.server.ts b/src/hooks.server.ts index 6d814d89..cb6717b1 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -1,4 +1,18 @@ -import type { HandleServerError } from '@sveltejs/kit' +import { aliases, loadTranslations, locales } from '$lib/app/i18n' +import { getDefaultTheme } from '$lib/app/theme/presets' +import { calculateVars } from '$lib/app/theme/theme.svelte' +import type { Handle, HandleServerError } from '@sveltejs/kit' +import { get } from 'svelte/store' + +// from https://github.com/mudkipdev/rephoton/commit/af81260173943ed054296ac64fb55555ff3460b9 +export const handle: Handle = async ({ event, resolve }) => { + await parseLanguages(event.request) + + return await resolve(event, { + transformPageChunk: (page) => + page.html.replace('/*THEME_VARS*/', calculateVars(getDefaultTheme())), + }) +} export const handleError: HandleServerError = async ({ error, @@ -14,3 +28,21 @@ export const handleError: HandleServerError = async ({ console.error(`Status:`, status) console.error(`Message:`, message) } + +const parseLanguages = async (request: Request) => { + const languages = request.headers.get('Accept-Language')?.split(',') + const currentLocales = get(locales) + + let preferredLanguage = 'en' + if (languages) { + for (const lang of languages.reverse()) { + const splitLang = lang.split(';')[0] + if (currentLocales.includes(splitLang) || aliases.get(splitLang)) { + preferredLanguage = aliases.get(splitLang) || splitLang + } + } + } + + await loadTranslations(preferredLanguage) + return +} diff --git a/src/lib/ui/shared/popover/Portal.svelte b/src/lib/ui/shared/popover/Portal.svelte index 37537b98..db09e70a 100644 --- a/src/lib/ui/shared/popover/Portal.svelte +++ b/src/lib/ui/shared/popover/Portal.svelte @@ -19,7 +19,9 @@ }) onDestroy(() => { - portal.remove() + if (browser) { + portal.remove() + } }) interface Props { diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 30aed00c..f6e858e5 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -41,31 +41,29 @@ showSpinner: false, }) - App.addListener('backButton', () => { - history.back() - }) - - if (Capacitor.isNativePlatform()) { - navigator.vibrate = (pattern: VibratePattern | Iterable) => { - Haptics.vibrate({ - // @ts-expect-error Iterable is a thing - duration: (Array.isArray(pattern) ? pattern[0] : pattern) ?? 100, - }) - - return true - } - } - onMount(() => { - if (browser) { - if (window.location.hash == 'main') { - history.replaceState( - null, - '', - window.location.toString().replace('#main', ''), - ) + if (window.location.hash == 'main') { + history.replaceState( + null, + '', + window.location.toString().replace('#main', ''), + ) + } + document.body.querySelector('.loader')?.classList.add('hidden') + + App.addListener('backButton', () => { + history.back() + }) + + if (Capacitor.isNativePlatform()) { + navigator.vibrate = (pattern: VibratePattern | Iterable) => { + Haptics.vibrate({ + // @ts-expect-error Iterable is a thing + duration: (Array.isArray(pattern) ? pattern[0] : pattern) ?? 100, + }) + + return true } - document.body.querySelector('.loader')?.classList.add('hidden') } })