From fafd1970be3effdf6168920c16bb0f5da8033bb0 Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Sun, 20 Apr 2025 20:50:41 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E7=9A=84=E9=97=AE=E9=A2=98=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E7=95=8C=E9=9D=A2=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Helper/LocalizationHelper.cs | 8 ++++---- src/MaaWpfGui/Res/Localizations/en-us.xaml | 1 + src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 1 + src/MaaWpfGui/Res/Localizations/ko-kr.xaml | 1 + src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 7 ++++--- src/MaaWpfGui/Res/Localizations/zh-tw.xaml | 7 ++++--- src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs | 6 +++--- .../ViewModels/UI/VersionUpdateViewModel.cs | 3 ++- .../Settings/IssueReportUserControl.xaml | 14 +++++++++++++- 9 files changed, 33 insertions(+), 15 deletions(-) diff --git a/src/MaaWpfGui/Helper/LocalizationHelper.cs b/src/MaaWpfGui/Helper/LocalizationHelper.cs index 9515e37342..2f667bb906 100644 --- a/src/MaaWpfGui/Helper/LocalizationHelper.cs +++ b/src/MaaWpfGui/Helper/LocalizationHelper.cs @@ -200,10 +200,10 @@ namespace MaaWpfGui.Helper { return CustomCultureInfo.Name.ToLowerInvariant() switch { - "zh-cn" => $" - {resourceVersion}{resourceDateTime:#MMdd}", - "zh-tw" => $" - {resourceVersion}{resourceDateTime:#MMdd}", - "en-us" => $" - {resourceDateTime:dd/MM} {resourceVersion}", - _ => $" - {resourceDateTime.ToString(CustomCultureInfo.DateTimeFormat.ShortDatePattern.Replace("yyyy", string.Empty).Trim('/', '.'))} {resourceVersion}", + "zh-cn" => $"{resourceVersion}{resourceDateTime:#MMdd}", + "zh-tw" => $"{resourceVersion}{resourceDateTime:#MMdd}", + "en-us" => $"{resourceDateTime:dd/MM} {resourceVersion}", + _ => $"{resourceDateTime.ToString(CustomCultureInfo.DateTimeFormat.ShortDatePattern.Replace("yyyy", string.Empty).Trim('/', '.'))} {resourceVersion}", }; } diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml index cef04006dd..8f130f8e96 100644 --- a/src/MaaWpfGui/Res/Localizations/en-us.xaml +++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml @@ -899,6 +899,7 @@ The video aspect ratio needs to be 16:9 without interference factors such as bla Please check the FAQ before reporting any issues + Please upgrade first and test if the issue persists in the new version. Confirm it's not a common issue before reporting. FAQ Issues Generate Support Payload diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml index 233fa97da2..00586a828c 100644 --- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml +++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml @@ -902,6 +902,7 @@ C:\\leidian\\LDPlayer9 問題を報告する前に、よくある質問に該当しないことを確認してください + まずアップグレードして新しいバージョンで問題が再現するか確認し、一般的な問題でないことを確認してから報告してください。 よくある質問 フィードバック サポート用ZIPを生成 diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml index 7086c5d3b1..3b98690a68 100644 --- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml +++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml @@ -902,6 +902,7 @@ C:\\leidian\\LDPlayer9 문제를 신고하기 전에 자주 묻는 질문에 해당하지 않는지 확인해 주세요 + 먼저 업그레이드 후 새 버전에서도 동일한 문제가 발생하는지 테스트해 보시고, 일반적인 문제가 아님을 확인한 후 피드백해 주세요. 자주 묻는 질문 이슈 제보 지원용 ZIP 파일 생성 diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index d93e38173a..0941fb376c 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -277,8 +277,8 @@ Mirror酱 切换更新源后填写 检测到软件更新。请前往「设置-更新设置」配置 Mirror酱 CDK 或切换海外源。 - 检测到资源更新{0}。请前往「设置-更新设置-资源更新」手动更新，或配置 Mirror酱 CDK 以自动更新。 - 检测到资源更新{0} + 检测到资源更新: {0}。请前往「设置-更新设置-资源更新」手动更新，或配置 Mirror酱 CDK 以自动更新。 + 检测到资源更新: {0} CDK 已过期，请使用新的 CDK 进行授权。 CDK 无效，请检查输入是否正确。 CDK 今日下载次数已达上限，请明日再试。 @@ -901,7 +901,8 @@ C:\\leidian\\LDPlayer9。\n Discord - 请在确认您的问题不属于常见问题后，再进行问题反馈 + 请在确认您的问题不属于「常见问题」后，再进行「问题反馈」 + 请先升级并测试新版是否仍有此问题，确认非「常见问题」后再进行「问题反馈」 常见问题 问题反馈 生成日志压缩包 diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml index 67fb336c86..4b8475c30d 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml @@ -277,8 +277,8 @@ MirrorChyan 切換更新源後填寫 偵測到軟體更新。請前往「設定-更新設定」設定 MirrorChyan CDK 或切換到全域來源。 - 偵測到資源更新{0}。請前往「設定-更新設定-資源更新」手動更新，或設定 MirrorChayn CDK 以自動更新。 - 偵測到資源更新{0} + 偵測到資源更新: {0}。請前往「設定-更新設定-資源更新」手動更新，或設定 MirrorChayn CDK 以自動更新。 + 偵測到資源更新: {0} CDK 已過期，請使用新的 CDK 進行授權。 CDK 無效，請檢查輸入是否正確。 CDK 今日下載次數已達上限，請明日再試。 @@ -900,7 +900,8 @@ C:\\leidian\\LDPlayer9。\n Discord - 請在確認您的問題不屬於常見問題後，再進行問題回饋 + 請在確認您的問題不屬於「常見問題」後，再進行「問題回饋」 + 請先升級並測試新版是否仍有此問題，確認非「常見問題」後再進行「問題回饋」 常見問題 問題回饋 產生紀錄壓縮包 diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs index d74762bf2d..5388e1a0c7 100644 --- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs @@ -688,7 +688,7 @@ namespace MaaWpfGui.ViewModels.UI var isDebug = Instances.VersionUpdateViewModel.IsDebugVersion(); if (newVersionFoundInfo != coreVersion && !isDebug && !string.IsNullOrEmpty(newVersionFoundInfo) && startupUpdateCheck) { - updateTip = $"{LocalizationHelper.GetString("NewVersionFoundTitle")}: {newVersionFoundInfo} - "; + updateTip = $"{newVersionFoundInfo} - "; } var newResourceFoundInfo = VersionUpdateSettings.NewResourceFoundInfo; @@ -739,9 +739,9 @@ namespace MaaWpfGui.ViewModels.UI } string resourceVersion = !string.IsNullOrEmpty(VersionUpdateSettings.ResourceVersion) - ? LocalizationHelper.FormatResourceVersion(VersionUpdateSettings.ResourceVersion, VersionUpdateSettings.ResourceDateTime) + ? $" - {LocalizationHelper.FormatResourceVersion(VersionUpdateSettings.ResourceVersion, VersionUpdateSettings.ResourceDateTime)}" : string.Empty; - rvm.WindowTitle = $"{updateTip}{prefix}MAA{currentConfiguration} - {VersionUpdateSettingsUserControlModel.CoreVersion}{resourceVersion}{connectConfigName}{connectAddress}{clientName}"; + rvm.WindowTitle = $"{updateTip}{prefix}MAA{currentConfiguration} - {coreVersion}{resourceVersion}{connectConfigName}{connectAddress}{clientName}"; } /// diff --git a/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs b/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs index 0afc8e5cb0..16e921b45a 100644 --- a/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs @@ -82,7 +82,6 @@ public class VersionUpdateViewModel : Screen { SetAndNotify(ref _updateTag, value); ConfigurationHelper.SetGlobalValue(ConfigurationKeys.VersionName, value); - SettingsViewModel.VersionUpdateSettings.NewVersionFoundInfo = value; } } @@ -536,6 +535,7 @@ public class VersionUpdateViewModel : Screen // 保存新版本的信息 var name = _latestJson?["name"]?.ToString(); UpdateTag = string.IsNullOrEmpty(name) ? (_latestJson?["tag_name"]?.ToString() ?? string.Empty) : name; + SettingsViewModel.VersionUpdateSettings.NewVersionFoundInfo = $"{LocalizationHelper.GetString("NewVersionFoundTitle")}: {UpdateTag}"; var body = _latestJson?["body"]?.ToString() ?? string.Empty; if (string.IsNullOrEmpty(body)) { @@ -730,6 +730,7 @@ public class VersionUpdateViewModel : Screen UpdateTag = _mirrorcVersionName ?? string.Empty; UpdateInfo = _mirrorcReleaseNote ?? string.Empty; + SettingsViewModel.VersionUpdateSettings.NewVersionFoundInfo = $"{LocalizationHelper.GetString("NewVersionFoundTitle")}: {UpdateTag}"; bool goDownload = SettingsViewModel.VersionUpdateSettings.AutoDownloadUpdatePackage; if (!goDownload) diff --git a/src/MaaWpfGui/Views/UserControl/Settings/IssueReportUserControl.xaml b/src/MaaWpfGui/Views/UserControl/Settings/IssueReportUserControl.xaml index f926b640da..89b02fb182 100644 --- a/src/MaaWpfGui/Views/UserControl/Settings/IssueReportUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/Settings/IssueReportUserControl.xaml @@ -2,6 +2,7 @@ x:Class="MaaWpfGui.Views.UserControl.Settings.IssueReportUserControl" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding" xmlns:constants="clr-namespace:MaaWpfGui.Constants" xmlns:controls="clr-namespace:MaaWpfGui.Styles.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" @@ -9,6 +10,7 @@ xmlns:helper="clr-namespace:MaaWpfGui.Helper" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:s="https://github.com/canton7/Stylet" + xmlns:ui="clr-namespace:MaaWpfGui.ViewModels.UI" xmlns:viewModels="clr-namespace:MaaWpfGui.ViewModels.UserControl.Settings" d:Background="White" d:DataContext="{d:DesignInstance {x:Type viewModels:IssueReportUserControlModel}}" @@ -16,10 +18,20 @@ s:View.ActionTarget="{Binding}" mc:Ignorable="d"> + + + + + + Text="{DynamicResource CheckHelpBeforeReportingIssue}" + Visibility="{c:Binding 'NewVersionFoundInfo.Length + NewResourceFoundInfo.Length == 0', + Source={x:Static ui:SettingsViewModel.VersionUpdateSettings}}" />