Localization

[adamsitnik]

• make LocalizationResources internal and static
• tests
• merge translation contributions (Translate to Spanish #1979, Set russian language #1381)
• move SDK translations here

I've not configured OneLocBuild as we may move the code to dotnet/runtime where it's already configured for the whole repo.

To move the existing translations from SDK repo to here I've wrote a console app that took care of mapping the translations by ID, by original English text (some IDs has changed but text remained the same).

The app is ugly but it does what it's needed:

Details

usingSystem.Text;usingSystem.Transactions;usingSystem.Xml;usingSystem.Xml.Linq;namespaceCopyTranslations{internalclassProgram{staticvoidMain(string[]args){DirectoryInfosdkFolder=newDirectoryInfo(args[0]);DirectoryInfosclFolder=newDirectoryInfo(args[1]);foreach(FileInfosourceFileinsdkFolder.GetFiles("*.xlf")){stringextension=sourceFile.Name.Substring(sourceFile.Name.IndexOf('.'));stringdestinationFilePath=Path.Combine(sclFolder.FullName,$"Resources{extension}");usingFileStreamsrc=sourceFile.OpenRead();usingXmlReadersrcXml=XmlReader.Create(src);XmlDocumentsourceDocument=new();sourceDocument.Load(srcXml);XmlNodesrcBodyNode=sourceDocument.ChildNodes[1]!.ChildNodes[0]!.ChildNodes[0]!;Dictionary<string,string>idToTarget=new();Dictionary<string,string>sourceToTarget=new();foreach(XmlNodenodeinsrcBodyNode.ChildNodes){if(GetSource(node)!=GetTarget(node))// some has no translations{idToTarget.Add(GetId(node),GetTarget(node));sourceToTarget.TryAdd(Normalize(GetSource(node)),GetTarget(node));}}XmlDocumentdestinationDocument=new();destinationDocument.Load(destinationFilePath);XmlNodedstBodyNode=destinationDocument.ChildNodes[1]!.ChildNodes[0]!.ChildNodes[0]!;foreach(XmlElementdestinationElementindstBodyNode.ChildNodes){stringid=GetId(destinationElement);stringsource=GetSource(destinationElement);if(idToTarget.TryGetValue(id,outstring?translation)// same IDs||sourceToTarget.TryGetValue(Normalize(source),outtranslation))// same English text{if(source.Contains("'{0}'")&&translation.Contains("„{0}”")){translation=translation.Replace("„{0}”","'{0}'");}elseif(source.Contains("'{0}'")&&translation.Contains("\"{0}\"")){translation=translation.Replace("\"{0}\"","'{0}'");}elseif(source.Contains("'{0}'")&&!translation.Contains("'{0}'")){translation=translation.Replace("{0}","'{0}'");}if(source.EndsWith('.')&&!translation.EndsWith('.')){translation+=".";}translation=translation.Replace(" :",":");destinationElement.ChildNodes[1]!.InnerText=translation;destinationElement.ChildNodes[1]!.Attributes!["state"]!.InnerText="translated";}}destinationDocument.Save(destinationFilePath);}staticstringGetId(XmlNodenode)=>node.Attributes!["id"]!.InnerText;staticstringGetSource(XmlNodenode)=>node.ChildNodes[0]!.InnerText!;staticstringGetTarget(XmlNodenode)=>node.ChildNodes[1]!.InnerText!;staticstringNormalize(stringformatString){StringBuilderbuffer=new(formatString);for(inti=0;i<4;i++){buffer.Replace("'{"+i+"}'","{"+i+"}");}buffer.Replace(".","");buffer.Replace(",","");returnbuffer.ToString();}}}}

[adamsitnik]

I am including these types and the resources here so the tests can call the internal APIs to verify error messages.

[adamsitnik]

I've added this type to a different project than System.CommandLine.Tests to ensure that it does not use the resources included in that project.

[adamsitnik]

@KalleOlaviNiemitalo I've removed all the unused methods and resources, thank you for the feedback!

I was also curious if it's not a bug that we don't use them. It turned out that we are now just using different methods for the same purposes:

command-line-api/src/System.CommandLine/LocalizationResources.cs

Line 55 in b8a9761

internalstaticstringRequiredArgumentMissing(SymbolResultsymbolResult)=>

command-line-api/src/System.CommandLine/LocalizationResources.cs

Line 19 in b8a9761

internalstaticstringExpectsOneArgument(OptionResultoptionResult)

[KalleOlaviNiemitalo]

Huh. I wonder if the unused resources were preserved for API compatibility only.

[adamsitnik]

• make LocalizationResources internal and static
• tests
• merge translation contributions (Translate to Spanish #1979, Set russian language #1381)
• move SDK translations here

I've not configured OneLocBuild as we may move the code to dotnet/runtime where it's already configured for the whole repo.

To move the existing translations from SDK repo to here I've wrote a console app that took care of mapping the translations by ID, by original English text (some IDs has changed but text remained the same).

The app is ugly but it does what it's needed:

Details

usingSystem.Text;usingSystem.Transactions;usingSystem.Xml;usingSystem.Xml.Linq;namespaceCopyTranslations{internalclassProgram{staticvoidMain(string[]args){DirectoryInfosdkFolder=newDirectoryInfo(args[0]);DirectoryInfosclFolder=newDirectoryInfo(args[1]);foreach(FileInfosourceFileinsdkFolder.GetFiles("*.xlf")){stringextension=sourceFile.Name.Substring(sourceFile.Name.IndexOf('.'));stringdestinationFilePath=Path.Combine(sclFolder.FullName,$"Resources{extension}");usingFileStreamsrc=sourceFile.OpenRead();usingXmlReadersrcXml=XmlReader.Create(src);XmlDocumentsourceDocument=new();sourceDocument.Load(srcXml);XmlNodesrcBodyNode=sourceDocument.ChildNodes[1]!.ChildNodes[0]!.ChildNodes[0]!;Dictionary<string,string>idToTarget=new();Dictionary<string,string>sourceToTarget=new();foreach(XmlNodenodeinsrcBodyNode.ChildNodes){if(GetSource(node)!=GetTarget(node))// some has no translations{idToTarget.Add(GetId(node),GetTarget(node));sourceToTarget.TryAdd(Normalize(GetSource(node)),GetTarget(node));}}XmlDocumentdestinationDocument=new();destinationDocument.Load(destinationFilePath);XmlNodedstBodyNode=destinationDocument.ChildNodes[1]!.ChildNodes[0]!.ChildNodes[0]!;foreach(XmlElementdestinationElementindstBodyNode.ChildNodes){stringid=GetId(destinationElement);stringsource=GetSource(destinationElement);if(idToTarget.TryGetValue(id,outstring?translation)// same IDs||sourceToTarget.TryGetValue(Normalize(source),outtranslation))// same English text{if(source.Contains("'{0}'")&&translation.Contains("„{0}”")){translation=translation.Replace("„{0}”","'{0}'");}elseif(source.Contains("'{0}'")&&translation.Contains("\"{0}\"")){translation=translation.Replace("\"{0}\"","'{0}'");}elseif(source.Contains("'{0}'")&&!translation.Contains("'{0}'")){translation=translation.Replace("{0}","'{0}'");}if(source.EndsWith('.')&&!translation.EndsWith('.')){translation+=".";}translation=translation.Replace(" :",":");destinationElement.ChildNodes[1]!.InnerText=translation;destinationElement.ChildNodes[1]!.Attributes!["state"]!.InnerText="translated";}}destinationDocument.Save(destinationFilePath);}staticstringGetId(XmlNodenode)=>node.Attributes!["id"]!.InnerText;staticstringGetSource(XmlNodenode)=>node.ChildNodes[0]!.InnerText!;staticstringGetTarget(XmlNodenode)=>node.ChildNodes[1]!.InnerText!;staticstringNormalize(stringformatString){StringBuilderbuffer=new(formatString);for(inti=0;i<4;i++){buffer.Replace("'{"+i+"}'","{"+i+"}");}buffer.Replace(".","");buffer.Replace(",","");returnbuffer.ToString();}}}}

[adamsitnik]

I am including these types and the resources here so the tests can call the internal APIs to verify error messages.

[adamsitnik]

I've added this type to a different project than System.CommandLine.Tests to ensure that it does not use the resources included in that project.

[adamsitnik]

@KalleOlaviNiemitalo I've removed all the unused methods and resources, thank you for the feedback!

I was also curious if it's not a bug that we don't use them. It turned out that we are now just using different methods for the same purposes:

command-line-api/src/System.CommandLine/LocalizationResources.cs

Line 55 in b8a9761

internalstaticstringRequiredArgumentMissing(SymbolResultsymbolResult)=>

command-line-api/src/System.CommandLine/LocalizationResources.cs

Line 19 in b8a9761

internalstaticstringExpectsOneArgument(OptionResultoptionResult)

[KalleOlaviNiemitalo]

Huh. I wonder if the unused resources were preserved for API compatibility only.

[adamsitnik]

• make LocalizationResources internal and static
• tests
• merge translation contributions (Translate to Spanish #1979, Set russian language #1381)
• move SDK translations here

I've not configured OneLocBuild as we may move the code to dotnet/runtime where it's already configured for the whole repo.

To move the existing translations from SDK repo to here I've wrote a console app that took care of mapping the translations by ID, by original English text (some IDs has changed but text remained the same).

The app is ugly but it does what it's needed:

Details

usingSystem.Text;usingSystem.Transactions;usingSystem.Xml;usingSystem.Xml.Linq;namespaceCopyTranslations{internalclassProgram{staticvoidMain(string[]args){DirectoryInfosdkFolder=newDirectoryInfo(args[0]);DirectoryInfosclFolder=newDirectoryInfo(args[1]);foreach(FileInfosourceFileinsdkFolder.GetFiles("*.xlf")){stringextension=sourceFile.Name.Substring(sourceFile.Name.IndexOf('.'));stringdestinationFilePath=Path.Combine(sclFolder.FullName,$"Resources{extension}");usingFileStreamsrc=sourceFile.OpenRead();usingXmlReadersrcXml=XmlReader.Create(src);XmlDocumentsourceDocument=new();sourceDocument.Load(srcXml);XmlNodesrcBodyNode=sourceDocument.ChildNodes[1]!.ChildNodes[0]!.ChildNodes[0]!;Dictionary<string,string>idToTarget=new();Dictionary<string,string>sourceToTarget=new();foreach(XmlNodenodeinsrcBodyNode.ChildNodes){if(GetSource(node)!=GetTarget(node))// some has no translations{idToTarget.Add(GetId(node),GetTarget(node));sourceToTarget.TryAdd(Normalize(GetSource(node)),GetTarget(node));}}XmlDocumentdestinationDocument=new();destinationDocument.Load(destinationFilePath);XmlNodedstBodyNode=destinationDocument.ChildNodes[1]!.ChildNodes[0]!.ChildNodes[0]!;foreach(XmlElementdestinationElementindstBodyNode.ChildNodes){stringid=GetId(destinationElement);stringsource=GetSource(destinationElement);if(idToTarget.TryGetValue(id,outstring?translation)// same IDs||sourceToTarget.TryGetValue(Normalize(source),outtranslation))// same English text{if(source.Contains("'{0}'")&&translation.Contains("„{0}”")){translation=translation.Replace("„{0}”","'{0}'");}elseif(source.Contains("'{0}'")&&translation.Contains("\"{0}\"")){translation=translation.Replace("\"{0}\"","'{0}'");}elseif(source.Contains("'{0}'")&&!translation.Contains("'{0}'")){translation=translation.Replace("{0}","'{0}'");}if(source.EndsWith('.')&&!translation.EndsWith('.')){translation+=".";}translation=translation.Replace(" :",":");destinationElement.ChildNodes[1]!.InnerText=translation;destinationElement.ChildNodes[1]!.Attributes!["state"]!.InnerText="translated";}}destinationDocument.Save(destinationFilePath);}staticstringGetId(XmlNodenode)=>node.Attributes!["id"]!.InnerText;staticstringGetSource(XmlNodenode)=>node.ChildNodes[0]!.InnerText!;staticstringGetTarget(XmlNodenode)=>node.ChildNodes[1]!.InnerText!;staticstringNormalize(stringformatString){StringBuilderbuffer=new(formatString);for(inti=0;i<4;i++){buffer.Replace("'{"+i+"}'","{"+i+"}");}buffer.Replace(".","");buffer.Replace(",","");returnbuffer.ToString();}}}}

[adamsitnik]

I am including these types and the resources here so the tests can call the internal APIs to verify error messages.

[adamsitnik]

I've added this type to a different project than System.CommandLine.Tests to ensure that it does not use the resources included in that project.

[adamsitnik]

@KalleOlaviNiemitalo I've removed all the unused methods and resources, thank you for the feedback!

I was also curious if it's not a bug that we don't use them. It turned out that we are now just using different methods for the same purposes:

command-line-api/src/System.CommandLine/LocalizationResources.cs

Line 55 in b8a9761

internalstaticstringRequiredArgumentMissing(SymbolResultsymbolResult)=>

command-line-api/src/System.CommandLine/LocalizationResources.cs

Line 19 in b8a9761

internalstaticstringExpectsOneArgument(OptionResultoptionResult)

[KalleOlaviNiemitalo]

Huh. I wonder if the unused resources were preserved for API compatibility only.

[adamsitnik]

• make LocalizationResources internal and static
• tests
• merge translation contributions (Translate to Spanish #1979, Set russian language #1381)
• move SDK translations here

I've not configured OneLocBuild as we may move the code to dotnet/runtime where it's already configured for the whole repo.

To move the existing translations from SDK repo to here I've wrote a console app that took care of mapping the translations by ID, by original English text (some IDs has changed but text remained the same).

The app is ugly but it does what it's needed:

Details

usingSystem.Text;usingSystem.Transactions;usingSystem.Xml;usingSystem.Xml.Linq;namespaceCopyTranslations{internalclassProgram{staticvoidMain(string[]args){DirectoryInfosdkFolder=newDirectoryInfo(args[0]);DirectoryInfosclFolder=newDirectoryInfo(args[1]);foreach(FileInfosourceFileinsdkFolder.GetFiles("*.xlf")){stringextension=sourceFile.Name.Substring(sourceFile.Name.IndexOf('.'));stringdestinationFilePath=Path.Combine(sclFolder.FullName,$"Resources{extension}");usingFileStreamsrc=sourceFile.OpenRead();usingXmlReadersrcXml=XmlReader.Create(src);XmlDocumentsourceDocument=new();sourceDocument.Load(srcXml);XmlNodesrcBodyNode=sourceDocument.ChildNodes[1]!.ChildNodes[0]!.ChildNodes[0]!;Dictionary<string,string>idToTarget=new();Dictionary<string,string>sourceToTarget=new();foreach(XmlNodenodeinsrcBodyNode.ChildNodes){if(GetSource(node)!=GetTarget(node))// some has no translations{idToTarget.Add(GetId(node),GetTarget(node));sourceToTarget.TryAdd(Normalize(GetSource(node)),GetTarget(node));}}XmlDocumentdestinationDocument=new();destinationDocument.Load(destinationFilePath);XmlNodedstBodyNode=destinationDocument.ChildNodes[1]!.ChildNodes[0]!.ChildNodes[0]!;foreach(XmlElementdestinationElementindstBodyNode.ChildNodes){stringid=GetId(destinationElement);stringsource=GetSource(destinationElement);if(idToTarget.TryGetValue(id,outstring?translation)// same IDs||sourceToTarget.TryGetValue(Normalize(source),outtranslation))// same English text{if(source.Contains("'{0}'")&&translation.Contains("„{0}”")){translation=translation.Replace("„{0}”","'{0}'");}elseif(source.Contains("'{0}'")&&translation.Contains("\"{0}\"")){translation=translation.Replace("\"{0}\"","'{0}'");}elseif(source.Contains("'{0}'")&&!translation.Contains("'{0}'")){translation=translation.Replace("{0}","'{0}'");}if(source.EndsWith('.')&&!translation.EndsWith('.')){translation+=".";}translation=translation.Replace(" :",":");destinationElement.ChildNodes[1]!.InnerText=translation;destinationElement.ChildNodes[1]!.Attributes!["state"]!.InnerText="translated";}}destinationDocument.Save(destinationFilePath);}staticstringGetId(XmlNodenode)=>node.Attributes!["id"]!.InnerText;staticstringGetSource(XmlNodenode)=>node.ChildNodes[0]!.InnerText!;staticstringGetTarget(XmlNodenode)=>node.ChildNodes[1]!.InnerText!;staticstringNormalize(stringformatString){StringBuilderbuffer=new(formatString);for(inti=0;i<4;i++){buffer.Replace("'{"+i+"}'","{"+i+"}");}buffer.Replace(".","");buffer.Replace(",","");returnbuffer.ToString();}}}}

[adamsitnik]

I am including these types and the resources here so the tests can call the internal APIs to verify error messages.

[adamsitnik]

I've added this type to a different project than System.CommandLine.Tests to ensure that it does not use the resources included in that project.

[adamsitnik]

@KalleOlaviNiemitalo I've removed all the unused methods and resources, thank you for the feedback!

I was also curious if it's not a bug that we don't use them. It turned out that we are now just using different methods for the same purposes:

command-line-api/src/System.CommandLine/LocalizationResources.cs

Line 55 in b8a9761

internalstaticstringRequiredArgumentMissing(SymbolResultsymbolResult)=>

command-line-api/src/System.CommandLine/LocalizationResources.cs

Line 19 in b8a9761

internalstaticstringExpectsOneArgument(OptionResultoptionResult)

[KalleOlaviNiemitalo]

Huh. I wonder if the unused resources were preserved for API compatibility only.

[adamsitnik]

• make LocalizationResources internal and static
• tests
• merge translation contributions (Translate to Spanish #1979, Set russian language #1381)
• move SDK translations here

I've not configured OneLocBuild as we may move the code to dotnet/runtime where it's already configured for the whole repo.

To move the existing translations from SDK repo to here I've wrote a console app that took care of mapping the translations by ID, by original English text (some IDs has changed but text remained the same).

The app is ugly but it does what it's needed:

Details

usingSystem.Text;usingSystem.Transactions;usingSystem.Xml;usingSystem.Xml.Linq;namespaceCopyTranslations{internalclassProgram{staticvoidMain(string[]args){DirectoryInfosdkFolder=newDirectoryInfo(args[0]);DirectoryInfosclFolder=newDirectoryInfo(args[1]);foreach(FileInfosourceFileinsdkFolder.GetFiles("*.xlf")){stringextension=sourceFile.Name.Substring(sourceFile.Name.IndexOf('.'));stringdestinationFilePath=Path.Combine(sclFolder.FullName,$"Resources{extension}");usingFileStreamsrc=sourceFile.OpenRead();usingXmlReadersrcXml=XmlReader.Create(src);XmlDocumentsourceDocument=new();sourceDocument.Load(srcXml);XmlNodesrcBodyNode=sourceDocument.ChildNodes[1]!.ChildNodes[0]!.ChildNodes[0]!;Dictionary<string,string>idToTarget=new();Dictionary<string,string>sourceToTarget=new();foreach(XmlNodenodeinsrcBodyNode.ChildNodes){if(GetSource(node)!=GetTarget(node))// some has no translations{idToTarget.Add(GetId(node),GetTarget(node));sourceToTarget.TryAdd(Normalize(GetSource(node)),GetTarget(node));}}XmlDocumentdestinationDocument=new();destinationDocument.Load(destinationFilePath);XmlNodedstBodyNode=destinationDocument.ChildNodes[1]!.ChildNodes[0]!.ChildNodes[0]!;foreach(XmlElementdestinationElementindstBodyNode.ChildNodes){stringid=GetId(destinationElement);stringsource=GetSource(destinationElement);if(idToTarget.TryGetValue(id,outstring?translation)// same IDs||sourceToTarget.TryGetValue(Normalize(source),outtranslation))// same English text{if(source.Contains("'{0}'")&&translation.Contains("„{0}”")){translation=translation.Replace("„{0}”","'{0}'");}elseif(source.Contains("'{0}'")&&translation.Contains("\"{0}\"")){translation=translation.Replace("\"{0}\"","'{0}'");}elseif(source.Contains("'{0}'")&&!translation.Contains("'{0}'")){translation=translation.Replace("{0}","'{0}'");}if(source.EndsWith('.')&&!translation.EndsWith('.')){translation+=".";}translation=translation.Replace(" :",":");destinationElement.ChildNodes[1]!.InnerText=translation;destinationElement.ChildNodes[1]!.Attributes!["state"]!.InnerText="translated";}}destinationDocument.Save(destinationFilePath);}staticstringGetId(XmlNodenode)=>node.Attributes!["id"]!.InnerText;staticstringGetSource(XmlNodenode)=>node.ChildNodes[0]!.InnerText!;staticstringGetTarget(XmlNodenode)=>node.ChildNodes[1]!.InnerText!;staticstringNormalize(stringformatString){StringBuilderbuffer=new(formatString);for(inti=0;i<4;i++){buffer.Replace("'{"+i+"}'","{"+i+"}");}buffer.Replace(".","");buffer.Replace(",","");returnbuffer.ToString();}}}}

[adamsitnik]

I am including these types and the resources here so the tests can call the internal APIs to verify error messages.

[adamsitnik]

I've added this type to a different project than System.CommandLine.Tests to ensure that it does not use the resources included in that project.

[adamsitnik]

@KalleOlaviNiemitalo I've removed all the unused methods and resources, thank you for the feedback!

I was also curious if it's not a bug that we don't use them. It turned out that we are now just using different methods for the same purposes:

command-line-api/src/System.CommandLine/LocalizationResources.cs

Line 55 in b8a9761

internalstaticstringRequiredArgumentMissing(SymbolResultsymbolResult)=>

command-line-api/src/System.CommandLine/LocalizationResources.cs

Line 19 in b8a9761

internalstaticstringExpectsOneArgument(OptionResultoptionResult)

[KalleOlaviNiemitalo]

Huh. I wonder if the unused resources were preserved for API compatibility only.

[adamsitnik]

• make LocalizationResources internal and static
• tests
• merge translation contributions (Translate to Spanish #1979, Set russian language #1381)
• move SDK translations here

I've not configured OneLocBuild as we may move the code to dotnet/runtime where it's already configured for the whole repo.

To move the existing translations from SDK repo to here I've wrote a console app that took care of mapping the translations by ID, by original English text (some IDs has changed but text remained the same).

The app is ugly but it does what it's needed:

Details

usingSystem.Text;usingSystem.Transactions;usingSystem.Xml;usingSystem.Xml.Linq;namespaceCopyTranslations{internalclassProgram{staticvoidMain(string[]args){DirectoryInfosdkFolder=newDirectoryInfo(args[0]);DirectoryInfosclFolder=newDirectoryInfo(args[1]);foreach(FileInfosourceFileinsdkFolder.GetFiles("*.xlf")){stringextension=sourceFile.Name.Substring(sourceFile.Name.IndexOf('.'));stringdestinationFilePath=Path.Combine(sclFolder.FullName,$"Resources{extension}");usingFileStreamsrc=sourceFile.OpenRead();usingXmlReadersrcXml=XmlReader.Create(src);XmlDocumentsourceDocument=new();sourceDocument.Load(srcXml);XmlNodesrcBodyNode=sourceDocument.ChildNodes[1]!.ChildNodes[0]!.ChildNodes[0]!;Dictionary<string,string>idToTarget=new();Dictionary<string,string>sourceToTarget=new();foreach(XmlNodenodeinsrcBodyNode.ChildNodes){if(GetSource(node)!=GetTarget(node))// some has no translations{idToTarget.Add(GetId(node),GetTarget(node));sourceToTarget.TryAdd(Normalize(GetSource(node)),GetTarget(node));}}XmlDocumentdestinationDocument=new();destinationDocument.Load(destinationFilePath);XmlNodedstBodyNode=destinationDocument.ChildNodes[1]!.ChildNodes[0]!.ChildNodes[0]!;foreach(XmlElementdestinationElementindstBodyNode.ChildNodes){stringid=GetId(destinationElement);stringsource=GetSource(destinationElement);if(idToTarget.TryGetValue(id,outstring?translation)// same IDs||sourceToTarget.TryGetValue(Normalize(source),outtranslation))// same English text{if(source.Contains("'{0}'")&&translation.Contains("„{0}”")){translation=translation.Replace("„{0}”","'{0}'");}elseif(source.Contains("'{0}'")&&translation.Contains("\"{0}\"")){translation=translation.Replace("\"{0}\"","'{0}'");}elseif(source.Contains("'{0}'")&&!translation.Contains("'{0}'")){translation=translation.Replace("{0}","'{0}'");}if(source.EndsWith('.')&&!translation.EndsWith('.')){translation+=".";}translation=translation.Replace(" :",":");destinationElement.ChildNodes[1]!.InnerText=translation;destinationElement.ChildNodes[1]!.Attributes!["state"]!.InnerText="translated";}}destinationDocument.Save(destinationFilePath);}staticstringGetId(XmlNodenode)=>node.Attributes!["id"]!.InnerText;staticstringGetSource(XmlNodenode)=>node.ChildNodes[0]!.InnerText!;staticstringGetTarget(XmlNodenode)=>node.ChildNodes[1]!.InnerText!;staticstringNormalize(stringformatString){StringBuilderbuffer=new(formatString);for(inti=0;i<4;i++){buffer.Replace("'{"+i+"}'","{"+i+"}");}buffer.Replace(".","");buffer.Replace(",","");returnbuffer.ToString();}}}}

[adamsitnik]

I am including these types and the resources here so the tests can call the internal APIs to verify error messages.

[adamsitnik]

I've added this type to a different project than System.CommandLine.Tests to ensure that it does not use the resources included in that project.

[adamsitnik]

@KalleOlaviNiemitalo I've removed all the unused methods and resources, thank you for the feedback!

I was also curious if it's not a bug that we don't use them. It turned out that we are now just using different methods for the same purposes:

command-line-api/src/System.CommandLine/LocalizationResources.cs

Line 55 in b8a9761

internalstaticstringRequiredArgumentMissing(SymbolResultsymbolResult)=>

command-line-api/src/System.CommandLine/LocalizationResources.cs

Line 19 in b8a9761

internalstaticstringExpectsOneArgument(OptionResultoptionResult)

[KalleOlaviNiemitalo]

Huh. I wonder if the unused resources were preserved for API compatibility only.

[adamsitnik]

• make LocalizationResources internal and static
• tests
• merge translation contributions (Translate to Spanish #1979, Set russian language #1381)
• move SDK translations here

I've not configured OneLocBuild as we may move the code to dotnet/runtime where it's already configured for the whole repo.

To move the existing translations from SDK repo to here I've wrote a console app that took care of mapping the translations by ID, by original English text (some IDs has changed but text remained the same).

The app is ugly but it does what it's needed:

Details

usingSystem.Text;usingSystem.Transactions;usingSystem.Xml;usingSystem.Xml.Linq;namespaceCopyTranslations{internalclassProgram{staticvoidMain(string[]args){DirectoryInfosdkFolder=newDirectoryInfo(args[0]);DirectoryInfosclFolder=newDirectoryInfo(args[1]);foreach(FileInfosourceFileinsdkFolder.GetFiles("*.xlf")){stringextension=sourceFile.Name.Substring(sourceFile.Name.IndexOf('.'));stringdestinationFilePath=Path.Combine(sclFolder.FullName,$"Resources{extension}");usingFileStreamsrc=sourceFile.OpenRead();usingXmlReadersrcXml=XmlReader.Create(src);XmlDocumentsourceDocument=new();sourceDocument.Load(srcXml);XmlNodesrcBodyNode=sourceDocument.ChildNodes[1]!.ChildNodes[0]!.ChildNodes[0]!;Dictionary<string,string>idToTarget=new();Dictionary<string,string>sourceToTarget=new();foreach(XmlNodenodeinsrcBodyNode.ChildNodes){if(GetSource(node)!=GetTarget(node))// some has no translations{idToTarget.Add(GetId(node),GetTarget(node));sourceToTarget.TryAdd(Normalize(GetSource(node)),GetTarget(node));}}XmlDocumentdestinationDocument=new();destinationDocument.Load(destinationFilePath);XmlNodedstBodyNode=destinationDocument.ChildNodes[1]!.ChildNodes[0]!.ChildNodes[0]!;foreach(XmlElementdestinationElementindstBodyNode.ChildNodes){stringid=GetId(destinationElement);stringsource=GetSource(destinationElement);if(idToTarget.TryGetValue(id,outstring?translation)// same IDs||sourceToTarget.TryGetValue(Normalize(source),outtranslation))// same English text{if(source.Contains("'{0}'")&&translation.Contains("„{0}”")){translation=translation.Replace("„{0}”","'{0}'");}elseif(source.Contains("'{0}'")&&translation.Contains("\"{0}\"")){translation=translation.Replace("\"{0}\"","'{0}'");}elseif(source.Contains("'{0}'")&&!translation.Contains("'{0}'")){translation=translation.Replace("{0}","'{0}'");}if(source.EndsWith('.')&&!translation.EndsWith('.')){translation+=".";}translation=translation.Replace(" :",":");destinationElement.ChildNodes[1]!.InnerText=translation;destinationElement.ChildNodes[1]!.Attributes!["state"]!.InnerText="translated";}}destinationDocument.Save(destinationFilePath);}staticstringGetId(XmlNodenode)=>node.Attributes!["id"]!.InnerText;staticstringGetSource(XmlNodenode)=>node.ChildNodes[0]!.InnerText!;staticstringGetTarget(XmlNodenode)=>node.ChildNodes[1]!.InnerText!;staticstringNormalize(stringformatString){StringBuilderbuffer=new(formatString);for(inti=0;i<4;i++){buffer.Replace("'{"+i+"}'","{"+i+"}");}buffer.Replace(".","");buffer.Replace(",","");returnbuffer.ToString();}}}}

[adamsitnik]

I am including these types and the resources here so the tests can call the internal APIs to verify error messages.

[adamsitnik]

I've added this type to a different project than System.CommandLine.Tests to ensure that it does not use the resources included in that project.

[adamsitnik]

@KalleOlaviNiemitalo I've removed all the unused methods and resources, thank you for the feedback!

I was also curious if it's not a bug that we don't use them. It turned out that we are now just using different methods for the same purposes:

command-line-api/src/System.CommandLine/LocalizationResources.cs

Line 55 in b8a9761

internalstaticstringRequiredArgumentMissing(SymbolResultsymbolResult)=>

command-line-api/src/System.CommandLine/LocalizationResources.cs

Line 19 in b8a9761

internalstaticstringExpectsOneArgument(OptionResultoptionResult)

[KalleOlaviNiemitalo]

Huh. I wonder if the unused resources were preserved for API compatibility only.

[adamsitnik]

• make LocalizationResources internal and static
• tests
• merge translation contributions (Translate to Spanish #1979, Set russian language #1381)
• move SDK translations here

I've not configured OneLocBuild as we may move the code to dotnet/runtime where it's already configured for the whole repo.

To move the existing translations from SDK repo to here I've wrote a console app that took care of mapping the translations by ID, by original English text (some IDs has changed but text remained the same).

The app is ugly but it does what it's needed:

Details

usingSystem.Text;usingSystem.Transactions;usingSystem.Xml;usingSystem.Xml.Linq;namespaceCopyTranslations{internalclassProgram{staticvoidMain(string[]args){DirectoryInfosdkFolder=newDirectoryInfo(args[0]);DirectoryInfosclFolder=newDirectoryInfo(args[1]);foreach(FileInfosourceFileinsdkFolder.GetFiles("*.xlf")){stringextension=sourceFile.Name.Substring(sourceFile.Name.IndexOf('.'));stringdestinationFilePath=Path.Combine(sclFolder.FullName,$"Resources{extension}");usingFileStreamsrc=sourceFile.OpenRead();usingXmlReadersrcXml=XmlReader.Create(src);XmlDocumentsourceDocument=new();sourceDocument.Load(srcXml);XmlNodesrcBodyNode=sourceDocument.ChildNodes[1]!.ChildNodes[0]!.ChildNodes[0]!;Dictionary<string,string>idToTarget=new();Dictionary<string,string>sourceToTarget=new();foreach(XmlNodenodeinsrcBodyNode.ChildNodes){if(GetSource(node)!=GetTarget(node))// some has no translations{idToTarget.Add(GetId(node),GetTarget(node));sourceToTarget.TryAdd(Normalize(GetSource(node)),GetTarget(node));}}XmlDocumentdestinationDocument=new();destinationDocument.Load(destinationFilePath);XmlNodedstBodyNode=destinationDocument.ChildNodes[1]!.ChildNodes[0]!.ChildNodes[0]!;foreach(XmlElementdestinationElementindstBodyNode.ChildNodes){stringid=GetId(destinationElement);stringsource=GetSource(destinationElement);if(idToTarget.TryGetValue(id,outstring?translation)// same IDs||sourceToTarget.TryGetValue(Normalize(source),outtranslation))// same English text{if(source.Contains("'{0}'")&&translation.Contains("„{0}”")){translation=translation.Replace("„{0}”","'{0}'");}elseif(source.Contains("'{0}'")&&translation.Contains("\"{0}\"")){translation=translation.Replace("\"{0}\"","'{0}'");}elseif(source.Contains("'{0}'")&&!translation.Contains("'{0}'")){translation=translation.Replace("{0}","'{0}'");}if(source.EndsWith('.')&&!translation.EndsWith('.')){translation+=".";}translation=translation.Replace(" :",":");destinationElement.ChildNodes[1]!.InnerText=translation;destinationElement.ChildNodes[1]!.Attributes!["state"]!.InnerText="translated";}}destinationDocument.Save(destinationFilePath);}staticstringGetId(XmlNodenode)=>node.Attributes!["id"]!.InnerText;staticstringGetSource(XmlNodenode)=>node.ChildNodes[0]!.InnerText!;staticstringGetTarget(XmlNodenode)=>node.ChildNodes[1]!.InnerText!;staticstringNormalize(stringformatString){StringBuilderbuffer=new(formatString);for(inti=0;i<4;i++){buffer.Replace("'{"+i+"}'","{"+i+"}");}buffer.Replace(".","");buffer.Replace(",","");returnbuffer.ToString();}}}}

[adamsitnik]

I am including these types and the resources here so the tests can call the internal APIs to verify error messages.

[adamsitnik]

I've added this type to a different project than System.CommandLine.Tests to ensure that it does not use the resources included in that project.

[adamsitnik]

@KalleOlaviNiemitalo I've removed all the unused methods and resources, thank you for the feedback!

I was also curious if it's not a bug that we don't use them. It turned out that we are now just using different methods for the same purposes:

command-line-api/src/System.CommandLine/LocalizationResources.cs

Line 55 in b8a9761

internalstaticstringRequiredArgumentMissing(SymbolResultsymbolResult)=>

command-line-api/src/System.CommandLine/LocalizationResources.cs

Line 19 in b8a9761

internalstaticstringExpectsOneArgument(OptionResultoptionResult)

[KalleOlaviNiemitalo]

Huh. I wonder if the unused resources were preserved for API compatibility only.