Skip to content
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

Localize Color Picker imp #13203

Merged
merged 4 commits into from
Aug 15, 2022
Merged

Localize Color Picker imp #13203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb89a20
Initialize with current culture
QilongTang Aug 10, 2022
737d1d4
Merge branch 'master' into ColorPickerLocalization
QilongTang Aug 12, 2022
d8a9fa1
Revert "Initialize with current culture"
QilongTang Aug 12, 2022
94ec0a1
Add resource strings for buttons
QilongTang Aug 12, 2022
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
4 changes: 3 additions & 1 deletion src/Libraries/CoreNodeModelsWpf/Controls/ColorPalette.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
Width="80"
AvailableColorsHeader="{x:Static p:CoreNodeModelWpfResources.ColorPaletteUIStandardColors}"
ShowStandardColors="False"
ShowRecentColors="True"
ShowRecentColors="True"
StandardButtonHeader="{x:Static p:CoreNodeModelWpfResources.ColorPaletteUIStandardButtonHeader}"
AdvancedButtonHeader="{x:Static p:CoreNodeModelWpfResources.ColorPaletteUIAdvancedButtonHeader}"
RecentColorsHeader="{x:Static p:CoreNodeModelWpfResources.ColorPaletteUIRecentColors}" />
</Grid>
</UserControl>
20 changes: 10 additions & 10 deletions src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@
</Page>
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<Compile Update="Properties\CoreNodeModelWpfResources.Designer.cs">
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Update="Properties\Resources.en-US.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>CoreNodeModelWpfResources.resx</DependentUpon>
</Compile>
<Compile Update="Properties\CoreNodeModelWpfResources.en-US.Designer.cs">
<DesignTime>True</DesignTime>
<DependentUpon>Resources.en-US.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DependentUpon>CoreNodeModelWpfResources.en-US.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
Expand All @@ -110,13 +110,13 @@
<Resource Include="Resources\MissingNode.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Properties\Resources.resx">
<EmbeddedResource Update="Properties\CoreNodeModelWpfResources.en-US.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<LastGenOutput>CoreNodeModelWpfResources.en-US.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Properties\Resources.en-US.resx">
<EmbeddedResource Update="Properties\CoreNodeModelWpfResources.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.en-US.Designer.cs</LastGenOutput>
<LastGenOutput>CoreNodeModelWpfResources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<Target Name="BinaryCompatibilityOps" BeforeTargets="Build">
Expand Down
18 changes: 18 additions & 0 deletions src/Libraries/CoreNodeModelsWpf/Properties/CoreNodeModelWpfResources.Designer.cs
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions src/Libraries/CoreNodeModelsWpf/Properties/CoreNodeModelWpfResources.en-US.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ColorPaletteUIAdvancedButtonHeader" xml:space="preserve">
<value>Advanced</value>
</data>
<data name="ColorPaletteUIRecentColors" xml:space="preserve">
<value>Recent Colors</value>
</data>
<data name="ColorPaletteUIStandardButtonHeader" xml:space="preserve">
<value>Standard</value>
</data>
<data name="ColorPaletteUIStandardColors" xml:space="preserve">
<value>Standard Colors</value>
</data>
Expand Down
6 changes: 6 additions & 0 deletions src/Libraries/CoreNodeModelsWpf/Properties/CoreNodeModelWpfResources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ColorPaletteUIAdvancedButtonHeader" xml:space="preserve">
<value>Advanced</value>
</data>
<data name="ColorPaletteUIRecentColors" xml:space="preserve">
<value>Recent Colors</value>
</data>
<data name="ColorPaletteUIStandardButtonHeader" xml:space="preserve">
<value>Standard</value>
</data>
<data name="ColorPaletteUIStandardColors" xml:space="preserve">
<value>Standard Colors</value>
</data>
Expand Down