Rename ILocalizer to ILocalizationParser
Rob Mensching committed
Mar 1, 2019 at 07:33 UTC
a4f5a5a042c00254607fbecdf132a2e2a91a1bdd
4 files changed
+23
-23
src/WixToolset.Core/CommandLine/BuildCommand.cs
+2
-2
@@ -350,7 +350,7 @@ namespace WixToolset.Core.CommandLine
350
private IEnumerable<Localization> LoadLocalizationFiles(IEnumerable<string> locFiles, IDictionary<string, string> preprocessorVariables)
351
{
352
var localizations = new List<Localization>();
353
- var localizer = this.ServiceProvider.GetService<ILocalizer>();
353
+ var parser = this.ServiceProvider.GetService<ILocalizationParser>();
354
355
foreach (var loc in locFiles)
356
{
@@ -361,7 +361,7 @@ namespace WixToolset.Core.CommandLine
361
continue;
362
}
363
364
- var localization = localizer.ParseLocalizationFile(document);
364
+ var localization = parser.ParseLocalization(document);
365
localizations.Add(localization);
366
}
367
src/WixToolset.Core/ILocalizationParser.cs
renamed
+3
-3
@@ -8,20 +8,20 @@ namespace WixToolset.Core
8
/// <summary>
9
/// Parses localization source files.
10
/// </summary>
11
- public interface ILocalizer
11
+ public interface ILocalizationParser
12
{
13
/// <summary>
14
/// Loads a localization file from a path on disk.
15
/// </summary>
16
/// <param name="path">Path to localization file saved on disk.</param>
17
/// <returns>Returns the loaded localization file.</returns>
18
- Localization ParseLocalizationFile(string path);
18
+ Localization ParseLocalization(string path);
19
20
/// <summary>
21
/// Loads a localization file from memory.
22
/// </summary>
23
/// <param name="document">Document to parse as localization file.</param>
24
/// <returns>Returns the loaded localization file.</returns>
25
- Localization ParseLocalizationFile(XDocument document);
25
+ Localization ParseLocalization(XDocument document);
26
}
27
}
src/WixToolset.Core/LocalizationParser.cs
renamed
+17
-17
@@ -11,33 +11,33 @@ namespace WixToolset.Core
11
using WixToolset.Extensibility;
12
using WixToolset.Extensibility.Services;
13
14
- internal class Localizer : ILocalizer
14
+ internal class LocalizationParser : ILocalizationParser
15
{
16
public static readonly XNamespace WxlNamespace = "http://wixtoolset.org/schemas/v4/wxl";
17
private static string XmlElementName = "WixLocalization";
18
19
- internal Localizer(IServiceProvider serviceProvider)
19
+ internal LocalizationParser(IServiceProvider serviceProvider)
20
{
21
this.Messaging = serviceProvider.GetService<IMessaging>();
22
}
23
24
private IMessaging Messaging { get; }
25
26
- public Localization ParseLocalizationFile(string path)
26
+ public Localization ParseLocalization(string path)
27
{
28
var document = XDocument.Load(path);
29
- return this.ParseLocalizationFile(document);
29
+ return this.ParseLocalization(document);
30
}
31
32
- public Localization ParseLocalizationFile(XDocument document)
32
+ public Localization ParseLocalization(XDocument document)
33
{
34
XElement root = document.Root;
35
Localization localization = null;
36
37
SourceLineNumber sourceLineNumbers = SourceLineNumber.CreateFromXObject(root);
38
- if (Localizer.XmlElementName == root.Name.LocalName)
38
+ if (LocalizationParser.XmlElementName == root.Name.LocalName)
39
{
40
- if (Localizer.WxlNamespace == root.Name.Namespace)
40
+ if (LocalizationParser.WxlNamespace == root.Name.Namespace)
41
{
42
localization = ParseWixLocalizationElement(this.Messaging, root);
43
}
@@ -45,17 +45,17 @@ namespace WixToolset.Core
45
{
46
if (null == root.Name.Namespace)
47
{
48
- this.Messaging.Write(ErrorMessages.InvalidWixXmlNamespace(sourceLineNumbers, Localizer.XmlElementName, Localizer.WxlNamespace.NamespaceName));
48
+ this.Messaging.Write(ErrorMessages.InvalidWixXmlNamespace(sourceLineNumbers, LocalizationParser.XmlElementName, LocalizationParser.WxlNamespace.NamespaceName));
49
}
50
else
51
{
52
- this.Messaging.Write(ErrorMessages.InvalidWixXmlNamespace(sourceLineNumbers, Localizer.XmlElementName, root.Name.LocalName, Localizer.WxlNamespace.NamespaceName));
52
+ this.Messaging.Write(ErrorMessages.InvalidWixXmlNamespace(sourceLineNumbers, LocalizationParser.XmlElementName, root.Name.LocalName, LocalizationParser.WxlNamespace.NamespaceName));
53
}
54
}
55
}
56
else
57
{
58
- this.Messaging.Write(ErrorMessages.InvalidDocumentElement(sourceLineNumbers, root.Name.LocalName, "localization", Localizer.XmlElementName));
58
+ this.Messaging.Write(ErrorMessages.InvalidDocumentElement(sourceLineNumbers, root.Name.LocalName, "localization", LocalizationParser.XmlElementName));
59
}
60
61
return localization;
@@ -90,7 +90,7 @@ namespace WixToolset.Core
90
91
foreach (XAttribute attrib in node.Attributes())
92
{
93
- if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || Localizer.WxlNamespace == attrib.Name.Namespace)
93
+ if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || LocalizationParser.WxlNamespace == attrib.Name.Namespace)
94
{
95
switch (attrib.Name.LocalName)
96
{
@@ -119,16 +119,16 @@ namespace WixToolset.Core
119
120
foreach (XElement child in node.Elements())
121
{
122
- if (Localizer.WxlNamespace == child.Name.Namespace)
122
+ if (LocalizationParser.WxlNamespace == child.Name.Namespace)
123
{
124
switch (child.Name.LocalName)
125
{
126
case "String":
127
- Localizer.ParseString(messaging, child, variables);
127
+ LocalizationParser.ParseString(messaging, child, variables);
128
break;
129
130
case "UI":
131
- Localizer.ParseUI(messaging, child, localizedControls);
131
+ LocalizationParser.ParseUI(messaging, child, localizedControls);
132
break;
133
134
default:
@@ -157,7 +157,7 @@ namespace WixToolset.Core
157
158
foreach (XAttribute attrib in node.Attributes())
159
{
160
- if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || Localizer.WxlNamespace == attrib.Name.Namespace)
160
+ if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || LocalizationParser.WxlNamespace == attrib.Name.Namespace)
161
{
162
switch (attrib.Name.LocalName)
163
{
@@ -202,7 +202,7 @@ namespace WixToolset.Core
202
Value = value,
203
};
204
205
- Localizer.AddWixVariable(messaging, variables, variable);
205
+ LocalizationParser.AddWixVariable(messaging, variables, variable);
206
}
207
}
208
@@ -225,7 +225,7 @@ namespace WixToolset.Core
225
226
foreach (XAttribute attrib in node.Attributes())
227
{
228
- if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || Localizer.WxlNamespace == attrib.Name.Namespace)
228
+ if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || LocalizationParser.WxlNamespace == attrib.Name.Namespace)
229
{
230
switch (attrib.Name.LocalName)
231
{
src/WixToolset.Core/WixToolsetServiceProvider.cs
+1
-1
@@ -49,7 +49,7 @@ namespace WixToolset.Core
49
this.AddService<ILinker>((provider, singletons) => new Linker(provider));
50
this.AddService<IResolver>((provider, singletons) => new Resolver(provider));
51
52
- this.AddService<ILocalizer>((provider, singletons) => new Localizer(provider));
52
+ this.AddService<ILocalizationParser>((provider, singletons) => new LocalizationParser(provider));
53
this.AddService<IVariableResolver>((provider, singletons) => new VariableResolver(provider));
54
}
55