Fixed language not switching
All checks were successful
Build and deploy website / build (push) Successful in 1m6s
All checks were successful
Build and deploy website / build (push) Successful in 1m6s
This commit is contained in:
@ -1,6 +0,0 @@
|
|||||||
import { paraglideMiddleware } from "@/paraglide/server";
|
|
||||||
import { defineMiddleware } from "astro/middleware"
|
|
||||||
|
|
||||||
export const onRequest = defineMiddleware((context, next) => {
|
|
||||||
return paraglideMiddleware(context.request, () => next());
|
|
||||||
});
|
|
@ -2,11 +2,12 @@
|
|||||||
import GiteaLink from "./links/GiteaLink.astro"
|
import GiteaLink from "./links/GiteaLink.astro"
|
||||||
import PajamasIcon from "./icons/PajamasIcon.astro"
|
import PajamasIcon from "./icons/PajamasIcon.astro"
|
||||||
import ExternalLink from "./links/ExternalLink.astro"
|
import ExternalLink from "./links/ExternalLink.astro"
|
||||||
import LanguageButtonGroup from "./LanguageButtonGroup.astro"
|
import LanguageButtonGroup from "./LanguageButtonGroup.svelte"
|
||||||
import { GIT_URL, STATUS_URL } from "astro:env/client"
|
import { GIT_URL, STATUS_URL } from "astro:env/client"
|
||||||
import * as m from "@/paraglide/messages"
|
import * as m from "@/paraglide/messages"
|
||||||
|
|
||||||
const giteaLink = `${GIT_URL}/martials/martials.no`
|
const giteaLink = `${GIT_URL}/martials/martials.no`
|
||||||
|
const pathname = Astro.url.pathname
|
||||||
---
|
---
|
||||||
|
|
||||||
<div class="divider bg-inherit"></div>
|
<div class="divider bg-inherit"></div>
|
||||||
@ -28,5 +29,5 @@ const giteaLink = `${GIT_URL}/martials/martials.no`
|
|||||||
{m.status()}
|
{m.status()}
|
||||||
</ExternalLink>
|
</ExternalLink>
|
||||||
</div>
|
</div>
|
||||||
<LanguageButtonGroup />
|
<LanguageButtonGroup client:load />
|
||||||
</div>
|
</div>
|
||||||
|
@ -15,7 +15,7 @@ const isEnglish = pathname.startsWith("/en")
|
|||||||
class:list={[
|
class:list={[
|
||||||
"btn join-item !text-cat-text border-cat-surface0",
|
"btn join-item !text-cat-text border-cat-surface0",
|
||||||
!isEnglish ? "bg-cat-mantle" : "bg-cat-base",
|
!isEnglish ? "bg-cat-mantle" : "bg-cat-base",
|
||||||
]}>Norsk</LocaleLink
|
]} client:load>Norsk</LocaleLink
|
||||||
>
|
>
|
||||||
<LocaleLink
|
<LocaleLink
|
||||||
to={currentPath as NavLink}
|
to={currentPath as NavLink}
|
||||||
@ -23,6 +23,6 @@ const isEnglish = pathname.startsWith("/en")
|
|||||||
class:list={[
|
class:list={[
|
||||||
"btn join-item !text-cat-text border-cat-surface0",
|
"btn join-item !text-cat-text border-cat-surface0",
|
||||||
isEnglish ? "bg-cat-mantle" : "bg-cat-base",
|
isEnglish ? "bg-cat-mantle" : "bg-cat-base",
|
||||||
]}>English</LocaleLink
|
]} client:load>English</LocaleLink
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
|
29
src/components/LanguageButtonGroup.svelte
Normal file
29
src/components/LanguageButtonGroup.svelte
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { getLocale, type Locale, setLocale } from "@/paraglide/runtime"
|
||||||
|
|
||||||
|
const isEnglish = getLocale() === "en"
|
||||||
|
|
||||||
|
function updateLocale(lang: Locale) {
|
||||||
|
setLocale(lang)
|
||||||
|
}
|
||||||
|
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="join">
|
||||||
|
<button
|
||||||
|
onclick={() => updateLocale("nb")}
|
||||||
|
class={[
|
||||||
|
"btn join-item !text-cat-text border-cat-surface0",
|
||||||
|
!isEnglish ? "bg-cat-mantle" : "bg-cat-base",
|
||||||
|
]}>Norsk
|
||||||
|
</button
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
onclick={() => updateLocale("en")}
|
||||||
|
class={[
|
||||||
|
"btn join-item !text-cat-text border-cat-surface0",
|
||||||
|
isEnglish ? "bg-cat-mantle" : "bg-cat-base",
|
||||||
|
]}>English
|
||||||
|
</button
|
||||||
|
>
|
||||||
|
</div>
|
@ -11,6 +11,7 @@ interface Props extends ComponentProps {
|
|||||||
const { to, class: clazz, lang = getLocale() } = Astro.props
|
const { to, class: clazz, lang = getLocale() } = Astro.props
|
||||||
---
|
---
|
||||||
|
|
||||||
|
<!-- TODO currently not working on Paraglide 2 https://github.com/opral/inlang-paraglide-js/issues/472 -->
|
||||||
<a href={localizeHref(to, { locale: lang })} class={clazz}>
|
<a href={localizeHref(to, { locale: lang })} class={clazz}>
|
||||||
<slot />
|
<slot />
|
||||||
</a>
|
</a>
|
||||||
|
6
src/middleware.ts
Normal file
6
src/middleware.ts
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
import { paraglideMiddleware } from "@/paraglide/server"
|
||||||
|
import { defineMiddleware } from "astro/middleware"
|
||||||
|
|
||||||
|
export const onRequest = defineMiddleware((context, next) => {
|
||||||
|
return paraglideMiddleware(context.request, () => next());
|
||||||
|
});
|
Reference in New Issue
Block a user