fix(SW-184): added translations

2024-08-26 08:41:26 +02:00
parent a02dcd3428
commit f1242e69e3
14 changed files with 55 additions and 20 deletions
--- a/app/globals.css
+++ b/app/globals.css
@@ -105,6 +105,7 @@
  --mobile-site-header-height: 70.047px;
  --max-width-navigation: 89.5rem;
  --main-menu-mobile-height: 75px;
+  --mobile-menu-overlay-z-index: 10;
 }

 * {
--- a/components/Header/MainMenu/MobileMenu/index.tsx
+++ b/components/Header/MainMenu/MobileMenu/index.tsx
@@ -47,9 +47,10 @@ export default function MobileMenu({
      <button
        type="button"
        className={`${styles.hamburger} ${isHamburgerMenuOpen || isMyPagesMobileMenuOpen ? styles.isExpanded : ""}`}
-        aria-pressed="false"
-        aria-label={intl.formatMessage({ id: "Menu" })}
-        onClick={toggleHamburgerMenu}
+        aria-label={intl.formatMessage({
+          id: isHamburgerMenuOpen ? "Close menu" : "Open menu",
+        })}
+        onClick={handleHamburgerClick}
      >
        <span className={styles.bar}></span>
      </button>
--- a/components/Header/MainMenu/MobileMenu/mobileMenu.module.css
+++ b/components/Header/MainMenu/MobileMenu/mobileMenu.module.css
@@ -72,6 +72,7 @@
  width: 100%;
  background-color: var(--Base-Surface-Primary-light-Normal);
  transition: right 0.3s;
+  z-index: var(--mobile-menu-overlay-z-index);
 }

 .modal[data-entering] {
--- a/components/Header/MainMenu/MyPagesMobileMenu/index.tsx
+++ b/components/Header/MainMenu/MyPagesMobileMenu/index.tsx
@@ -35,6 +35,7 @@ export default function MyPagesMobileMenu({
      <MainMenuButton
        className={styles.button}
        onClick={toggleMyPagesMobileMenu}
+        aria-label={intl.formatMessage({ id: "Open my pages menu" })}
      >
        <Avatar initials={getInitials(user.firstName, user.lastName)} />
      </MainMenuButton>
--- a/components/Header/MainMenu/MyPagesMobileMenu/myPagesMobileMenu.module.css
+++ b/components/Header/MainMenu/MyPagesMobileMenu/myPagesMobileMenu.module.css
@@ -16,6 +16,7 @@
  width: 100%;
  background-color: var(--Base-Surface-Primary-light-Normal);
  transition: right 0.3s;
+  z-index: var(--mobile-menu-overlay-z-index);
 }

 .modal[data-entering] {
--- a/components/Header/MainMenu/index.tsx
+++ b/components/Header/MainMenu/index.tsx
@@ -44,10 +44,16 @@ export default async function MainMenu({ languageUrls }: MainMenuProps) {
        </NextLink>
        <div className={styles.menus}>
          <NavigationMenu items={navigationMenuItems} />
-          {user ? (
+          {true ? (
            <>
-              <MyPagesMenu navigation={myPagesNavigation} user={user} />
-              <MyPagesMobileMenu navigation={myPagesNavigation} user={user} />
+              <MyPagesMenu
+                navigation={myPagesNavigation}
+                user={{ firstName: "Hubba", lastName: "Bubba" }}
+              />
+              <MyPagesMobileMenu
+                navigation={myPagesNavigation}
+                user={{ firstName: "Hubba", lastName: "Bubba" }}
+              />
            </>
          ) : (
            <Link
--- a/components/LanguageSwitcher/LanguageSwitcherContent/index.tsx
+++ b/components/LanguageSwitcher/LanguageSwitcherContent/index.tsx
@@ -8,7 +8,6 @@ import useDropdownStore from "@/stores/main-menu"
 import { CheckIcon, ChevronLeftIcon } from "@/components/Icons"
 import Link from "@/components/TempDesignSystem/Link"
 import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
-import { useHandleKeyUp } from "@/hooks/useHandleKeyUp"
 import useLang from "@/hooks/useLang"
 import { useTrapFocus } from "@/hooks/useTrapFocus"

@@ -22,16 +21,10 @@ export default function LanguageSwitcherContent({
 }: LanguageSwitcherProps) {
  const intl = useIntl()
  const currentLanguage = useLang()
-  const { isLanguageSwitcherOpen, toggleLanguageSwitcher } = useDropdownStore()
+  const { toggleLanguageSwitcher } = useDropdownStore()
  const languageSwitcherRef = useTrapFocus()
  const urlKeys = Object.keys(urls) as Lang[]

-  useHandleKeyUp((event: KeyboardEvent) => {
-    if (event.key === "Escape" && isLanguageSwitcherOpen) {
-      toggleLanguageSwitcher()
-    }
-  })
-
  return (
    <div className={styles.content} ref={languageSwitcherRef}>
      {variant === "mobileHeader" ? (
--- a/components/LanguageSwitcher/index.tsx
+++ b/components/LanguageSwitcher/index.tsx
@@ -6,6 +6,7 @@ import { languages } from "@/constants/languages"
 import useDropdownStore from "@/stores/main-menu"

 import { ChevronDownIcon, GlobeIcon } from "@/components/Icons"
+import { useHandleKeyUp } from "@/hooks/useHandleKeyUp"
 import useLang from "@/hooks/useLang"

 import LanguageSwitcherContent from "./LanguageSwitcherContent"
@@ -22,6 +23,12 @@ export default function LanguageSwitcher({
  const currentLanguage = useLang()
  const { toggleLanguageSwitcher, isLanguageSwitcherOpen } = useDropdownStore()

+  useHandleKeyUp((event: KeyboardEvent) => {
+    if (event.key === "Escape" && isLanguageSwitcherOpen) {
+      toggleLanguageSwitcher()
+    }
+  })
+
  return (
    <div className={styles.languageSwitcher}>
      <button
--- a/i18n/dictionaries/da.json
+++ b/i18n/dictionaries/da.json
@@ -35,6 +35,9 @@
  "City/State": "By/Stat",
  "Click here to log in": "Klik her for at logge ind",
  "Close": "Tæt",
+  "Close language menu": "Luk sprogmenu",
+  "Close menu": "Luk menu",
+  "Close my pages menu": "Luk mine sider menu",
  "Coming up": "Er lige om hjørnet",
  "Compare all levels": "Sammenlign alle niveauer",
  "Contact us": "Kontakt os",
@@ -94,8 +97,6 @@
  "Member price from": "Medlemspris fra",
  "Members": "Medlemmer",
  "Membership cards": "Medlemskort",
-  "Close language menu": "Luk sprogmenu",
-  "Open language menu": "Åbn sprogmenuen",
  "Membership ID": "Medlems-id",
  "Menu": "Menu",
  "Modify": "Ændre",
@@ -122,6 +123,9 @@
  "number": "nummer",
  "On your journey": "På din rejse",
  "Open": "Åben",
+  "Open language menu": "Åbn sprogmenuen",
+  "Open menu": "Åbn menuen",
+  "Open my pages menu": "Åbn mine sider menuen",
  "or": "eller",
  "Overview": "Oversigt",
  "Password": "Adgangskode",
--- a/i18n/dictionaries/de.json
+++ b/i18n/dictionaries/de.json
@@ -35,6 +35,8 @@
  "Click here to log in": "Klicken Sie hier, um sich einzuloggen",
  "Close": "Schließen",
  "Close language menu": "Sprachmenü schließen",
+  "Close menu": "Menü schließen",
+  "Close my pages menu": "Meine Seiten Menü schließen",
  "Coming up": "Demnächst",
  "Compare all levels": "Vergleichen Sie alle Levels",
  "Contact us": "Kontaktieren Sie uns",
@@ -120,6 +122,8 @@
  "On your journey": "Auf deiner Reise",
  "Open": "Offen",
  "Open language menu": "Sprachmenü öffnen",
+  "Open menu": "Menü öffnen",
+  "Open my pages menu": "Meine Seiten Menü öffnen",
  "or": "oder",
  "Password": "Passwort",
  "Pay later": "Später bezahlen",
--- a/i18n/dictionaries/en.json
+++ b/i18n/dictionaries/en.json
@@ -36,7 +36,8 @@
  "Click here to log in": "Click here to log in",
  "Close": "Close",
  "Close language menu": "Close language menu",
-  "Open language menu": "Open language menu",
+  "Close menu": "Close menu",
+  "Close my pages menu": "Close my pages menu",
  "Coming up": "Coming up",
  "Compare all levels": "Compare all levels",
  "Contact us": "Contact us",
@@ -127,6 +128,9 @@
  "number": "number",
  "On your journey": "On your journey",
  "Open": "Open",
+  "Open language menu": "Open language menu",
+  "Open menu": "Open menu",
+  "Open my pages menu": "Open my pages menu",
  "or": "or",
  "Overview": "Overview",
  "Password": "Password",
--- a/i18n/dictionaries/fi.json
+++ b/i18n/dictionaries/fi.json
@@ -36,7 +36,8 @@
  "Click here to log in": "Napsauta tästä kirjautuaksesi sisään",
  "Close": "Kiinni",
  "Close language menu": "Sulje kielivalikko",
-  "Open language menu": "Avaa kielivalikko",
+  "Close menu": "Sulje valikko",
+  "Close my pages menu": "Sulje omat sivut -valikko",
  "Coming up": "Tulossa",
  "Compare all levels": "Vertaa kaikkia tasoja",
  "Contact us": "Ota meihin yhteyttä",
@@ -121,6 +122,9 @@
  "number": "määrä",
  "On your journey": "Matkallasi",
  "Open": "Avata",
+  "Open language menu": "Avaa kielivalikko",
+  "Open menu": "Avaa valikko",
+  "Open my pages menu": "Avaa omat sivut -valikko",
  "or": "tai",
  "Overview": "Yleiskatsaus",
  "Password": "Salasana",
--- a/i18n/dictionaries/no.json
+++ b/i18n/dictionaries/no.json
@@ -35,6 +35,9 @@
  "City/State": "By/Stat",
  "Click here to log in": "Klikk her for å logge inn",
  "Close": "Lukk",
+  "Close language menu": "Lukk språkmeny",
+  "Close menu": "Lukk meny",
+  "Close my pages menu": "Lukk mine sidermenyn",
  "Coming up": "Kommer opp",
  "Compare all levels": "Sammenlign alle nivåer",
  "Contact us": "Kontakt oss",
@@ -118,10 +121,11 @@
  "Not found": "Ikke funnet",
  "Nr night, nr adult": "{nights, number} natt, {adults, number} voksen",
  "number": "antall",
-  "Close language menu": "Lukk språkmeny",
-  "Open language menu": "Åpne språkmenyen",
  "On your journey": "På reisen din",
  "Open": "Åpen",
+  "Open language menu": "Åpne språkmenyen",
+  "Open menu": "Åpne menyen",
+  "Open my pages menu": "Åpne mine sider menyen",
  "or": "eller",
  "Overview": "Oversikt",
  "Password": "Passord",
--- a/i18n/dictionaries/sv.json
+++ b/i18n/dictionaries/sv.json
@@ -36,6 +36,8 @@
  "Click here to log in": "Klicka här för att logga in",
  "Close": "Stäng",
  "Close language menu": "Stäng språkmenyn",
+  "Close menu": "Stäng menyn",
+  "Close my pages menu": "Stäng mina sidor menyn",
  "Coming up": "Kommer härnäst",
  "Compare all levels": "Jämför alla nivåer",
  "Contact us": "Kontakta oss",
@@ -124,6 +126,8 @@
  "On your journey": "På din resa",
  "Open": "Öppna",
  "Open language menu": "Öppna språkmenyn",
+  "Open menu": "Öppna menyn",
+  "Open my pages menu": "Öppna mina sidor menyn",
  "or": "eller",
  "Overview": "Översikt",
  "Password": "Lösenord",