Skip to content

v13.5 - New Swedish translation crashes Umbraco, removed duplicate areas. #17059

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

Merged
nul800sebastiaan merged 2 commits into from
Sep 17, 2024
Merged

v13.5 - New Swedish translation crashes Umbraco, removed duplicate areas. #17059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d0bc43
Removed duplicate translation area-keys
madsoulswe Sep 15, 2024
f3583bc
Fix exception for duplicate areas.
Sep 15, 2024
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
3 changes: 0 additions & 3 deletions src/Umbraco.Core/EmbeddedResources/Lang/sv.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
<name>The Umbraco community</name>
<link>https://docs.umbraco.com/umbraco-cms/extending/language-files</link>
</creator>
<area alias="apps">
<key alias="umbContent">Innehåll</key>
</area>
<area alias="actions">
<key alias="assigndomain">Hantera domännamn</key>
<key alias="auditTrail">Hantera versioner</key>
Expand Down
25 changes: 17 additions & 8 deletions src/Umbraco.Core/Services/LocalizedTextService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,13 @@ private IDictionary<string, IDictionary<string, string>> GetAreaStoredTranslatio
IEnumerable<XElement> areas = xmlSource[cult].Value.XPathSelectElements("//area");
foreach (XElement area in areas)
{
var result = new Dictionary<string, string>(StringComparer.InvariantCulture);
var areaAlias = area.Attribute("alias")!.Value;

if (!overallResult.TryGetValue(areaAlias, out IDictionary<string, string>? result))
{
result = new Dictionary<string, string>(StringComparer.InvariantCulture);
}

IEnumerable<XElement> keys = area.XPathSelectElements("./key");
foreach (XElement key in keys)
{
Expand All @@ -364,7 +370,10 @@ private IDictionary<string, IDictionary<string, string>> GetAreaStoredTranslatio
}
}

overallResult.Add(area.Attribute("alias")!.Value, result);
if (!overallResult.ContainsKey(areaAlias))
{
overallResult.Add(areaAlias, result);
}
}

// Merge English Dictionary
Expand All @@ -374,11 +383,11 @@ private IDictionary<string, IDictionary<string, string>> GetAreaStoredTranslatio
IEnumerable<XElement> enUS = xmlSource[englishCulture].Value.XPathSelectElements("//area");
foreach (XElement area in enUS)
{
IDictionary<string, string>
result = new Dictionary<string, string>(StringComparer.InvariantCulture);
if (overallResult.ContainsKey(area.Attribute("alias")!.Value))
var areaAlias = area.Attribute("alias")!.Value;

if (!overallResult.TryGetValue(areaAlias, out IDictionary<string, string>? result))
{
result = overallResult[area.Attribute("alias")!.Value];
result = new Dictionary<string, string>(StringComparer.InvariantCulture);
}

IEnumerable<XElement> keys = area.XPathSelectElements("./key");
Expand All @@ -394,9 +403,9 @@ private IDictionary<string, IDictionary<string, string>> GetAreaStoredTranslatio
}
}

if (!overallResult.ContainsKey(area.Attribute("alias")!.Value))
if (!overallResult.ContainsKey(areaAlias))
{
overallResult.Add(area.Attribute("alias")!.Value, result);
overallResult.Add(areaAlias, result);
}
}
}
Expand Down