Optimized translation

deemoe404 · dimojang · Mar 28, 2021 · Mar 28, 2021 · Mar 28, 2021 · Mar 28, 2021
commit 484c9167e14ec41b9a4870e805e8fd4a83afde97
diff --git a/App.xaml.cs b/App.xaml.cs
@@ -41,6 +41,7 @@ protected override void OnStartup(StartupEventArgs e)
                     break;
                 default: //english default
                     dict.Source = new Uri(@"Resources\Language\en-US.xaml", UriKind.Relative);
+                    ConfigHelper.Instance.SetLang("en");
                     break;
             }
             Current.Resources.MergedDictionaries.Add(dict);

diff --git a/Frogy.csproj b/Frogy.csproj
@@ -168,7 +168,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="Resources\Language\LanguageHelper.cs" />
-    <Compile Include="Resources\Theme\ThemeHelper.cs" />
     <Compile Include="ViewModels\DashboardViewModel.cs" />
     <Compile Include="ViewModels\OptionViewModel.cs" />
     <Compile Include="ViewModels\OverViewViewModel.cs" />

diff --git a/Resources/Language/en-US.xaml b/Resources/Language/en-US.xaml
@@ -28,5 +28,7 @@
     <system:String x:Key="Option_LanguageTitle">Launage</system:String>
     <system:String x:Key="Option_Info">*Some of the setting(s) will take effect after restarting Frogy.</system:String>
     <system:String x:Key="Option_ThemeTitle">Theme</system:String>
+    <system:String x:Key="Option_ThemeDefault">Default</system:String>
+    <system:String x:Key="Option_ThemeNight">Night</system:String>
 
 </ResourceDictionary>
diff --git a/Resources/Language/zh-CN.xaml b/Resources/Language/zh-CN.xaml
@@ -28,5 +28,7 @@
     <system:String x:Key="Option_LanguageTitle">语言</system:String>
     <system:String x:Key="Option_Info">*部分设置在重启 时常 后生效。</system:String>
     <system:String x:Key="Option_ThemeTitle">主题</system:String>
+    <system:String x:Key="Option_ThemeDefault">默认</system:String>
+    <system:String x:Key="Option_ThemeNight">夜晚</system:String>
 
 </ResourceDictionary>
diff --git a/Resources/Theme/DarkTheme.xaml b/Resources/Theme/DarkTheme.xaml
@@ -1,7 +1,11 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf">
-
+                    xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+    <system:String x:Key="en-US">Dark</system:String>
+    <system:String x:Key="zh-CN">夜间模式</system:String>
+
     <Style x:Key="DefaultChartStyle" TargetType="lvc:CartesianChart">
         <Setter Property="Foreground" Value="White"/>
     </Style>

diff --git a/Resources/Theme/DefaultTheme.xaml b/Resources/Theme/DefaultTheme.xaml
@@ -1,7 +1,10 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib"
-                    xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf">
+                    xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+    <system:String x:Key="en-US">Default</system:String>
+    <system:String x:Key="zh-CN">默认</system:String>
 
     <Style x:Key="DefaultChartStyle" TargetType="lvc:CartesianChart">
         <Setter Property="Foreground" Value="Black"/>

diff --git a/Resources/Theme/ThemeHelper.cs b/Resources/Theme/ThemeHelper.cs
diff --git a/ViewModels/OptionViewModel.cs b/ViewModels/OptionViewModel.cs
@@ -12,7 +12,6 @@
 using System.Windows.Input;
 
 using Frogy.Resources.Language;
-using Frogy.Resources.Theme;
 using System.Windows.Controls;
 
 namespace Frogy.ViewModels
@@ -116,20 +115,6 @@ public int LanguageListSelectedIndex
         #endregion
 
         #region Theme setting
-        private List<string> themeList = new List<string>();
-        public List<string> ThemeList
-        {
-            get
-            {
-                themeList.Clear();
-
-                foreach (KeyValuePair<int, string> pair in ThemeHelper.ThemeSets)
-                    themeList.Add(pair.Value);
-
-                return themeList;
-            }
-        }
-
         private int themeListSelectedIndex = ((App)Application.Current).appData.ThemeSetting >= 0 && ((App)Application.Current).appData.ThemeSetting <= 1 ?
             ((App)Application.Current).appData.ThemeSetting : 0;
         public int ThemeListSelectedIndex

diff --git a/Views/OptionView.xaml b/Views/OptionView.xaml
@@ -65,13 +65,9 @@
                 <StackPanel Margin="10"
                             Orientation="Horizontal">
                     <ComboBox Margin="5"
-                              ItemsSource="{Binding Path=ThemeList}"
                               SelectedIndex="{Binding Path=ThemeListSelectedIndex}">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate>
-                                <TextBlock Text="{Binding}"/>
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
+                        <ComboBoxItem Content="{DynamicResource Option_ThemeDefault}"/>
+                        <ComboBoxItem Content="{DynamicResource Option_ThemeNight}"/>
                     </ComboBox>
                 </StackPanel>