added task safe translate which help avoid deadlocks

DarkLiKally · Oct 14, 2019 · 785d352 · 785d352
1 parent 6e33e78
commit 785d352
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/I18Next.Net.Extensions/I18NextStringLocalizer.cs b/src/I18Next.Net.Extensions/I18NextStringLocalizer.cs
@@ -30,7 +30,8 @@ public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures)
         {
             var language = _language ?? _instance.Language;
 
-            var result = _instance.Backend.LoadNamespaceAsync(language, _instance.DefaultNamespace).Result;
+            var result = _instance.Backend.LoadNamespaceAsync(language, _instance.DefaultNamespace)
+                .ConfigureAwait(false).GetAwaiter().GetResult();
 
             return result.GetAllValues().Select(t => new LocalizedString(t.Key, t.Value));
         }

diff --git a/src/I18Next.Net/I18NextNet.cs b/src/I18Next.Net/I18NextNet.cs
@@ -87,17 +87,17 @@ public string Language
 
         public string T(string key, object args = null)
         {
-            return Ta(_language, key, args).Result;
+            return Ta(_language, key, args).ConfigureAwait(false).GetAwaiter().GetResult();
         }
 
         public string T(string language, string key, object args = null)
         {
-            return Ta(language, key, args).Result;
+            return Ta(language, key, args).ConfigureAwait(false).GetAwaiter().GetResult();
         }
 
         public string T(string language, string defaultNamespace, string key, object args = null)
         {
-            return Ta(language, defaultNamespace, key, args).Result;
+            return Ta(language, defaultNamespace, key, args).ConfigureAwait(false).GetAwaiter().GetResult();
         }
 
         public Task<string> Ta(string key, object args = null)