apps/site/components/Common/Search/index.tsx

@@ -89,40 +89,50 @@ const SearchButton: FC = () => {
             return href;
           }
 
-          const currentPageHost = `${window.location.protocol}//${window.location.host}`;
-          const docsBaseUrl = `${currentPageHost}/docs`;
-          const lowerCaseHref = href.toLowerCase();
+          const baseURLObject = new URL(BASE_URL);
+          const baseURLHostName = baseURLObject.hostname;
 
-          // Keep original link if URL should not have locale  (different host / same host but path starts with docs/)
+          const searchBoxURLObject = new URL(href);
+          const searchBoxURLHostName = searchBoxURLObject.hostname;
+          const serachBoxURLPathName = searchBoxURLObject.pathname;
+
+          // We do not want to add the locale to the url for external links and docs links
           if (
-            !lowerCaseHref.startsWith(currentPageHost) ||
-            lowerCaseHref.startsWith(docsBaseUrl)
+            baseURLHostName !== searchBoxURLHostName ||
+            serachBoxURLPathName.startsWith('/docs/')
           ) {
             return href;
           }
 
-          const before = href.slice(0, currentPageHost.length);
-          const after = href.slice(currentPageHost.length);
-          return `${before}/${locale}${after}`;
+          const URLWithLocale = new URL(
+            `${locale}${searchBoxURLObject.pathname}`,
+            searchBoxURLObject.origin
+          );
+
+          return URLWithLocale.href;
         }}
         onAnswerSourceClick={event => {
           event.preventDefault();
 
-          const currentPageHost = `${window.location.protocol}//${window.location.host}`;
+          const baseURLObject = new URL(BASE_URL);
+
           const { path } = event.detail.source;
 
-          const finalURL = path.startsWith('docs/')
-            ? `${currentPageHost}/${path}`
-            : `${currentPageHost}/${locale}/${path}`;
+          const finalPath = path.startsWith('docs/')
+            ? path
+            : `${locale}/${path}`;
+
+          const finalURL = new URL(finalPath, baseURLObject);
 
           window.open(finalURL, '_blank');
         }}
         onSearchResultClick={event => {
           event.preventDefault();
 
-          const currentPageHost = `${window.location.protocol}//${window.location.host}`;
+          const fullURLObject = new URL(event.detail.result.path, BASE_URL);
 
-          router.push(`${currentPageHost}/${event.detail.result.path}`, {
+          // result.path already contains LOCALE. Locale is set to undefined here so router does not add it once again.
+          router.push(fullURLObject.href, {
             locale: undefined,
           });
         }}