scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in fix/my-pages-menu-not-translated (pull request #2045)

Browse Source 
fix: my pages menu not translated

* fix: my pages menu not translated
fix: able to pass lang to getIntl()


Approved-by: Michael Zetterberg
This commit is contained in:
Joakim Jäderberg
2025-05-12 07:57:11 +00:00
parent cbc0175979
commit cbbde963dc
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/scandic-web/i18n/index.ts
View File

@@ -16,8 +16,8 @@ export async function getMessages(lang: Lang): Promise<Record<string, string>> {
return (await import(`./dictionaries/${lang}.json`)).default return (await import(`./dictionaries/${lang}.json`)).default
} }
export async function getIntl() { export async function getIntl(options?: { lang: Lang | undefined }) {
const lang = getLang() const lang = options?.lang || getLang()
if (!instances[lang]) { if (!instances[lang]) {
const messages = await getMessages(lang) const messages = await getMessages(lang)

3
apps/scandic-web/server/routers/navigation/mypages/getPrimaryLinks.ts
View File

@@ -19,7 +19,8 @@ export const getPrimaryLinks = cache(
lang: Lang lang: Lang
userLoyalty: UserLoyalty userLoyalty: UserLoyalty
}): Promise<MyPagesLink[]> => { }): Promise<MyPagesLink[]> => {
const intl = await getIntl() const intl = await getIntl({ lang })
const showSASLink = isScandicXSASActive(userLoyalty) const showSASLink = isScandicXSASActive(userLoyalty)
const [showTeamMemberLink] = await safeTry(showTeamMemberCard()) const [showTeamMemberLink] = await safeTry(showTeamMemberCard())

2
apps/scandic-web/server/routers/navigation/mypages/getSecondaryLinks.ts
View File

@@ -10,7 +10,7 @@ export async function getSecondaryLinks({
}: { }: {
lang: Lang lang: Lang
}): Promise<MyPagesLink[]> { }): Promise<MyPagesLink[]> {
const intl = await getIntl() const intl = await getIntl({ lang })
const menuItems: MyPagesLink[] = [ const menuItems: MyPagesLink[] = [
{ {
type: "link", type: "link",