epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove "en" from fluent file paths.

Browse Source
This commit is contained in:
Paul Chote
2024-10-19 15:34:10 +01:00
committed by Gustas
parent 8452f71481
commit 147cb566f2
190 changed files with 201 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/UtilityCommands/ExtractChromeStrings.cs
View File

@@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
{
var fluentFolder = layout.Key + "|languages";
var fluentPackage = modData.ModFiles.OpenPackage(fluentFolder);
var fluentPath = Path.Combine(fluentPackage.Name, "chrome/en.ftl");
var fluentPath = Path.Combine(fluentPackage.Name, "chrome.ftl");
var unsortedCandidates = new List<ExtractionCandidate>();
var groupedCandidates = new Dictionary<HashSet<string>, List<ExtractionCandidate>>();

12
OpenRA.Mods.Common/UtilityCommands/ExtractYamlStrings.cs
View File

@@ -65,7 +65,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
var fluentPackage = modData.ModFiles.OpenPackage(modData.Manifest.Id + "|languages");
ExtractFromFile(Path.Combine(fluentPackage.Name, "rules/en.ftl"), modRules, traitInfos);
ExtractFromFile(Path.Combine(fluentPackage.Name, "rules.ftl"), modRules, traitInfos);
modRules.Save();
// Extract from maps.
@@ -83,18 +83,18 @@ namespace OpenRA.Mods.Common.UtilityCommands
if (mapRulesNode != null)
mapRules.AddRange(UpdateUtils.LoadInternalMapYaml(modData, package, mapRulesNode.Value, new HashSet<string>()));
const string Enftl = "en.ftl";
ExtractFromFile(Path.Combine(package.Name, Enftl), mapRules, traitInfos, () =>
const string Mapftl = "map.ftl";
ExtractFromFile(Path.Combine(package.Name, Mapftl), mapRules, traitInfos, () =>
{
var node = yaml.NodeWithKeyOrDefault("FluentMessages");
if (node != null)
{
var value = node.NodeValue<string[]>();
if (!value.Contains(Enftl))
node.Value.Value = string.Join(", ", value.Concat(new string[] { Enftl }).ToArray());
if (!value.Contains(Mapftl))
node.Value.Value = string.Join(", ", value.Concat(new string[] { Mapftl }).ToArray());
}
else
yaml.Nodes.Add(new MiniYamlNodeBuilder("FluentMessages", Enftl));
yaml.Nodes.Add(new MiniYamlNodeBuilder("FluentMessages", Mapftl));
});
mapRules.Save();