Merge en-GB, en-US to en

SeriaWei · Feb 2, 2024 · 30037cb · 30037cb
1 parent 01138de
commit 30037cb
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 851 deletions.
diff --git a/src/EasyFrameWork/Modules/MutiLanguage/LanguageService.cs b/src/EasyFrameWork/Modules/MutiLanguage/LanguageService.cs
@@ -128,12 +128,12 @@ public ServiceResult<LanguageEntity> Add(LanguageEntity item)
         }
         public LanguageEntity Get(string lanKey, string cultureName)
         {
-            LanguageEntity languageEntity = null;
-            if (GetAllFromCache().TryGetValue(lanKey, out ConcurrentDictionary<string, LanguageEntity> cultureLan))
-            {
-                cultureLan.TryGetValue(cultureName, out languageEntity);
-            }
-            return languageEntity;
+            if (!GetAllFromCache().TryGetValue(lanKey, out ConcurrentDictionary<string, LanguageEntity> cultureLan)) return null;
+
+            if (cultureLan.TryGetValue(cultureName, out LanguageEntity languageEntity)) return languageEntity;
+
+            if (cultureLan.TryGetValue(cultureName.Split('-')[0], out languageEntity)) return languageEntity;
+            return null;
         }
 
         public IEnumerable<LanguageEntity> GetCultures(string lanKey)