added and fixed fallback behaviour

Author: semack

Localization.AspNetCore.EntityFramework.Test/Startup.cs

@@ -42,7 +42,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddLocalization<ApplicationDbContext>(options =>
             {
                 {
-                    options.ReturnKeyNameIfNoTranslation = true;
+                    options.FallBackBehavior = FallBackBehaviorEnum.DefaultCulture;
                     options.CreateMissingTranslationsIfNotFound = true;
                     options.NamingConvention = NamingConventionEnum.FullTypeName;
                 }

Localization.AspNetCore.EntityFramework/Enums/FallBackBehaviorEnum.cs

@@ -0,0 +1,8 @@
+namespace Localization.AspNetCore.EntityFramework.Enums
+{
+    public enum FallBackBehaviorEnum
+    {
+        DefaultCulture,
+        KeyName
+    }
+}

Localization.AspNetCore.EntityFramework/Factories/LocalizerFactory.cs

@@ -38,6 +38,7 @@ public LocalizerFactory(IServiceProvider serviceProvider,
         }
 
         private string CurrentLanguage => CultureInfo.CurrentUICulture.Name;
+        private string DefaultLanguage => _requestLocalizationSettings.DefaultRequestCulture.UICulture.Name;
 
         public void ResetCache()
         {
@@ -52,12 +53,12 @@ public void ResetCache()
                 }
             }
         }
-        
+
         public void Import(IList<LocalizationResource> source)
         {
             if (source == null)
                 throw new ArgumentException(nameof(source));
-            
+
             using (var scope = _serviceProvider.GetScopedService(out T context))
             {
                 //  clear all resources
@@ -66,7 +67,7 @@ public void Import(IList<LocalizationResource> source)
                 // add import
                 context.Set<LocalizationResource>()
                     .AddRange(source);
-                
+
                 context.SaveChanges();
             }
         }
@@ -99,18 +100,30 @@ public LocalizedString GetResource(string resourceKey)
                     p.Value
                 })
                 .SingleOrDefault();
-            
-            var result = item?.Value;
-            
-            if (_localizerSettings.CreateMissingTranslationsIfNotFound &&
-                item == null)
-            {
+
+            if (item == null && _localizerSettings.CreateMissingTranslationsIfNotFound)
                 AddMissingResourceKeys(resourceKey);
-                result  = GetResource(resourceKey);
-            }
 
-            if (_localizerSettings.ReturnKeyNameIfNoTranslation && string.IsNullOrWhiteSpace(result))
-                result = resourceKey;
+            var result = item?.Value ?? String.Empty;
+
+            if (string.IsNullOrWhiteSpace(result))
+            {
+                switch (_localizerSettings.FallBackBehavior)
+                {
+                    case FallBackBehaviorEnum.KeyName:
+                        result = resourceKey;
+                        break;
+
+                    case FallBackBehaviorEnum.DefaultCulture:
+                        result = _cache
+                            .SelectMany(r => r.Translations)
+                            .Where(t => t.Resource.ResourceKey == resourceKey
+                                        && t.Language == DefaultLanguage)
+                            .Select(t => t.Value ?? String.Empty)
+                            .SingleOrDefault();
+                        break;
+                }
+            }
 
             return new LocalizedString(resourceKey, result!);
         }
@@ -147,7 +160,7 @@ public IStringLocalizer Create(string baseName, string location)
                     sourceName = Shared;
                     break;
                 case NamingConventionEnum.FullTypeName:
-                     sourceName = $"{location}_{baseName}";
+                    sourceName = $"{location}_{baseName}";
                     break;
             }
 

Localization.AspNetCore.EntityFramework/Settings/LocalizerOptions.cs

@@ -4,8 +4,8 @@ namespace Localization.AspNetCore.EntityFramework.Settings
 {
     public class LocalizerOptions
     {
+        public FallBackBehaviorEnum FallBackBehavior { get; set; } = FallBackBehaviorEnum.DefaultCulture;
         public NamingConventionEnum NamingConvention { get; set; } = NamingConventionEnum.TypeName;
-        public bool ReturnKeyNameIfNoTranslation { get; set; } = true;
         public bool CreateMissingTranslationsIfNotFound { get; set; } = true;
     }
 }