From ee51aed7d428a4054d61d8c47ff97f3e4a50adeb Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Wed, 22 Apr 2020 23:30:04 +0800 Subject: [PATCH] add ru.resx for demo --- .../HandyControlDemo_Core_GE30.csproj | 9 + .../HandyControl_Core_GE30.csproj | 3 + .../HandyControlDemo_Net_40.csproj | 9 + .../HandyControl_Net_40.csproj | 3 + .../Themes/Styles/MessageBox.xaml | 11 +- .../HandyControlDemo_Net_GE45.csproj | 9 + .../HandyControl_Net_GE45.csproj | 3 + .../Properties/Langs/Lang.ru.resx | 753 ++++++++++++++++++ .../Resources/Img/Flag/ko-KR.png | Bin 0 -> 1856 bytes .../Resources/Img/Flag/ru.png | Bin 0 -> 322 bytes .../UserControl/Main/AppNotification.xaml | 3 +- .../UserControl/Main/NoUserContent.xaml | 10 +- .../Properties/Langs/Lang.ru.resx | 6 - .../Styles/Base/ColorPickerBaseStyle.xaml | 7 +- .../Themes/Styles/CalendarWithClock.xaml | 5 +- .../Themes/Styles/Clock.xaml | 11 +- .../Themes/Styles/MessageBox.xaml | 11 +- .../Themes/Styles/PopupWindow.xaml | 7 +- 18 files changed, 828 insertions(+), 32 deletions(-) create mode 100644 src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx create mode 100644 src/Shared/HandyControlDemo_Shared/Resources/Img/Flag/ko-KR.png create mode 100644 src/Shared/HandyControlDemo_Shared/Resources/Img/Flag/ru.png diff --git a/src/Core_GE30/HandyControlDemo_Core_GE30/HandyControlDemo_Core_GE30.csproj b/src/Core_GE30/HandyControlDemo_Core_GE30/HandyControlDemo_Core_GE30.csproj index 484c9b1f..5fa6d695 100644 --- a/src/Core_GE30/HandyControlDemo_Core_GE30/HandyControlDemo_Core_GE30.csproj +++ b/src/Core_GE30/HandyControlDemo_Core_GE30/HandyControlDemo_Core_GE30.csproj @@ -195,6 +195,12 @@ Resources\Img\Flag\fr.png + + Resources\Img\Flag\ko-KR.png + + + Resources\Img\Flag\ru.png + Resources\Img\icon-white.ico @@ -506,6 +512,9 @@ Properties\Langs\Lang.ko-KR.resx + + Properties\Langs\Lang.ru.resx + Properties\Langs\Lang.resx PublicResXFileCodeGenerator diff --git a/src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj b/src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj index c0711c2e..32d240f8 100644 --- a/src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj +++ b/src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj @@ -62,6 +62,9 @@ Properties\Langs\Lang.ko-KR.resx + + Properties\Langs\Lang.ru.resx + Properties\Langs\Lang.resx PublicResXFileCodeGenerator diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj index 54c69160..89bcf591 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -214,6 +214,12 @@ Resources\Img\Flag\fr.png + + Resources\Img\Flag\ko-KR.png + + + Resources\Img\Flag\ru.png + Resources\Img\icon-white.ico @@ -427,6 +433,9 @@ Properties\Langs\Lang.ko-KR.resx + + Properties\Langs\Lang.ru.resx + Properties\Langs\Lang.resx PublicResXFileCodeGenerator diff --git a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj index 51b003d3..327a973d 100644 --- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj +++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj @@ -108,6 +108,9 @@ Properties\Langs\Lang.ko-KR.resx + + Properties\Langs\Lang.ru.resx + Properties\Langs\Lang.resx PublicResXFileCodeGenerator diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml index 8af1741b..ad14f80b 100644 --- a/src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml +++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml @@ -3,7 +3,8 @@ xmlns:controls="clr-namespace:HandyControl.Controls" xmlns:langs="clr-namespace:HandyControl.Properties.Langs" xmlns:interactivity="clr-namespace:HandyControl.Interactivity" - xmlns:shell="http://schemas.microsoft.com/winfx/2006/xaml/presentation/shell"> + xmlns:shell="http://schemas.microsoft.com/winfx/2006/xaml/presentation/shell" + xmlns:ex="clr-namespace:HandyControl.Tools.Extension"> @@ -75,10 +76,10 @@ - - - + +