Skip to content

Commit 457da95

Browse files
dimojangdimojang
committed
Improve translation
1 parent 587a470 commit 457da95

File tree

6 files changed

+22
-10
lines changed

6 files changed

+22
-10
lines changed

‎App.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
<Application.Resources>
1111
<ResourceDictionary>
1212
<ResourceDictionary.MergedDictionaries>
13-
<!--<ResourceDictionary Source="/Frogy;component/Resources/Language/EN.xaml"/>-->
14-
1513
<!--<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDark.xaml"/>-->
1614
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
1715
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>

‎App.xaml.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Frogy.Classes;
22
using Frogy.Views;
3+
using HandyControl.Tools;
34
using Hardcodet.Wpf.TaskbarNotification;
45
using Hardcodet.Wpf.TaskbarNotification.Interop;
56
using Microsoft.Win32;
@@ -32,9 +33,11 @@ protected override void OnStartup(StartupEventArgs e)
3233
{
3334
case "en-US":
3435
dict.Source = new Uri(@"Resources\Language\EN.xaml", UriKind.Relative);
36+
ConfigHelper.Instance.SetLang("en");
3537
break;
3638
case "zh-CN":
3739
dict.Source = new Uri(@"Resources\Language\ZH.xaml", UriKind.Relative);
40+
ConfigHelper.Instance.SetLang("zh-cn");
3841
break;
3942
default: //english default
4043
dict.Source = new Uri(@"Resources\Language\EN.xaml", UriKind.Relative);

‎Methods/MyDeviceHelper.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System;
1+
using Microsoft.Win32;
2+
using System;
23
using System.Collections.Generic;
34
using System.Linq;
45
using System.Runtime.InteropServices;

‎Resources/Language/EN.xaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,9 @@
1818
<system:String x:Key="TaskBar_StartUp">Frogy is now running. Enjoy your time!</system:String>
1919
<system:String x:Key="TaskBar_Overlap">Frogy is already running. Go check your taskbar icon!</system:String>
2020

21+
<system:String x:Key="Option_DataPathTitle">Application data path</system:String>
22+
<system:String x:Key="Option_DataPathButton">Change</system:String>
23+
<system:String x:Key="Option_AboteTitle">About</system:String>
24+
<system:String x:Key="Option_AboutContent">Frogy - screen time.</system:String>
25+
2126
</ResourceDictionary>

‎Resources/Language/ZH.xaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,13 @@
1414
<system:String x:Key="Table_SoftwareTitle">软件标题</system:String>
1515
<system:String x:Key="Table_TimeDuration">持续时间</system:String>
1616

17-
<system:String x:Key="TaskBar_AppName">Frogy 主程序</system:String>
18-
<system:String x:Key="TaskBar_StartUp">Frogy 成功启动，自由使用你的电脑吧！</system:String>
19-
<system:String x:Key="TaskBar_Overlap">Frogy 已在后台运行。请检查任务栏通知区域。</system:String>
17+
<system:String x:Key="TaskBar_AppName">时常主程序</system:String>
18+
<system:String x:Key="TaskBar_StartUp">时常成功启动，自由使用你的电脑吧！</system:String>
19+
<system:String x:Key="TaskBar_Overlap">时常已在后台运行。请检查任务栏通知区域。</system:String>
2020

21+
<system:String x:Key="Option_DataPathTitle">应用数据路径</system:String>
22+
<system:String x:Key="Option_DataPathButton">更改</system:String>
23+
<system:String x:Key="Option_AboteTitle">关于</system:String>
24+
<system:String x:Key="Option_AboutContent">时常 - 屏幕使用时间.</system:String>
25+
2126
</ResourceDictionary>

‎Views/OptionView.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
<StackPanel>
1414

1515
<TextBlock Style="{StaticResource TextBlockSubTitleBold}"
16-
Text="Application data path"
16+
Text="{DynamicResource Option_DataPathTitle}"
1717
Margin="10,10,10,0"
1818
HorizontalAlignment="Left"/>
1919
<Grid Margin="10,0,15,15">
2020
<Grid.ColumnDefinitions>
2121
<ColumnDefinition Width="*"/>
2222
<ColumnDefinition Width="95"/>
2323
</Grid.ColumnDefinitions>
24-
<Button Content="Change"
24+
<Button Content="{DynamicResource Option_DataPathButton}"
2525
Command="{Binding ChangeDataPathButton}"
2626
Grid.Column="1"
2727
Margin="5,5,5,0"/>
@@ -33,11 +33,11 @@
3333
<Separator/>
3434

3535
<TextBlock Style="{StaticResource TextBlockSubTitleBold}"
36-
Text="About"
36+
Text="{DynamicResource Option_AboteTitle}"
3737
Margin="10,10,10,0"
3838
HorizontalAlignment="Left"/>
3939
<Grid Margin="10,0,15,15">
40-
<TextBlock Text="Hello there, this is an small about~ something should be shown here but it didn't. QAQ"
40+
<TextBlock Text="{DynamicResource Option_AboutContent}"
4141
VerticalAlignment="Center"
4242
Margin="2,5,5,0"/>
4343
</Grid>

0 commit comments

Comments
 (0)