From be16d531ae8d1309337c1ac780b2b62186c246a5 Mon Sep 17 00:00:00 2001
From: Blazebrain <davidadegoke16@gmail.com>
Date: Wed, 9 Sep 2026 05:36:04 +0100
Subject: [PATCH] feat: enhance locale detection

---
 lib/entities/language_service.dart | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/entities/language_service.dart b/lib/entities/language_service.dart
index 95200fbcc..6da74346a 100644
--- a/lib/entities/language_service.dart
+++ b/lib/entities/language_service.dart
@@ -93,12 +93,16 @@ class LanguageService {
 
   static Future<String> localeDetection() async {
     try {
-      var locale = await Devicelocale.currentLocale ?? '';
-      locale = Intl.shortLocale(locale);
-
+      final locale = Intl.canonicalizedLocale(await Devicelocale.currentLocale ?? "");
       if (list.keys.contains(locale)) {
         return locale;
       }
+
+      final language = Intl.shortLocale(locale);
+      if (list.keys.contains(language)) {
+        return language;
+      }
+
       return LanguageService.defaultLocale;
     } catch (_) {
       return LanguageService.defaultLocale;