Skip to content

Commit db22947

Browse files
mjbvzmjbvz
authored
Start Extracting New Project Wizard Strings for Localization (#1369)
**Bug** The entire new project wizard UI has strings hardcoded into the xaml files. **Fix** Start extracting these strings to resx files so that they can be localized.
1 parent c772b74 commit db22947

5 files changed

Lines changed: 1902 additions & 12 deletions

File tree

‎Nodejs/Product/Nodejs/ImportWizardResources.Designer.cs‎

Lines changed: 117 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Nodejs/Product/Nodejs/ImportWizardResources.resx‎

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="BackButtonLabel" xml:space="preserve">
121+
<value>_Back</value>
122+
</data>
123+
<data name="CancelButtonLabel" xml:space="preserve">
124+
<value>_Cancel</value>
125+
</data>
126+
<data name="FinishButtonLabel" xml:space="preserve">
127+
<value>_Finish</value>
128+
</data>
129+
<data name="NextButtonLabel" xml:space="preserve">
130+
<value>_Next</value>
131+
</data>
132+
<data name="Welcome" xml:space="preserve">
133+
<value>Welcome to the Create New Project from Existing Node.js Code Wizard</value>
134+
</data>
135+
<data name="WindowTitle" xml:space="preserve">
136+
<value>Create New Project from Existing Node.js Code</value>
137+
</data>
138+
</root>

‎Nodejs/Product/Nodejs/Nodejs.csproj‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,11 @@
228228
<Compile Include="Commands\SurveyNewsCommand.cs" />
229229
<Compile Include="Debugger\DebugEngine\AD7EvalErrorProperty.cs" />
230230
<Compile Include="Debugger\NodeDebugProvider.cs" />
231+
<Compile Include="ImportWizardResources.Designer.cs">
232+
<AutoGen>True</AutoGen>
233+
<DesignTime>True</DesignTime>
234+
<DependentUpon>ImportWizardResources.resx</DependentUpon>
235+
</Compile>
231236
<Compile Include="Logging\LiveLogger.cs" />
232237
<Compile Include="Debugger\FilePosition.cs" />
233238
<Compile Include="Debugger\FuzzyLogicFileNameMapper.cs" />
@@ -305,6 +310,11 @@
305310
<Compile Include="Debugger\Communication\TcpNetworkClient.cs" />
306311
<Compile Include="Debugger\ExceptionHitTreatment.cs" />
307312
<Compile Include="Debugger\ExceptionHandler.cs" />
313+
<Compile Include="Resources.Designer.cs">
314+
<AutoGen>True</AutoGen>
315+
<DesignTime>True</DesignTime>
316+
<DependentUpon>Resources.resx</DependentUpon>
317+
</Compile>
308318
<Compile Include="SourceMapping\FunctionInfo.cs" />
309319
<Compile Include="SourceMapping\JavaScriptSourceMapInfo.cs" />
310320
<Compile Include="Debugger\NodeConstants.cs" />
@@ -603,6 +613,11 @@
603613
<DependentUpon>DiagnosticsForm.cs</DependentUpon>
604614
<SubType>Designer</SubType>
605615
</EmbeddedResource>
616+
<EmbeddedResource Include="ImportWizardResources.resx">
617+
<Generator>PublicResXFileCodeGenerator</Generator>
618+
<LastGenOutput>ImportWizardResources.Designer.cs</LastGenOutput>
619+
<SubType>Designer</SubType>
620+
</EmbeddedResource>
606621
<EmbeddedResource Include="Options\NodejsNpmOptionsControl.resx">
607622
<DependentUpon>NodejsNpmOptionsControl.cs</DependentUpon>
608623
</EmbeddedResource>
@@ -1078,6 +1093,8 @@
10781093
<ManifestResourceName>Microsoft.NodejsTools.Resources</ManifestResourceName>
10791094
<Visible>true</Visible>
10801095
<SubType>Designer</SubType>
1096+
<Generator>PublicResXFileCodeGenerator</Generator>
1097+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
10811098
</EmbeddedResource>
10821099
</ItemGroup>
10831100
<ItemGroup>

‎Nodejs/Product/Nodejs/Project/ImportWizard/ImportWizard.xaml‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
55
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
66
xmlns:l="clr-namespace:Microsoft.NodejsTools.Project.ImportWizard"
7-
xmlns:wpf="clr-namespace:Microsoft.VisualStudioTools.Wpf"
7+
xmlns:wpf="clr-namespace:Microsoft.VisualStudioTools.Wpf"
88
xmlns:pt="clr-namespace:Microsoft.NodejsTools"
99
xmlns:ui="clr-namespace:Microsoft.VisualStudioTools"
10+
xmlns:resx="clr-namespace:Microsoft.NodejsTools"
1011
Height="525" Width="700"
1112
MinHeight="500" MinWidth="500"
1213
ResizeMode="CanResizeWithGrip"
@@ -16,9 +17,9 @@
1617
WindowStartupLocation="CenterOwner">
1718

1819
<Window.Title>
19-
Create New Project from Existing Node.js Code
20+
<Binding Source="{x:Static resx:ImportWizardResources.WindowTitle}"/>
2021
</Window.Title>
21-
22+
2223
<Window.Resources>
2324
<ResourceDictionary Source="ImportWizardDictionary.xaml" />
2425
</Window.Resources>
@@ -53,11 +54,9 @@
5354
Margin="24px"
5455
HorizontalAlignment="Center" VerticalAlignment="Top" />
5556
</Grid>
56-
57-
<TextBlock Grid.Row="0" Grid.Column="1" Style="{StaticResource Title}" Margin="8">
58-
Welcome to the Create New Project from Existing Node.js Code Wizard
59-
</TextBlock>
60-
57+
58+
<TextBlock Grid.Row="0" Grid.Column="1" Style="{StaticResource Title}" Margin="8" Text="{x:Static resx:ImportWizardResources.Welcome}" />
59+
6160
<Frame Grid.Row="1" Grid.Column="1"
6261
Content="{Binding PageSequence.CurrentItem}"
6362
NavigationUIVisibility="Hidden"
@@ -77,10 +76,10 @@
7776
<Setter Property="HorizontalAlignment" Value="Stretch" />
7877
</Style>
7978
</Grid.Resources>
80-
<Button Grid.Column="0" Command="NavigationCommands.BrowseBack">_Back</Button>
81-
<Button Grid.Column="1" Command="NavigationCommands.BrowseForward" IsDefault="{Binding IsNextDefault}">_Next</Button>
82-
<Button Grid.Column="2" Command="ApplicationCommands.Save" IsDefault="{Binding IsFinishDefault}">_Finish</Button>
83-
<Button Grid.Column="3" Command="ApplicationCommands.Close">_Cancel</Button>
79+
<Button Grid.Column="0" Command="NavigationCommands.BrowseBack" Content="{x:Static resx:ImportWizardResources.BackButtonLabel}" />
80+
<Button Grid.Column="1" Command="NavigationCommands.BrowseForward" IsDefault="{Binding IsNextDefault}" Content="{x:Static resx:ImportWizardResources.NextButtonLabel}" />
81+
<Button Grid.Column="2" Command="ApplicationCommands.Save" IsDefault="{Binding IsFinishDefault}" Content="{x:Static resx:ImportWizardResources.FinishButtonLabel}" />
82+
<Button Grid.Column="3" Command="ApplicationCommands.Close" Content="{x:Static resx:ImportWizardResources.CancelButtonLabel}" />
8483
</Grid>
8584
</StackPanel>
8685
</Grid>

0 commit comments

Comments
 (0)