From cdca639e4f8de8ce94551cb531305b70bef169f3 Mon Sep 17 00:00:00 2001
From: TekH <h.tek@digitaldata.works>
Date: Thu, 12 Feb 2026 16:40:51 +0100
Subject: [PATCH] Update culture handling and adjust middleware order

Changed GetCulture to return current UI culture if cookie is missing, ensuring a non-null result. Reordered middleware in Program.cs to run ExceptionHandlingMiddleware after CultureMiddleware.
---
 EnvelopeGenerator.Web/Extensions/WebExtensions.cs | 4 ++--
 EnvelopeGenerator.Web/Program.cs                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/EnvelopeGenerator.Web/Extensions/WebExtensions.cs b/EnvelopeGenerator.Web/Extensions/WebExtensions.cs
index 02439e19..07a57ada 100644
--- a/EnvelopeGenerator.Web/Extensions/WebExtensions.cs
+++ b/EnvelopeGenerator.Web/Extensions/WebExtensions.cs
@@ -60,7 +60,7 @@ public static class WebExtensions
     #endregion
 
     #region Cookie
-    public static string? GetCulture(this IRequestCookieCollection cookies)
+    public static string GetCulture(this IRequestCookieCollection cookies)
     {
         var cookieValue = cookies[CookieRequestCultureProvider.DefaultCookieName];
 
@@ -71,7 +71,7 @@ public static class WebExtensions
                 return culture;
         }
 
-        return null;
+        return CultureInfo.CurrentUICulture.Name;
     }
 
     public static void SetCulture(this IResponseCookies cookies, string culture)
diff --git a/EnvelopeGenerator.Web/Program.cs b/EnvelopeGenerator.Web/Program.cs
index abb2bb5a..d21451f3 100644
--- a/EnvelopeGenerator.Web/Program.cs
+++ b/EnvelopeGenerator.Web/Program.cs
@@ -187,8 +187,8 @@ try
 
     var app = builder.Build();
 
-    app.UseMiddleware<ExceptionHandlingMiddleware>();
     app.UseMiddleware<CultureMiddleware>();
+    app.UseMiddleware<ExceptionHandlingMiddleware>();
 
     // Configure the HTTP request pipeline.
     if (!app.Environment.IsDevelopment())