diff --git a/apps/api/src/app/endpoints/sitemap/sitemap.service.ts b/apps/api/src/app/endpoints/sitemap/sitemap.service.ts index 94b5d6ba5..51721d387 100644 --- a/apps/api/src/app/endpoints/sitemap/sitemap.service.ts +++ b/apps/api/src/app/endpoints/sitemap/sitemap.service.ts @@ -32,7 +32,7 @@ export class SitemapService { urlPostfix: alias ?? key }; - return this.createRouteSitemapUrl({ route, ...params }); + return this.createRouteSitemapUrl({ ...params, route }); }); }).join('\n'); } @@ -48,7 +48,7 @@ export class SitemapService { }; return [ - this.createRouteSitemapUrl(params), // create language specific root URL + this.createRouteSitemapUrl(params), ...this.createSitemapUrls(params, publicRoutes) ]; }).join('\n'); @@ -63,7 +63,7 @@ export class SitemapService { return []; } - const urls = [this.createRouteSitemapUrl({ route, ...params })]; + const urls = [this.createRouteSitemapUrl({ ...params, route })]; if (route.subRoutes) { urls.push(...this.createSitemapUrls(params, route.subRoutes)); @@ -91,6 +91,7 @@ export class SitemapService { const match = link.match( SitemapService.TRANSLATION_TAGGED_MESSAGE_REGEX ); + const segment = match ? (this.i18nService.getTranslation({ languageCode, @@ -100,6 +101,7 @@ export class SitemapService { return segment.replace(/^\/+|\/+$/, ''); }) ?? []; + const location = [rootUrl, languageCode, ...segments].join('/') + (urlPostfix ? `-${urlPostfix}` : ''); diff --git a/libs/common/src/lib/routes/routes.ts b/libs/common/src/lib/routes/routes.ts index f8a542bf3..9c6461a75 100644 --- a/libs/common/src/lib/routes/routes.ts +++ b/libs/common/src/lib/routes/routes.ts @@ -10,7 +10,9 @@ if (typeof window !== 'undefined') { (global as any).$localize = ( messageParts: TemplateStringsArray, ...expressions: any[] - ) => String.raw({ raw: messageParts }, ...expressions); + ) => { + return String.raw({ raw: messageParts }, ...expressions); + }; } export const internalRoutes: Record = {