🐛 fix(I18n): Overwritting built-int locale resources doesn't work (#621)

Author: capdiem

src/Component/BlazorComponent/I18n/I18n.cs

@@ -44,7 +44,7 @@ private void SetCultureInternal(CultureInfo culture, CultureInfo uiCulture)
         CultureInfo.DefaultThreadCurrentUICulture = uiCulture;
     }
 
-    public void AddLocale(CultureInfo culture, IReadOnlyDictionary<string, string>? locale) => I18nCache.AddLocale(culture, locale);
+    public void AddLocale(CultureInfo culture, IReadOnlyDictionary<string, string>? locale) => I18nCache.AddLocale(culture, locale, true);
 
     public IEnumerable<CultureInfo> SupportedCultures => I18nCache.GetCultures();
 

src/Component/BlazorComponent/I18n/I18nCache.cs

@@ -12,11 +12,12 @@ static I18nCache()
         Cache = new ConcurrentDictionary<CultureInfo, IReadOnlyDictionary<string, string>>();
     }
 
-    public static void AddLocale(CultureInfo culture, IReadOnlyDictionary<string, string>? locale)
+    public static void AddLocale(CultureInfo culture, IReadOnlyDictionary<string, string>? locale,
+        bool isBuiltInLocale = false)
     {
         if (locale is null) return;
 
-        Cache.AddOrUpdate(culture, locale, (_,  dictionary) => Merge(dictionary, locale));
+        Cache.AddOrUpdate(culture, locale, (_, exists) => Merge(exists, locale, isBuiltInLocale));
     }
 
     public static IReadOnlyDictionary<string, string>? GetLocale(CultureInfo culture)
@@ -30,15 +31,19 @@ public static void AddLocale(CultureInfo culture, IReadOnlyDictionary<string, st
 
     public static IEnumerable<CultureInfo> GetCultures() => Cache.Keys;
 
-    private static IReadOnlyDictionary<TK, TV> Merge<TK, TV>(params IReadOnlyDictionary<TK, TV>[] dictionaries)
+    private static IReadOnlyDictionary<string, string> Merge(IReadOnlyDictionary<string, string> exists,
+        IReadOnlyDictionary<string, string> locale, bool isBuiltInLocale)
     {
-        var result = new Dictionary<TK, TV>();
+        var dict1 = isBuiltInLocale ? locale : exists;
+        var dict2 = isBuiltInLocale ? exists : locale;
 
-        foreach (var dict in dictionaries)
+        var result = dict1.ToDictionary(x => x.Key, x => x.Value);
+
+        foreach (var pair in dict2)
         {
-            dict.ToList().ForEach(pair => result[pair.Key] = pair.Value);
+            result[pair.Key] = pair.Value;
         }
 
         return result;
     }
-}
+}