From eeb16e1a55c3ce48be1ca9bfd64ff7f4bd7c6079 Mon Sep 17 00:00:00 2001 From: uye <2396806385@qq.com> Date: Fri, 26 May 2023 20:55:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=87=E6=8D=A2=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=8C=96=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Res/Localizations/en-us.xaml | 5 +++++ src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 4 ++++ src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs | 4 ++-- .../Views/UserControl/ConfigurationMgrUserControl.xaml | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml index 7a2d6ceb3d..740b949981 100644 --- a/src/MaaWpfGui/Res/Localizations/en-us.xaml +++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml @@ -197,7 +197,12 @@ Please download the full package manually to update. Timer + Switch Configuration + Config + Add + Configuration <{0}> added successfully. + Configuration <{0}> already exists. Auto start with PC Auto Run task after launched diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index 4cb65ee1ea..b74e73a29c 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -201,6 +201,10 @@ 定时 切换配置 + 配置名称 + 添加 + 配置 <{0}> 添加成功 + 配置 <{0}> 已存在 开机自动启动MAA 启动MAA后直接运行 diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs index 79b3e7a263..ce360ddb06 100644 --- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs @@ -890,11 +890,11 @@ namespace MaaWpfGui.ViewModels.UI if (ConfigurationHelper.AddConfiguration(NewConfigurationName, CurrentConfiguration)) { ConfigurationList.Add(new CombinedData { Display = NewConfigurationName, Value = NewConfigurationName }); - MessageBoxHelper.Show($"配置 {NewConfigurationName} 添加成功"); + MessageBoxHelper.Show(string.Format(LocalizationHelper.GetString("AddConfigSuccess"), NewConfigurationName)); } else { - MessageBoxHelper.Show($"配置 {NewConfigurationName} 已存在"); + MessageBoxHelper.Show(string.Format(LocalizationHelper.GetString("ConfigExists"), NewConfigurationName)); } } diff --git a/src/MaaWpfGui/Views/UserControl/ConfigurationMgrUserControl.xaml b/src/MaaWpfGui/Views/UserControl/ConfigurationMgrUserControl.xaml index 301f754e47..7da165ea5d 100644 --- a/src/MaaWpfGui/Views/UserControl/ConfigurationMgrUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/ConfigurationMgrUserControl.xaml @@ -62,7 +62,7 @@ - + + Content="{DynamicResource AddConfiguration}" />