Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ITranslationProvider.LoadTranslationsAsync() #15886

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Add ITranslationProvider.LoadTranslationsAsync() #15886

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
11d28ed
Add ITranslationProvider.LoadTranslationsAsync()
hishamco Apr 26, 2024
62a0e0b
IPluralStringLocalizer.GetTranslationAsync()
hishamco Apr 26, 2024
f8246fd
Fix the build
hishamco Apr 26, 2024
0041fbf
Apply suggestions from code review
hishamco Apr 26, 2024
ee4a668
Address feedback
hishamco Apr 26, 2024
93a802e
Use IAsyncEnumerable
hishamco Apr 26, 2024
3035a04
Revert "Use IAsyncEnumerable"
hishamco Apr 26, 2024
239bc7f
Merge branch 'main' into hishamco/translation-provider
hishamco May 2, 2024
5cd5a85
Merge branch 'main' into hishamco/translation-provider
hishamco May 3, 2024
8fdfc09
Fix merge conflict
hishamco May 3, 2024
47050eb
GetAllStringsFromCultureHierarchyAsync() return IAsyncEnumerable<Loca…
hishamco May 3, 2024
1406101
Merge branch 'main' into hishamco/translation-provider
hishamco Aug 15, 2024
431cb66
Merge branch 'main' into hishamco/translation-provider
hishamco Aug 15, 2024
7a3b976
Merge branch 'main' into hishamco/translation-provider
hishamco Dec 13, 2024
89330e1
Update
hishamco Dec 14, 2024
bebc0af
Merge branch 'main' into hishamco/translation-provider
hishamco Dec 14, 2024
b21f7e9
Merge branch 'main' into hishamco/translation-provider
hishamco Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
GetAllStringsFromCultureHierarchyAsync() return IAsyncEnumerable<Loca… 
…lizedString>
  • Loading branch information
@hishamco
hishamco committed May 3, 2024
commit 47050eb71ca43f95786b174a41d15516aa52c35a
19 changes: 10 additions & 9 deletions ...OrchardCore/OrchardCore.Localization.Core/PortableObject/PortableObjectStringLocalizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,11 @@ public virtual LocalizedString this[string name]
public virtual IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures)
{
var culture = CultureInfo.CurrentUICulture;
var localizedStrings = includeParentCultures
? GetAllStringsFromCultureHierarchyAsync(culture)
: GetAllStringsAsync(culture);

return includeParentCultures
? GetAllStringsFromCultureHierarchyAsync(culture).GetAwaiter().GetResult()
: GetAllStringsAsync(culture).ToEnumerable();
return localizedStrings.ToEnumerable();
}

/// <inheritdocs />
Expand Down Expand Up @@ -120,10 +121,10 @@ private async IAsyncEnumerable<LocalizedString> GetAllStringsAsync(CultureInfo c
}
}

private async Task<List<LocalizedString>> GetAllStringsFromCultureHierarchyAsync(CultureInfo culture)
private async IAsyncEnumerable<LocalizedString> GetAllStringsFromCultureHierarchyAsync(CultureInfo culture)
{
var currentCulture = culture;
var allLocalizedStrings = new List<LocalizedString>();
var resourcesNames = new HashSet<string>();

do
{
Expand All @@ -133,17 +134,17 @@ private async Task<List<LocalizedString>> GetAllStringsFromCultureHierarchyAsync
{
foreach (var localizedString in localizedStrings)
{
if (!allLocalizedStrings.Any(ls => ls.Name == localizedString.Name))
if (!resourcesNames.Contains(localizedString.Name))
{
allLocalizedStrings.Add(localizedString);
resourcesNames.Add(localizedString.Name);

yield return localizedString;
}
}
}

currentCulture = currentCulture.Parent;
} while (currentCulture != currentCulture.Parent);

return allLocalizedStrings;
}

[Obsolete("This method is deprecated, please use GetTranslationAsync instead.")]
Expand Down