Merge branch 'bose/3467' into staging

Author: BorghildSelle

web/core/Link/BaseLink.tsx

@@ -1,7 +1,7 @@
-import { AnchorHTMLAttributes, forwardRef } from 'react'
-import NextLink, { LinkProps } from 'next/link'
+import NextLink, { type LinkProps } from 'next/link'
+import { type AnchorHTMLAttributes, forwardRef } from 'react'
 import { twMerge } from 'tailwind-merge'
-import { LinkType } from '../../types/index'
+import type { LinkType } from '../../types/index'
 
 export type BaseLinkProps = {
   /** What kind of content is it  */
@@ -18,7 +18,7 @@ export type BaseLinkProps = {
  * And the strict origin policy when external for using blank
  */
 export const BaseLink = forwardRef<HTMLAnchorElement, BaseLinkProps>(function BaseLink(
-  { children, type = 'internalUrl', className = '', href = '', skipInternalStyle = false },
+  { children, type = 'internalUrl', className = '', href = '', skipInternalStyle = false, locale },
   ref,
 ) {
   const classNames = skipInternalStyle
@@ -65,7 +65,7 @@ export const BaseLink = forwardRef<HTMLAnchorElement, BaseLinkProps>(function Ba
 
       default:
         return (
-          <NextLink ref={ref} href={href} prefetch={false} className={classNames}>
+          <NextLink ref={ref} href={href} locale={locale} prefetch={false} className={classNames}>
             {children}
           </NextLink>
         )

web/core/Link/ResourceLink.tsx

@@ -1,6 +1,5 @@
 import { add, calendar } from '@equinor/eds-icons'
 import { forwardRef } from 'react'
-import { useIntl } from 'react-intl'
 import { ArrowRight } from '../../icons'
 import { TransformableIcon } from '../../icons/TransformableIcon'
 import envisTwMerge from '../../twMerge'
@@ -100,6 +99,7 @@ export const ResourceLink = forwardRef<HTMLAnchorElement, ResourceLinkProps>(fun
     href = '',
     isAttachment = false,
     file,
+    locale,
   },
   ref,
 ) {
@@ -143,9 +143,7 @@ export const ResourceLink = forwardRef<HTMLAnchorElement, ResourceLinkProps>(fun
         ? `underline 
         hover:text-norwegian-woods-100 
         dark:hover:text-slate-blue-95`
-        : `border-b
-    border-grey-50
-    dark:border-white-100 no-underline`
+        : `border-b border-grey-50 dark:border-white-100 no-underline`
     }
     ${variantClassName[variant]}
   `,
@@ -184,7 +182,7 @@ export const ResourceLink = forwardRef<HTMLAnchorElement, ResourceLinkProps>(fun
   }
 
   return href ? (
-    <BaseLink className={classNames} type={type} ref={ref} href={href}>
+    <BaseLink className={classNames} type={type} ref={ref} href={href} locale={locale}>
       <span
         className={envisTwMerge(
           `h-full

web/lib/localization.ts

@@ -1,4 +1,4 @@
-import { languages, defaultLanguage } from '../languages'
+import { defaultLanguage, languages } from '../languages'
 
 export const getNameFromLocale = (locale: string | undefined): string => {
   return languages.find((lang) => lang.locale === locale)?.name || defaultLanguage.name

web/sections/CallToActions/index.tsx

@@ -52,6 +52,7 @@ const CallToActions = ({ callToActions = [], splitList, className }: CallToActio
       {callToActions.map((callToAction: LinkData) => {
         const url = getUrlFromAction(callToAction)
         const { id, label, type, link, file } = callToAction
+
         return url ? (
           <li key={id}>
             {/*  If the URL is a static AEM page it should behave as an internal link in the web */}