Fix translation errors;

dotnet9 · dotnet9 · commit ca4d296853b4 · 2024-12-05T19:47:43.000+08:00
diff --git a/src/CodeWF.Core/CodeWF.Core.csproj b/src/CodeWF.Core/CodeWF.Core.csproj
@@ -12,6 +12,7 @@
     <PackageReference Include="Dapper.AOT" Version="1.0.31" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.0" />
     <PackageReference Include="Prism.DryIoc.Avalonia" Version="9.0.401.11110-pre" />
+    <PackageReference Include="AvaloniaXmlTranslator" Version="0.0.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/CodeWF.Core/RegionAdapters/TabControlRegionAdapter.cs b/src/CodeWF.Core/RegionAdapters/TabControlRegionAdapter.cs
@@ -1,4 +1,9 @@
-﻿using Avalonia.Controls;
+﻿using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Data;
+using AvaloniaXmlTranslator;
+using AvaloniaXmlTranslator.Converters;
+using AvaloniaXmlTranslator.Markup;
 using System.Collections.Specialized;
 
 namespace CodeWF.Core.RegionAdapters;
@@ -44,8 +49,9 @@ protected override void Adapt(IRegion region, TabControl regionTarget)
                                 var header = item is UserControl { DataContext: ITabItemBase tabItem }
                                     ? tabItem.Title
                                     : item?.GetType().ToString();
-
-                                regionTarget.Items.Add(new TabItem { Header = header, Content = item });
+                                var newTabItem = new TabItem { Content = item };
+                                newTabItem.Bind(TabItem.HeaderProperty, new I18nBinding(header));
+                                regionTarget.Items.Add(newTabItem);
                             }
                         }
 
diff --git a/src/CodeWF.Modules.AI/I18n/AIModule.ja-JP.xml b/src/CodeWF.Modules.AI/I18n/AIModule.ja-JP.xml
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 
-<Localization language="Japanese" description="日本語版" cultureName="ja-JP">
+<Localization language="Japanese" description="日語" cultureName="ja-JP">
 	<AIModule>
 		<Title>AI（人工知能）</Title>
 	</AIModule>
diff --git a/src/CodeWF.Modules.Converter/I18n/ConverterModule.ja-JP.xml b/src/CodeWF.Modules.Converter/I18n/ConverterModule.ja-JP.xml
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 
-<Localization language="Japanese" description="日本語版" cultureName="ja-JP">
+<Localization language="Japanese" description="日語" cultureName="ja-JP">
 	<ConverterModule>
 		<Title>コンバーター</Title>
 	</ConverterModule>
diff --git a/src/CodeWF.Modules.Development/I18n/DevelopmentModule.ja-JP.xml b/src/CodeWF.Modules.Development/I18n/DevelopmentModule.ja-JP.xml
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 
-<Localization language="Japanese" description="日本語版" cultureName="ja-JP">
+<Localization language="Japanese" description="日語" cultureName="ja-JP">
 	<DevelopmentModule>
 		<Title>開発</Title>
 	</DevelopmentModule>
diff --git a/src/CodeWF.Toolbox/Assets/wechatowner.jpg b/src/CodeWF.Toolbox/Assets/wechatowner.jpg
diff --git a/src/CodeWF.Toolbox/Assets/wechatpublic.jpg b/src/CodeWF.Toolbox/Assets/wechatpublic.jpg
diff --git a/src/CodeWF.Toolbox/I18n/Language.cs b/src/CodeWF.Toolbox/I18n/Language.cs
@@ -29,6 +29,8 @@ namespace Localization
     public static class DashboardView
     {
         public static readonly string Title = "Localization.DashboardView.Title";
+        public static readonly string WeChat = "Localization.DashboardView.WeChat";
+        public static readonly string WeChatPublic = "Localization.DashboardView.WeChatPublic";
         public static readonly string DesiredAvailabilityNotification = "Localization.DashboardView.DesiredAvailabilityNotification";
         public static readonly string AccessToolbox = "Localization.DashboardView.AccessToolbox";
         public static readonly string MissingTool = "Localization.DashboardView.MissingTool";
diff --git a/src/CodeWF.Toolbox/I18n/MainModule.en-US.xml b/src/CodeWF.Toolbox/I18n/MainModule.en-US.xml
@@ -14,6 +14,8 @@
 	</MainWindow>
 	<DashboardView>
 		<Title>Homepage</Title>
+		<WeChat>Author's WeChat ID</WeChat>
+		<WeChatPublic>Follow WeChat official account</WeChatPublic>
 		<DesiredAvailabilityNotification>Everything you want is available. If not, please let us know.</DesiredAvailabilityNotification>
 		<AccessToolbox>Access the online toolbox</AccessToolbox>
 		<MissingTool>There's no tool I want...</MissingTool>
diff --git a/src/CodeWF.Toolbox/I18n/MainModule.ja-JP.xml b/src/CodeWF.Toolbox/I18n/MainModule.ja-JP.xml
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 
-<Localization language="Japanese" description="日本語版" cultureName="ja-JP">
+<Localization language="Japanese" description="日語" cultureName="ja-JP">
 	<MainModule>
 		<Title>コードワールドワークショップのツールボックス</Title>
 		<ShowMainWindow>メインウィンドウを表示する</ShowMainWindow>
@@ -14,6 +14,8 @@
 	</MainWindow>
 	<DashboardView>
 		<Title>ホームページ</Title>
+		<WeChat>著者のマイクロ信号</WeChat>
+		<WeChatPublic>ウィーチャットの公式アカウントに注目</WeChatPublic>
 		<DesiredAvailabilityNotification>欲しいものはすべてあります。ない場合はお知らせください。</DesiredAvailabilityNotification>
 		<AccessToolbox>オンラインツールボックスにアクセスする</AccessToolbox>
 		<MissingTool>欲しいツールがありません...</MissingTool>
diff --git a/src/CodeWF.Toolbox/I18n/MainModule.zh-CN.xml b/src/CodeWF.Toolbox/I18n/MainModule.zh-CN.xml
@@ -14,6 +14,8 @@
 	</MainWindow>
 	<DashboardView>
 		<Title>首页</Title>
+		<WeChat>联系微信号</WeChat>
+		<WeChatPublic>关注微信公众号</WeChatPublic>
 		<DesiredAvailabilityNotification>想要的都有，没有请告知。</DesiredAvailabilityNotification>
 		<AccessToolbox>访问在线工具箱</AccessToolbox>
 		<MissingTool>没有我要的工具...</MissingTool>
diff --git a/src/CodeWF.Toolbox/I18n/MainModule.zh-Hant.xml b/src/CodeWF.Toolbox/I18n/MainModule.zh-Hant.xml
@@ -14,6 +14,8 @@
 	</MainWindow>
 	<DashboardView>
 		<Title>首頁</Title>
+		<WeChat>作者微訊號</WeChat>
+		<WeChatPublic>關注微信公眾號</WeChatPublic>
 		<DesiredAvailabilityNotification>想要的都有，沒有請告知。</DesiredAvailabilityNotification>
 		<AccessToolbox>訪問線上工具箱</AccessToolbox>
 		<MissingTool>沒有我要的工具...</MissingTool>
diff --git a/src/CodeWF.Toolbox/ViewModels/AboutViewModel.cs b/src/CodeWF.Toolbox/ViewModels/AboutViewModel.cs
@@ -1,18 +1,16 @@
 ﻿using Avalonia.Controls;
-using AvaloniaXmlTranslator;
 using CodeWF.Core.RegionAdapters;
 using CodeWF.Tools.Extensions;
 using System;
 using System.Reflection;
-using TextMateSharp.Grammars;
 
 namespace CodeWF.Toolbox.ViewModels;
 
 public class AboutViewModel : ViewModelBase, ITabItemBase
 {
-    public string? Title { get; set; } = I18nManager.GetString(Localization.AboutView.Title);
+    public string? Title { get; set; } = Localization.AboutView.Title;
     public string? AppName { get; set; }
-    public string? Message { get; set; } = I18nManager.GetString(Localization.AboutView.Description);
+    public string? Message { get; set; } = Localization.AboutView.Description;
 
     public string? CompileTime { get; set; } =
         Assembly.GetExecutingAssembly().CompileTime()?.ToString("yyyy-MM-dd HH:mm:ss");
diff --git a/src/CodeWF.Toolbox/ViewModels/CommonSettingViewModel.cs b/src/CodeWF.Toolbox/ViewModels/CommonSettingViewModel.cs
@@ -26,8 +26,8 @@ public CommonSettingViewModel(IApplicationService applicationService)
         HideTrayIconOnClose = applicationService.HideTrayIconOnClose;
         NeedExitDialogOnClose = applicationService.NeedExitDialogOnClose;
 
-        Title = I18nManager.GetString(Localization.CommonSettingView.Title);
-        Message = I18nManager.GetString(Localization.CommonSettingView.Description);
+        Title = Localization.CommonSettingView.Title;
+        Message = Localization.CommonSettingView.Description;
     }
 
     private void InitTheme()
diff --git a/src/CodeWF.Toolbox/ViewModels/MainMenuViewModel.cs b/src/CodeWF.Toolbox/ViewModels/MainMenuViewModel.cs
@@ -1,15 +1,15 @@
-﻿using Avalonia.Controls.Notifications;
-using AvaloniaXmlTranslator;
+﻿using Avalonia.Controls;
+using Avalonia.Controls.Notifications;
 using CodeWF.Core;
 using CodeWF.Core.Models;
 using CodeWF.Toolbox.Commands;
+using CodeWF.Toolbox.Views;
 using DryIoc;
 using Prism.Ioc;
 using Prism.Navigation.Regions;
 using ReactiveUI;
 using System.Collections.ObjectModel;
 using System.Linq;
-using Ursa.Controls;
 using Ursa.PrismExtension;
 
 namespace CodeWF.Toolbox.ViewModels;
@@ -97,9 +97,12 @@ private void ChangeTool()
 
     public async void RaiseOpenSettingHandlerAsync()
     {
-        var option =
-            new OverlayDialogOptions { Title = I18nManager.GetString(Localization.SettingView.Title), Buttons = DialogButton.OK };
-        var vm = ContainerLocator.Current.Resolve<SettingViewModel>();
-        await _overlayDialogService.ShowModal(DialogNames.Setting, vm, HostIds.Main, option);
+        ContainerLocator.Container.Resolve<SettingView>().ShowDialog(App.Instance.MainWindow as Window);
+        //var option =
+        //    new OverlayDialogOptions { Title = I18nManager.GetString(Localization.SettingView.Title), Buttons = DialogButton.OK };
+        //var vm = ContainerLocator.Current.Resolve<SettingViewModel>();
+        //await _overlayDialogService.ShowModal(DialogNames.Setting, vm, HostIds.Main, option);
+
+
     }
 }
diff --git a/src/CodeWF.Toolbox/Views/AboutView.axaml b/src/CodeWF.Toolbox/Views/AboutView.axaml
@@ -3,6 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:prism="http://prismlibrary.com/"
+             xmlns:u="https://irihi.tech/ursa"
              prism:ViewModelLocator.AutoWireViewModel="True"
              xmlns:i18n="https://codewf.com"
              xmlns:language="clr-namespace:Localization"
@@ -11,7 +12,9 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="CodeWF.Toolbox.Views.AboutView"
              x:DataType="vm:AboutViewModel">
-
+    <Design.DataContext>
+		<vm:AboutViewModel />
+    </Design.DataContext>
     <UserControl.Styles>
         <Style Selector="Border.ToolItem">
             <Setter Property="Margin" Value="7" />
@@ -23,28 +26,39 @@
             <Setter Property="Margin" Value="0 0 0 20" />
         </Style>
     </UserControl.Styles>
-    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-        <TextBlock Text="{i18n:I18n {x:Static language:MainModule.Title}}" HorizontalAlignment="Center" Classes="H1"
-                   Theme="{StaticResource TitleTextBlock}" />
-        <TextBlock Text="{i18n:I18n {x:Static language:DashboardView.DesiredAvailabilityNotification}}"
-                   HorizontalAlignment="Center" Classes="Tertiary H5"
-                   Theme="{StaticResource TitleTextBlock}" Margin="0 10 0 30" />
-        <TextBlock Text="{Binding CompileTime}"
-                   HorizontalAlignment="Center" Classes="Tertiary H5"
-                   Theme="{StaticResource TitleTextBlock}" Margin="0 10 0 30" />
+    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"
+                Margin="0,20,0,0">
+        <TextBlock Text="{i18n:I18n {x:Static language:MainModule.Title}}"
+                   HorizontalAlignment="Center" Classes="H4" TextWrapping="Wrap"
+                   Theme="{StaticResource TitleTextBlock}" Margin="0 10 0 20" />
+
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+            <u:IconButton Content="{i18n:I18n {x:Static language:DashboardView.WeChat}}" IconPlacement="Top"
+                          Margin="5 5 20 15">
+                <u:IconButton.Icon>
+                    <Image Source="../Assets/wechatowner.jpg" Width="120" Margin="0 8 0 0" />
+                </u:IconButton.Icon>
+            </u:IconButton>
+            <u:IconButton Content="{i18n:I18n {x:Static language:DashboardView.WeChatPublic}}" IconPlacement="Top"
+                          Margin="20 5 5 15">
+                <u:IconButton.Icon>
+                    <Image Source="../Assets/wechatpublic.jpg" Width="120" Margin="0 8 0 0" />
+                </u:IconButton.Icon>
+            </u:IconButton>
+        </StackPanel>
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
             <Button Content="{i18n:I18n {x:Static language:DashboardView.AccessToolbox}}" HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Classes="Success" Theme="{DynamicResource BorderlessButton}"
                     Height="40" CornerRadius="5"
                     Command="{Binding OpenOnLineToolbox}"
-                    CommandParameter="{Binding $parent[views:DashboardView]}" />
+                    CommandParameter="{Binding $parent[views:AboutView]}" />
             <Button Content="{i18n:I18n {x:Static language:DashboardView.MissingTool}}" HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Classes="Warning" Theme="{DynamicResource BorderlessButton}"
                     Height="40" CornerRadius="5"
                     Command="{Binding OpenRepository}"
-                    CommandParameter="{Binding $parent[views:DashboardView]}" />
+                    CommandParameter="{Binding $parent[views:AboutView]}" />
         </StackPanel>
     </StackPanel>
-</UserControl>
+</UserControl>
diff --git a/src/CodeWF.Toolbox/Views/CommonSettingView.axaml b/src/CodeWF.Toolbox/Views/CommonSettingView.axaml
@@ -2,19 +2,22 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:prism="http://prismlibrary.com/"
+             prism:ViewModelLocator.AutoWireViewModel="True"
              xmlns:i18n="https://codewf.com"
              xmlns:language="clr-namespace:Localization"
-             xmlns:view="clr-namespace:CodeWF.Toolbox.Views"
-             xmlns:u="https://irihi.tech/ursa"
              xmlns:vm="clr-namespace:CodeWF.Toolbox.ViewModels"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="CodeWF.Toolbox.Views.CommonSettingView"
              x:DataType="vm:CommonSettingViewModel">
+    <Design.DataContext>
+		<vm:CommonSettingViewModel />
+    </Design.DataContext>
     <Grid
-        Margin="0,30,0,0"
-        ColumnDefinitions="220 *"
-        RowDefinitions="50 50 40 40 40 *">
-        <TextBlock Text="{i18n:I18n {x:Static language:CommonSettingView.Theme}}" />
+        Margin="20"
+        ColumnDefinitions="150 *"
+        RowDefinitions="50 50 50 50 50 *">
+        <TextBlock VerticalAlignment="Center" Text="{i18n:I18n {x:Static language:CommonSettingView.Theme}}" />
         <ComboBox
             Grid.Row="0"
             Grid.Column="1"
@@ -25,7 +28,8 @@
             ItemsSource="{Binding Themes}"
             SelectedItem="{Binding SelectedTheme}" />
 
-        <TextBlock Grid.Row="1" Grid.Column="0" Text="{i18n:I18n {x:Static language:CommonSettingView.LanguageKey}}" />
+        <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" TextWrapping="Wrap"
+                   Text="{i18n:I18n {x:Static language:CommonSettingView.LanguageKey}}" />
         <ComboBox
             Grid.Row="1"
             Grid.Column="1"
@@ -37,8 +41,8 @@
             SelectedItem="{Binding SelectedLanguage}" />
 
         <TextBlock
-            Grid.Row="2"
-            Grid.Column="0"
+            Grid.Row="2" TextWrapping="Wrap"
+            Grid.Column="0" VerticalAlignment="Center"
             Text="{i18n:I18n {x:Static language:CommonSettingView.AutoOpenToolboxAtStartup}}" />
         <ToggleSwitch
             Grid.Row="2"
@@ -47,8 +51,8 @@
             OnContent="{i18n:I18n {x:Static language:CommonSettingView.TurnOn}}" />
 
         <TextBlock
-            Grid.Row="3"
-            Grid.Column="0"
+            Grid.Row="3" TextWrapping="Wrap"
+            Grid.Column="0" VerticalAlignment="Center"
             Text="{i18n:I18n {x:Static language:CommonSettingView.HideTrayIconOnClose}}" />
         <ToggleSwitch
             Grid.Row="3"
@@ -59,8 +63,8 @@
             Command="{Binding ChangeHideTrayIconOnCloseHandler}" />
 
         <TextBlock
-            Grid.Row="4"
-            Grid.Column="0"
+            Grid.Row="4" TextWrapping="Wrap"
+            Grid.Column="0" VerticalAlignment="Center"
             Text="{i18n:I18n {x:Static language:CommonSettingView.DisplayPromptWhenClosing}}" />
         <ToggleSwitch
             Grid.Row="4"
diff --git a/src/CodeWF.Toolbox/Views/DashboardView.axaml b/src/CodeWF.Toolbox/Views/DashboardView.axaml
@@ -2,6 +2,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:u="https://irihi.tech/ursa"
              xmlns:prism="http://prismlibrary.com/"
              prism:ViewModelLocator.AutoWireViewModel="True"
              xmlns:i18n="https://codewf.com"
@@ -23,11 +24,26 @@
         </Style>
     </UserControl.Styles>
     <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-        <TextBlock Text="{i18n:I18n {x:Static language:MainModule.Title}}" HorizontalAlignment="Center" Classes="H1"
+        <TextBlock Text="{i18n:I18n {x:Static language:MainModule.Title}}"
+                   HorizontalAlignment="Center" Classes="H3" TextWrapping="Wrap"
                    Theme="{StaticResource TitleTextBlock}" />
         <TextBlock Text="{i18n:I18n {x:Static language:DashboardView.DesiredAvailabilityNotification}}"
-                   HorizontalAlignment="Center" Classes="Tertiary H5"
+                   HorizontalAlignment="Center" Classes="Tertiary H6" TextWrapping="Wrap"
                    Theme="{StaticResource TitleTextBlock}" Margin="0 10 0 30" />
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+            <u:IconButton Content="{i18n:I18n {x:Static language:DashboardView.WeChat}}" IconPlacement="Top"
+                          Margin="5 5 20 15">
+                <u:IconButton.Icon>
+                    <Image Source="../Assets/wechatowner.jpg" Width="120" Margin="0 8 0 0" />
+                </u:IconButton.Icon>
+            </u:IconButton>
+            <u:IconButton Content="{i18n:I18n {x:Static language:DashboardView.WeChatPublic}}" IconPlacement="Top"
+                          Margin="20 5 5 15">
+                <u:IconButton.Icon>
+                    <Image Source="../Assets/wechatpublic.jpg" Width="120" Margin="0 8 0 0" />
+                </u:IconButton.Icon>
+            </u:IconButton>
+        </StackPanel>
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
             <Button Content="{i18n:I18n {x:Static language:DashboardView.AccessToolbox}}" HorizontalAlignment="Center"
                     VerticalAlignment="Center"
diff --git a/src/CodeWF.Toolbox/Views/SettingView.axaml b/src/CodeWF.Toolbox/Views/SettingView.axaml
diff --git a/src/CodeWF.Toolbox/Views/SettingView.axaml.cs b/src/CodeWF.Toolbox/Views/SettingView.axaml.cs

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ namespace Localization`
`29`	`29`	`public static class DashboardView`
`30`	`30`	`{`
`31`	`31`	`public static readonly string Title = "Localization.DashboardView.Title";`
	`32`	`+ public static readonly string WeChat = "Localization.DashboardView.WeChat";`
	`33`	`+ public static readonly string WeChatPublic = "Localization.DashboardView.WeChatPublic";`
`32`	`34`	`public static readonly string DesiredAvailabilityNotification = "Localization.DashboardView.DesiredAvailabilityNotification";`
`33`	`35`	`public static readonly string AccessToolbox = "Localization.DashboardView.AccessToolbox";`
`34`	`36`	`public static readonly string MissingTool = "Localization.DashboardView.MissingTool";`