From 188f947ad7f8f4d62c0852ddcda840a6b05caea1 Mon Sep 17 00:00:00 2001
From: PartyDonut <42371342+PartyDonut@users.noreply.github.com>
Date: Sun, 9 Nov 2025 10:16:08 +0100
Subject: [PATCH] fix: Strict locale check (#598)

Co-authored-by: PartyDonut <PartyDonut@users.noreply.github.com>
---
 lib/main.dart | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index d099e71..8fcb565 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -291,10 +291,17 @@ class _MainState extends ConsumerState<Main> with WindowListener, WidgetsBinding
             supportedLocales: AppLocalizations.supportedLocales,
             locale: language,
             localeResolutionCallback: (locale, supportedLocales) {
-              if (locale == null || !supportedLocales.contains(locale)) {
-                return const Locale('en');
+              const fallback = Locale('en');
+              if (locale == null) return fallback;
+              if (supportedLocales.contains(locale)) {
+                return locale;
               }
-              return locale;
+              final matchByLanguage = supportedLocales.firstWhere(
+                (l) => l.languageCode == locale.languageCode,
+                orElse: () => fallback,
+              );
+
+              return matchByLanguage;
             },
             builder: (context, child) => MediaQueryScaler(
               child: LocalizationContextWrapper(