Fix ExtractLanguageStrings utility command

This commit is contained in:
abc013
2019-10-12 13:19:19 +02:00
committed by reaperrr
parent 074ebefee1
commit b4c116cb31

View File

@@ -37,11 +37,17 @@ namespace OpenRA.Mods.Common.UtilityCommands
foreach (var filename in modData.Manifest.ChromeLayout) foreach (var filename in modData.Manifest.ChromeLayout)
{ {
Console.WriteLine("# {0}:", filename); string name;
var yaml = MiniYaml.FromFile(filename, false); OpenRA.FileSystem.IReadOnlyPackage package;
modData.ModFiles.TryGetPackageContaining(filename, out package, out name);
name = package.Name + "/" + name;
Console.WriteLine("# {0}:", name);
var yaml = MiniYaml.FromFile(name, false);
FromChromeLayout(ref yaml, null, FromChromeLayout(ref yaml, null,
translatableFields.Select(t => t.Name).Distinct(), null); translatableFields.Select(t => t.Name).Distinct(), null);
using (var file = new StreamWriter(filename)) using (var file = new StreamWriter(name))
file.WriteLine(yaml.WriteToString()); file.WriteLine(yaml.WriteToString());
} }
@@ -50,9 +56,9 @@ namespace OpenRA.Mods.Common.UtilityCommands
internal static void FromChromeLayout(ref List<MiniYamlNode> nodes, MiniYamlNode parent, IEnumerable<string> translatables, string container) internal static void FromChromeLayout(ref List<MiniYamlNode> nodes, MiniYamlNode parent, IEnumerable<string> translatables, string container)
{ {
var parentNode = parent != null ? parent.Key.Split('@') : null; var parentNode = parent != null && parent.Key != null ? parent.Key.Split('@') : null;
var parentType = parent != null ? parentNode.First() : null; var parentType = parent != null && parent.Key != null ? parentNode.First() : null;
var parentLabel = parent != null ? parentNode.Last() : null; var parentLabel = parent != null && parent.Key != null ? parentNode.Last() : null;
if ((parentType == "Background" || parentType == "Container") && parentLabel.IsUppercase()) if ((parentType == "Background" || parentType == "Container") && parentLabel.IsUppercase())
container = parentLabel; container = parentLabel;
@@ -62,7 +68,9 @@ namespace OpenRA.Mods.Common.UtilityCommands
var alreadyTranslated = node.Value.Value != null && node.Value.Value.Contains('@'); var alreadyTranslated = node.Value.Value != null && node.Value.Value.Contains('@');
if (translatables.Contains(node.Key) && !alreadyTranslated && parentLabel != null) if (translatables.Contains(node.Key) && !alreadyTranslated && parentLabel != null)
{ {
var translationKey = "{0}-{1}-{2}".F(container.Replace('_', '-'), parentLabel.Replace('_', '-'), node.Key.ToUpper()); var translationKey = "{0}-{1}".F(parentLabel.Replace('_', '-'), node.Key.ToUpper());
if (container != null)
translationKey = "{0}-".F(container.Replace('_', '-')) + translationKey;
Console.WriteLine("\t{0}: {1}", translationKey, node.Value.Value); Console.WriteLine("\t{0}: {1}", translationKey, node.Value.Value);
node.Value.Value = "@{0}@".F(translationKey); node.Value.Value = "@{0}@".F(translationKey);
} }