From 14b213c57192ade881a75d216102912f90f73561 Mon Sep 17 00:00:00 2001
From: Kenrick Tandrian <60643640+KenTandrian@users.noreply.github.com>
Date: Sat, 21 Jun 2025 14:27:28 +0700
Subject: [PATCH] Bugfix/fix variable resolution in HtmlTemplateMiddleware
 (#4975)

* Fix variable resolution in HtmlTemplateMiddleware

* Update changelog
---
 CHANGELOG.md         | 4 ++++
 apps/api/src/main.ts | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93ec69abd..1999c836e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improved the language localization for French (`fr`)
 - Upgraded `class-validator` from version `0.14.1` to `0.14.2`
 
+### Fixed
+
+- Fixed an issue in the `HtmlTemplateMiddleware` related to incorrect variable resolution
+
 ## 2.172.0 - 2025-06-19
 
 ### Added
diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts
index bf14ebb90..41f156cbf 100644
--- a/apps/api/src/main.ts
+++ b/apps/api/src/main.ts
@@ -48,7 +48,8 @@ async function bootstrap() {
     exclude: [
       'sitemap.xml',
       ...SUPPORTED_LANGUAGE_CODES.map((languageCode) => {
-        return `/${languageCode}/*wildcard`;
+        // Exclude language-specific routes with an optional wildcard
+        return `/${languageCode}{/*wildcard}`;
       })
     ]
   });