Skip to content

Commit d7fc933

Browse files
XTsatXTsat
committed
i18n optimize
1 parent bb402f1 commit d7fc933

File tree

7 files changed

+187
-57
lines changed

7 files changed

+187
-57
lines changed

‎CompactGUI/Components/Settings/Settings_skiplistflyout.xaml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ui:FluentWindow x:Class="Settings_skiplistflyout"
1+
<ui:FluentWindow x:Class="Settings_skiplistflyout"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -45,7 +45,8 @@
4545
<Grid x:Name="MainGrid">
4646
<ui:TitleBar Panel.ZIndex="10"
4747
ShowMaximize="False" ShowMinimize="False" />
48-
<TextBlock Text="edit skipped filetypes"
48+
<TextBlock Text="{local:Localize SettingsSkiplistflyoutEditSkippedFiletypes}"
49+
d:Text="edit skipped filetypes"
4950
Margin="10"
5051
FontSize="22" FontWeight="SemiBold" />
5152
<local:TokenizedTextBox x:Name="UiTokenizedText"
@@ -64,12 +65,14 @@
6465
</local:TokenizedTextBox>
6566

6667
<Button x:Name="UiSave"
67-
Content="Save"
68+
Content="{local:Localize UniSave}"
69+
d:Content="Save"
6870
Width="100"
6971
Margin="0,0,130,20" HorizontalAlignment="Right" VerticalAlignment="Bottom"
7072
Click="UISave_Click" />
7173
<Button x:Name="UiReset"
72-
Content="Reset"
74+
Content="{local:Localize UniReset}"
75+
d:Content="Reset"
7376
Width="100"
7477
Margin="0,0,10,20" HorizontalAlignment="Right" VerticalAlignment="Bottom"
7578
Click="UIReset_Click" />

‎CompactGUI/LanguageHelper.vb‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -105,32 +105,6 @@ Public Class LanguageHelper
105105
' End If
106106
'End If
107107

108-
'@@@
109-
'Dim systemLang = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName
110-
'Dim defaultLang As String = "en-US"
111-
112-
''匹配多语言
113-
'Select Case systemLang.ToLower()
114-
' Case "zh" ' 中文
115-
' defaultLang = "zh-CN"
116-
' Case "en" ' 英文
117-
' defaultLang = "en-US"
118-
' Case "ja" ' 日语
119-
' defaultLang = "ja-JP"
120-
' Case "ko" ' 韩语
121-
' defaultLang = "ko-KR"
122-
' Case "fr" ' 法语
123-
' defaultLang = "fr-FR"
124-
' Case "de" ' 德语
125-
' defaultLang = "de-DE"
126-
' Case "es" ' 西班牙语
127-
' defaultLang = "es-ES"
128-
' Case "ru" ' 俄语
129-
' defaultLang = "ru-RU"
130-
' Case Else ' 未匹配语言，默认英文
131-
' defaultLang = "en-US"
132-
'End Select
133-
134108
ApplyCulture(defaultLang)
135109
WriteAppConfig("language", defaultLang)
136110
End Sub

‎CompactGUI/Views/SettingsPage.xaml‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -325,10 +325,10 @@
325325
Width="290" Height="35"
326326
Margin="10,0,0,0" HorizontalAlignment="Left"
327327
SelectedIndex="{Binding AppSettings.BackgroundModeSelection, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
328-
<ComboBoxItem Content="Never" />
329-
<ComboBoxItem Content="When System is Idle" />
330-
<ComboBoxItem Content="On Schedule" />
331-
<ComboBoxItem Content="On Schedule if system is also idle" />
328+
<ComboBoxItem Content="{local:Localize SettingsBackgroundWatcherSettingsCompressFoldersNever}" d:Content="Never" />
329+
<ComboBoxItem Content="{local:Localize SettingsBackgroundWatcherSettingsCompressFoldersIdle}" d:Content="When System is Idle" />
330+
<ComboBoxItem Content="{local:Localize SettingsBackgroundWatcherSettingsCompressFoldersOnSchedule}" d:Content="On Schedule" />
331+
<ComboBoxItem Content="{local:Localize SettingsBackgroundWatcherSettingsCompressFoldersOnScheduleIdle}" d:Content="On Schedule if system is also idle" />
332332

333333
</ComboBox>
334334

@@ -374,15 +374,15 @@
374374
</DataTemplate>
375375
</ComboBox.ItemTemplate>
376376
</ComboBox>
377-
377+
378378
</StackPanel>
379379

380380
</WrapPanel>
381-
<TextBlock Text="{Binding AppSettings.ScheduledBackgroundLastRan, StringFormat='{}Last ran: {0:dd MMM yyyy \\a\\t HH:mm:ss }', Mode=OneWay}"
381+
<TextBlock Text="{Binding AppSettings.ScheduledBackgroundLastRan, StringFormat={local:Localize SettingsBackgroundWatcherSettingsCompressFoldersLastRanFormat},Mode=OneWay}"
382382
Margin="45,10,0,0"
383383
Foreground="#30FFFFFF" />
384384

385-
<TextBlock Text="{Binding AppSettings.NextScheduledBackgroundRun, StringFormat='{}Next scheduled: {0:dd MMM yyyy \\a\\t HH:mm:ss }', Mode=OneWay}"
385+
<TextBlock Text="{Binding AppSettings.NextScheduledBackgroundRun, StringFormat={local:Localize SettingsBackgroundWatcherSettingsCompressFoldersNextScheduledFormat},Mode=OneWay}"
386386
Margin="45,10,0,0"
387387
Foreground="#30FFFFFF"
388388
Visibility="{Binding AppSettings.BackgroundModeSelection, Mode=OneWay, Converter={StaticResource BackgroundModeToVisibilityConverter}}" />
@@ -437,28 +437,30 @@
437437
</ui:CardExpander.Header>
438438

439439

440-
<StackPanel Margin="15,-10,15,10" FlowDirection="LeftToRight">
441-
<!-- Language Selector -->
442-
<Grid Margin="0,10,0,10">
443-
<Grid.ColumnDefinitions>
444-
<ColumnDefinition Width="*" />
445-
<ColumnDefinition Width="Auto" />
446-
</Grid.ColumnDefinitions>
440+
<StackPanel Margin="15,-10,15,10" FlowDirection="LeftToRight">
441+
<!-- Language Selector -->
442+
<Grid Margin="0,10,0,10">
443+
<Grid.ColumnDefinitions>
444+
<ColumnDefinition Width="*" />
445+
<ColumnDefinition Width="Auto" />
446+
</Grid.ColumnDefinitions>
447447
<Label Content="{Binding SettingsUiSettingsLanguageChangedLabel, RelativeSource={RelativeSource AncestorType=Page}}"
448448
d:Content="Language (Requires Restart)" VerticalAlignment="Center"/>
449-
<ComboBox x:Name="UiLanguageComboBox" Grid.Column="1" Width="150" SelectedIndex="0" SelectionChanged="UiLanguageComboBox_SelectionChanged">
450-
<ComboBoxItem Content="English" Tag="en-US" />
451-
<ComboBoxItem Content="简体中文" Tag="zh-CN" />
452-
</ComboBox>
453-
</Grid>
454-
<StackPanel Margin="-10,10,0,0">
455-
<CheckBox x:Name="UiAlwaysShowDetailedCompressionMode"
449+
<ComboBox x:Name="UiLanguageComboBox"
450+
Width="120" Margin="250,0,0,0" HorizontalAlignment="Left"
451+
SelectedIndex="0" SelectionChanged="UiLanguageComboBox_SelectionChanged">
452+
<ComboBoxItem Content="English" Tag="en-US" />
453+
<ComboBoxItem Content="简体中文" Tag="zh-CN" />
454+
</ComboBox>
455+
</Grid>
456+
<StackPanel Margin="-10,10,0,0">
457+
<CheckBox x:Name="UiAlwaysShowDetailedCompressionMode"
456458
Content="{local:Localize SettingsUiSettingsCompressionButtons}"
457459
d:Content="Always show details on Compression Mode buttons"
458460
Margin="0,-3"
459461
IsChecked="{Binding AppSettings.AlwaysShowDetailedCompressionMode}" />
460-
</StackPanel>
461-
</StackPanel>
462+
</StackPanel>
463+
</StackPanel>
462464

463465
</ui:CardExpander>
464466

‎CompactGUI/Views/SettingsPage.xaml.vb‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
Imports System.Windows.Data
22

33
Partial Public Class SettingsPage
4+
Sub New(settingsviewmodel As SettingsViewModel)
5+
6+
InitializeComponent()
7+
8+
9+
DataContext = settingsviewmodel
10+
11+
12+
ScrollViewer.SetCanContentScroll(Me, False)
13+
14+
End Sub
15+
16+
417
Public Property LanguageChangedLabelContent As String
518
Get
619
Return CType(GetValue(LanguageChangedLabelContentProperty), String)

‎CompactGUI/i18n/i18n.Designer.vb‎

Lines changed: 81 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CompactGUI/i18n/i18n.resx‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
</data>
160160
<data name="SettingsBackgroundWatcherSettingsTimeAt" xml:space="preserve">
161161
<value>at</value>
162-
<comment>@MutedRule(WhiteSpaceLead)@MutedRule(WhiteSpaceTail)@Invariant</comment>
162+
<comment>@MutedRule(WhiteSpaceLead)@MutedRule(WhiteSpaceTail)</comment>
163163
</data>
164164
<data name="SettingsCompressionSettingsCompressionSettings" xml:space="preserve">
165165
<value>Compression Settings</value>
@@ -387,4 +387,31 @@ skips files based on compression estimate</value>
387387
<data name="DatabasePage_Descending" xml:space="preserve">
388388
<value>Descending</value>
389389
</data>
390+
<data name="SettingsSkiplistflyoutEditSkippedFiletypes" xml:space="preserve">
391+
<value>edit skipped filetypes</value>
392+
</data>
393+
<data name="UniSave" xml:space="preserve">
394+
<value>Save</value>
395+
</data>
396+
<data name="UniReset" xml:space="preserve">
397+
<value>Reset</value>
398+
</data>
399+
<data name="SettingsBackgroundWatcherSettingsCompressFoldersNever" xml:space="preserve">
400+
<value>Never</value>
401+
</data>
402+
<data name="SettingsBackgroundWatcherSettingsCompressFoldersIdle" xml:space="preserve">
403+
<value>When System is Idle</value>
404+
</data>
405+
<data name="SettingsBackgroundWatcherSettingsCompressFoldersOnSchedule" xml:space="preserve">
406+
<value>On Schedule</value>
407+
</data>
408+
<data name="SettingsBackgroundWatcherSettingsCompressFoldersOnScheduleIdle" xml:space="preserve">
409+
<value>On Schedule if system is also idle</value>
410+
</data>
411+
<data name="SettingsBackgroundWatcherSettingsCompressFoldersLastRanFormat" xml:space="preserve">
412+
<value>Last ran: {0:dd MMM yyyy \a\t HH:mm:ss}</value>
413+
</data>
414+
<data name="SettingsBackgroundWatcherSettingsCompressFoldersNextScheduledFormat" xml:space="preserve">
415+
<value>Next scheduled: {0:dd MMM yyyy \a\t HH:mm:ss}</value>
416+
</data>
390417
</root>

‎CompactGUI/i18n/i18n.zh-CN.resx‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="MessageWelcome" xml:space="preserve">
121-
<value>欢迎</value>
122-
</data>
123120
<data name="SettingsUiSettings" xml:space="preserve">
124121
<value>UI 设置</value>
125122
</data>
@@ -366,4 +363,37 @@
366363
<data name="DatabasePage_Descending" xml:space="preserve">
367364
<value>降序</value>
368365
</data>
366+
<data name="UniSave" xml:space="preserve">
367+
<value>保存</value>
368+
</data>
369+
<data name="UniReset" xml:space="preserve">
370+
<value>重置</value>
371+
</data>
372+
<data name="SettingsSkiplistflyoutEditSkippedFiletypes" xml:space="preserve">
373+
<value>编辑跳过类型</value>
374+
</data>
375+
<data name="SettingsBackgroundWatcherSettingsCompressFoldersNever" xml:space="preserve">
376+
<value>从不</value>
377+
</data>
378+
<data name="SettingsBackgroundWatcherSettingsCompressFoldersIdle" xml:space="preserve">
379+
<value>当系统空闲时</value>
380+
</data>
381+
<data name="SettingsBackgroundWatcherSettingsCompressFoldersOnSchedule" xml:space="preserve">
382+
<value>按计划</value>
383+
</data>
384+
<data name="SettingsBackgroundWatcherSettingsCompressFoldersOnScheduleIdle" xml:space="preserve">
385+
<value>按计划且系统空闲时</value>
386+
</data>
387+
<data name="SettingsBackgroundWatcherSettingsCompressFoldersLastRanFormat" xml:space="preserve">
388+
<value>上次运行: {0:yyyy年 M月 d日 HH:mm:ss}</value>
389+
</data>
390+
<data name="SettingsBackgroundWatcherSettingsCompressFoldersNextScheduledFormat" xml:space="preserve">
391+
<value>下次计划: {0:yyyy年 M月 d日 HH:mm:ss}</value>
392+
</data>
393+
<data name="MessageWelcome" xml:space="preserve">
394+
<value>欢迎</value>
395+
</data>
396+
<data name="SettingsBackgroundWatcherSettingsTimeAt" xml:space="preserve">
397+
<value> </value>
398+
</data>
369399
</root>

0 commit comments

Comments
 (0)