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

fix: my pages menu not translated

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


Approved-by: Michael Zetterberg

apps/scandic-web/i18n/index.ts

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

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

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

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

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