More #3484

Author: padms

web/core/Link/ResourceLink.tsx

@@ -105,6 +105,7 @@ export const ResourceLink = forwardRef<HTMLAnchorElement, ResourceLinkProps>(
       showExtensionIcon = false,
       ariaHideText = false,
       href = '',
+      hrefLang,
       file,
     },
     ref,
@@ -183,7 +184,7 @@ export const ResourceLink = forwardRef<HTMLAnchorElement, ResourceLinkProps>(
     }
 
     return href ? (
-      <BaseLink className={classNames} type={type} ref={ref} href={href}>
+      <BaseLink className={classNames} type={type} ref={ref} href={href} hrefLang={hrefLang}>
         <div
           className={twMerge(
             `flex h-full w-inherit items-center justify-start gap-x-2 ${contentVariantClassName[variant]}`,

web/lib/helpers/getUrlFromAction.ts

@@ -12,14 +12,13 @@ export const getUrlFromAction = ({
   if (!type && !href) return undefined
 
   const anchor = anchorReference ? `#${anchorReference}` : ''
-  const locale = link?.lang !== defaultLanguage.name? getLocaleFromName(link?.lang) :""
-  
+  const locale = link?.lang !== defaultLanguage.name? `/${getLocaleFromName(link?.lang)}` :""
 
   if (type === 'internalUrl') {
     if (!link?.slug) {
       console.warn('Missing slug in action:', fileName)
     }
-    return ("/"+locale+ link?.slug + anchor) || ''
+    return (locale+ link?.slug + anchor) || ''
   }
 
   if (!href && type !== 'downloadableFile') {

web/sections/CallToActions/index.tsx

@@ -38,6 +38,7 @@ const CallToActions = ({
           ...file,
           label,
         }}
+        {...(link?.lang && { hrefLang: getLocaleFromName(link?.lang) })}
         href={url}
         type={type}
         variant='fit'
@@ -69,6 +70,7 @@ const CallToActions = ({
                 ...file,
                 label,
               }}
+              {...(link?.lang && { hrefLang: getLocaleFromName(link?.lang) })}
               href={url}
               type={type}
               variant={linkVariant ? linkVariant : 'default'}

web/sections/RelatedContent/RelatedContent.tsx

@@ -22,7 +22,6 @@ const RelatedContent = ({ data, className = '' }: RelatedContentProps) => {
             return (
               <li key={item.id}>
                 <ResourceLink
-                  {...item}
                   href={url as string}
                   {...(item.link?.lang && {
                     hrefLang: getLocaleFromName(item.link?.lang),