Localize Color Picker imp (#13203)

* Initialize with current culture * Revert "Initialize with current culture" This reverts commit cb89a20. * Add resource strings for buttons
DynamoDS · Aug 15, 2022 · 933f16c · 933f16c
1 parent df64d01
commit 933f16c
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 11 deletions.
diff --git a/src/Libraries/CoreNodeModelsWpf/Controls/ColorPalette.xaml b/src/Libraries/CoreNodeModelsWpf/Controls/ColorPalette.xaml
@@ -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>
diff --git a/src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpf.csproj b/src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpf.csproj
@@ -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>
@@ -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">

diff --git a/src/Libraries/CoreNodeModelsWpf/Properties/CoreNodeModelWpfResources.Designer.cs b/src/Libraries/CoreNodeModelsWpf/Properties/CoreNodeModelWpfResources.Designer.cs
diff --git a/src/Libraries/CoreNodeModelsWpf/Properties/CoreNodeModelWpfResources.en-US.resx b/src/Libraries/CoreNodeModelsWpf/Properties/CoreNodeModelWpfResources.en-US.resx
@@ -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>

diff --git a/src/Libraries/CoreNodeModelsWpf/Properties/CoreNodeModelWpfResources.resx b/src/Libraries/CoreNodeModelsWpf/Properties/CoreNodeModelWpfResources.resx
@@ -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>