Address feedback

src/OrchardCore/OrchardCore.Localization.Core/LocalizationManager.cs

@@ -1,8 +1,6 @@
-using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Caching.Memory;
 
@@ -40,7 +38,7 @@ public LocalizationManager(
     /// <inheritdoc />
     public async Task<CultureDictionary> GetDictionaryAsync(CultureInfo culture)
     {
-        var cachedDictionary = _cache.GetOrCreate(CacheKeyPrefix + culture.Name, k => new Lazy<Task<CultureDictionary>>(async () =>
+        var cachedDictionary = await _cache.GetOrCreateAsync(CacheKeyPrefix + culture.Name, async (e) =>
         {
             var rule = _defaultPluralRule;
 
@@ -59,8 +57,8 @@ public async Task<CultureDictionary> GetDictionaryAsync(CultureInfo culture)
             }
 
             return dictionary;
-        }, LazyThreadSafetyMode.ExecutionAndPublication));
+        });
 
-        return await cachedDictionary.Value;
+        return cachedDictionary;
     }
 }

src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PoFilesTranslationsProvider.cs

@@ -1,4 +1,5 @@
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.FileProviders;
 
@@ -37,7 +38,7 @@ private async Task LoadFileToDictionaryAsync(IFileInfo fileInfo, CultureDictiona
         {
             using var stream = fileInfo.CreateReadStream();
             using var reader = new StreamReader(stream);
-            dictionary.MergeTranslations(await _parser.ParseAsync(reader));
+            dictionary.MergeTranslations(await _parser.ParseAsync(reader).ToListAsync());
         }
     }
 }

src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PoParser.cs

@@ -24,20 +24,19 @@ public class PoParser
     /// </summary>
     /// <param name="reader">The <see cref="TextReader"/>.</param>
     /// <returns>A list of culture records.</returns>
-    [Obsolete("This method has been deprecated, please use ParseAsync instead.")]
-    public IEnumerable<CultureDictionaryRecord> Parse(TextReader reader) => ParseAsync(reader).GetAwaiter().GetResult();
+    [Obsolete("This methos has been deprecated, please use ParseAsync instead.")]
+    public IEnumerable<CultureDictionaryRecord> Parse(TextReader reader) => ParseAsync(reader).ToEnumerable();
 
     /// <summary>
     /// Parses a .po file.
     /// </summary>
     /// <param name="reader">The <see cref="TextReader"/>.</param>
     /// <returns>A list of culture records.</returns>
 #pragma warning disable CA1822 // Mark members as static
-    public async Task<IEnumerable<CultureDictionaryRecord>> ParseAsync(TextReader reader)
+    public async IAsyncEnumerable<CultureDictionaryRecord> ParseAsync(TextReader reader)
 #pragma warning restore CA1822 // Mark members as static
     {
         var entryBuilder = new DictionaryRecordBuilder();
-        var cultureDictionaryRecords = new List<CultureDictionaryRecord>();
         string line;
         while ((line = await reader.ReadLineAsync()) != null)
         {
@@ -51,18 +50,16 @@ public async Task<IEnumerable<CultureDictionaryRecord>> ParseAsync(TextReader re
             // msgid or msgctxt are first lines of the entry. If builder contains valid entry return it and start building a new one.
             if ((context == PoContext.MessageId || context == PoContext.MessageContext) && entryBuilder.ShouldFlushRecord)
             {
-                cultureDictionaryRecords.Add(entryBuilder.BuildRecordAndReset());
+                yield return entryBuilder.BuildRecordAndReset();
             }
 
             entryBuilder.Set(context, content);
         }
 
         if (entryBuilder.ShouldFlushRecord)
         {
-            cultureDictionaryRecords.Add(entryBuilder.BuildRecordAndReset());
+            yield return entryBuilder.BuildRecordAndReset();
         }
-
-        return cultureDictionaryRecords;
     }
 
     private static string Unescape(string str)

test/OrchardCore.Tests/Localization/PoParserTests.cs

@@ -209,7 +209,7 @@ private static async Task<CultureDictionaryRecord[]> ParseTextAsync(string resou
             using var resource = testAssembly.GetManifestResourceStream("OrchardCore.Tests.Localization.PoFiles." + resourceName + ".po");
             using var reader = new StreamReader(resource);
 
-            return (await parser.ParseAsync(reader)).ToArray();
+            return (await parser.ParseAsync(reader).ToListAsync()).ToArray();
         }
     }
 }