Skip to content

Fix current locale arg type error #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matiboux merged 1 commit into from
Aug 28, 2026
Merged

Fix current locale arg type error #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions app/src/components/explore/LoginStatus.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
import LoginStatusText from '~/components/explore/LoginStatusText.svelte'
import Logout from '~/components/explore/Logout.svelte'

// import { i18nFactory } from '~/i18n'
// import type { Locales } from '~/i18n'
// const _ = i18nFactory(Astro.currentLocale as Locales | undefined)
import { defaultLocale } from '~/i18n'
import type { Locales } from '~/i18n'
const locale = (Astro.currentLocale as Locales | undefined) ?? defaultLocale
---

<div class="login-status-wrapper">
<div class="login-status">
<LoginStatusText client:visible locale={Astro.currentLocale} />
<LoginStatusText client:visible locale={locale} />
</div>
<div class="logout">
<Logout client:visible locale={Astro.currentLocale} logoutRedirect="/" />
<Logout client:visible locale={locale} logoutRedirect="/" />
</div>
</div>

Expand Down
6 changes: 5 additions & 1 deletion app/src/components/explore/content/ExploreView.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
---
import CollectionView from '~/components/explore/content/CollectionView.svelte'

import { defaultLocale } from '~/i18n'
import type { Locales } from '~/i18n'
const locale = (Astro.currentLocale as Locales | undefined) ?? defaultLocale
---

<CollectionView client:visible locale={Astro.currentLocale} />
<CollectionView client:visible locale={locale} />
5 changes: 3 additions & 2 deletions app/src/pages/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ import LocaleSwitch from '~/components/LocaleSwitch.astro'
import Login from '~/components/Login.svelte'
import Footer from '~/components/Footer.astro'

import { i18nFactory } from '~/i18n'
import { defaultLocale, i18nFactory } from '~/i18n'
import type { Locales } from '~/i18n'
const _ = i18nFactory(Astro.currentLocale as Locales | undefined)
const locale = (Astro.currentLocale as Locales | undefined) ?? defaultLocale
---

<Layout
Expand All @@ -28,7 +29,7 @@ const _ = i18nFactory(Astro.currentLocale as Locales | undefined)
</p>
}

<Login client:visible locale={Astro.currentLocale} />
<Login client:visible locale={locale} />
</div>

<Footer class="w-full" />
Expand Down
Loading