Skip to content

Localize XAML in wizard #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benmcmorran merged 1 commit into from
Sep 12, 2017
Merged

Localize XAML in wizard #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 72 additions & 0 deletions GoogleTestAdapter/NewProjectWizard/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions GoogleTestAdapter/NewProjectWizard/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,36 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ConsumeAs" xml:space="preserve">
<value>Consume Google Test as:</value>
<comment>Followed by radio buttons to select a static or dynamic library</comment>
</data>
<data name="DynamicLib" xml:space="preserve">
<value>Dynamic Library (.dll)</value>
</data>
<data name="LinkDynamic" xml:space="preserve">
<value>Link dynamically (Recommended)</value>
</data>
<data name="LinkStatic" xml:space="preserve">
<value>Link statically</value>
</data>
<data name="NoProject" xml:space="preserve">
<value>&lt;No project&gt;</value>
<comment>Default selection in a project selection dropdown</comment>
</data>
<data name="NuGetInteropNotFound" xml:space="preserve">
<value>Cannot find NuGet.VisualStudio.Interop.dll. Wizard cannot continue.</value>
</data>
<data name="RuntimeLibs" xml:space="preserve">
<value>C++ runtime libraries:</value>
<comment>Followed by radio buttons to "link statically" or "link dynamically"</comment>
</data>
<data name="SelectProject" xml:space="preserve">
<value>Select project to test (Optional):</value>
</data>
<data name="StaticLib" xml:space="preserve">
<value>Static Library (.lib)</value>
</data>
<data name="WinSDKNotFound" xml:space="preserve">
<value>Windows SDK not found.</value>
</data>
Expand Down
16 changes: 9 additions & 7 deletions GoogleTestAdapter/NewProjectWizard/SinglePageWizardDialog.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
xmlns:vsimaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
xmlns:vsimagecatalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
xmlns:resx="clr-namespace:NewProjectWizard.Properties"
DataContext="{Binding RelativeSource={RelativeSource Self}}"
Height="350"
MinHeight="350"
Expand Down Expand Up @@ -76,6 +77,7 @@
Margin="24,8,24,24">
<StackPanel
x:Uid="StackPanel_2" Orientation ="Vertical">
<!-- Not localized because the title is set in the constructor -->
<Label
x:Uid="Label_DialogTitle" x:Name="Label_DialogTitle"
Style="{StaticResource TitleStyle}"
Expand Down Expand Up @@ -116,7 +118,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label x:Name="projectToTestLabel" x:Uid="projectToTestLabel" Grid.Column="0" Content="Select project to test (Optional):" Target="{Binding ElementName=projectComboBox}"/>
<Label x:Name="projectToTestLabel" x:Uid="projectToTestLabel" Grid.Column="0" Content="{x:Static resx:Resources.SelectProject}" Target="{Binding ElementName=projectComboBox}"/>
<ComboBox x:Name="projectComboBox" Grid.Column="1" Width="160" Height="23" AutomationProperties.AutomationId="projectComboBox" AutomationProperties.LabeledBy="{Binding ElementName=projectToTestLabel}"/>
</Grid>
<Grid>
Expand All @@ -125,17 +127,17 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" Margin="0,12,0,0">
<Label x:Name="consumeGTestAsLabel" x:Uid="consumeGTestAsLabel" Content="Consume Google Test as:" HorizontalAlignment="Left" VerticalAlignment="Top"/>
<Label x:Name="consumeGTestAsLabel" x:Uid="consumeGTestAsLabel" Content="{x:Static resx:Resources.ConsumeAs}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
<StackPanel Margin="12,0,0,0">
<RadioButton x:Name="staticLibRadioButton" x:Uid="staticLibRadioButton" Content="Static Library (.lib)" HorizontalAlignment="Left" VerticalAlignment="Top" IsChecked="True" Margin="0,0,0,7"/>
<RadioButton x:Name="dynamicLibRadioButton" x:Uid="dynamicLibRadioButton" Content="Dynamic Library (.dll)" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,0,0,7"/>
<RadioButton x:Name="staticLibRadioButton" x:Uid="staticLibRadioButton" Content="{x:Static resx:Resources.StaticLib}" HorizontalAlignment="Left" VerticalAlignment="Top" IsChecked="True" Margin="0,0,0,7"/>
<RadioButton x:Name="dynamicLibRadioButton" x:Uid="dynamicLibRadioButton" Content="{x:Static resx:Resources.DynamicLib}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,0,0,7"/>
</StackPanel>
</StackPanel>
<StackPanel Grid.Column="1" Margin="24,12,0,0">
<Label x:Name="runtimeLibrariesLabel" x:Uid="runtimeLibrariesLabel" Content="C++ runtime libraries:" HorizontalAlignment="Left" VerticalAlignment="Top"/>
<Label x:Name="runtimeLibrariesLabel" x:Uid="runtimeLibrariesLabel" Content="{x:Static resx:Resources.RuntimeLibs}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
<StackPanel Margin="12,0,0,0">
<RadioButton x:Name="linkDynamicRadioButton" x:Uid="linkDynamicRadioButton" Content="Link dynamically (Recommended)" HorizontalAlignment="Left" VerticalAlignment="Top" IsChecked="True" Width="203" Margin="0,0,0,7"/>
<RadioButton x:Name="linkStaticRadioButton" x:Uid="linkStaticRadioButton" Content="Link statically" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,0,0,7"/>
<RadioButton x:Name="linkDynamicRadioButton" x:Uid="linkDynamicRadioButton" Content="{x:Static resx:Resources.LinkDynamic}" HorizontalAlignment="Left" VerticalAlignment="Top" IsChecked="True" Width="203" Margin="0,0,0,7"/>
<RadioButton x:Name="linkStaticRadioButton" x:Uid="linkStaticRadioButton" Content="{x:Static resx:Resources.LinkStatic}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,0,0,7"/>
</StackPanel>
</StackPanel>
</Grid>
Expand Down
3 changes: 2 additions & 1 deletion GoogleTestAdapter/NewProjectWizard/SinglePageWizardDialog.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using EnvDTE;
using Microsoft.VisualStudio.PlatformUI;
using Microsoft.VisualStudio.Imaging;
using Resx = NewProjectWizard.Properties.Resources;

namespace Microsoft.NewProjectWizard
{
Expand All @@ -34,7 +35,7 @@ public SinglePageWizardDialog(string title, ConfigurationData data)
}
else
{
projectComboBox.Items.Add("<No project>");
projectComboBox.Items.Add(Resx.NoProject);
foreach (string project in data.Projects)
{
projectComboBox.Items.Add(project);
Expand Down