From 63096ebd55ed5d3fd3ad06a122a0e66de394fc23 Mon Sep 17 00:00:00 2001 From: leo Date: Fri, 22 Aug 2025 15:57:28 +0800 Subject: [PATCH] code_review: PR #1756 - Keep translation keys in order - Add missing translations for zh_CN and en_US - Rename `WorkingCopy.ClearCommitMessageHistory` to `WorkingCopy.ClearCommitMessageHistoryAsync` - It's not necessary to use `Dispatcher.UI.Invoke` in event callback Signed-off-by: leo --- src/Resources/Locales/en_US.axaml | 4 ++-- src/Resources/Locales/zh_CN.axaml | 2 ++ src/Resources/Locales/zh_TW.axaml | 2 ++ src/ViewModels/WorkingCopy.cs | 10 ++++----- src/Views/CommitMessageTextBox.axaml.cs | 30 ++++++++++++------------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml index e670b057..562fb190 100644 --- a/src/Resources/Locales/en_US.axaml +++ b/src/Resources/Locales/en_US.axaml @@ -839,6 +839,8 @@ Ignore this file only Amend You can stage this file now. + Clear History + Are you sure you want to clear all commit message history? This action cannot be undone. COMMIT COMMIT & PUSH Template/History @@ -856,8 +858,6 @@ INCLUDE UNTRACKED FILES NO RECENT INPUT MESSAGES NO COMMIT TEMPLATES - Clear History - Are you sure you want to clear all commit message history? This action cannot be undone. Reset Author SignOff STAGED diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml index f17e32b6..18e4cf47 100644 --- a/src/Resources/Locales/zh_CN.axaml +++ b/src/Resources/Locales/zh_CN.axaml @@ -843,6 +843,8 @@ 忽略本文件 修补 现在您已可将其加入暂存区中 + 清空历史提交信息 + 您确定要清空所有的历史提交信息记录吗（执行操作后无法撤回）？ 提交 提交并推送 历史输入/模板 diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml index 22e4901e..30666ab1 100644 --- a/src/Resources/Locales/zh_TW.axaml +++ b/src/Resources/Locales/zh_TW.axaml @@ -843,6 +843,8 @@ 忽略本檔案 修補 現在您已可將其加入暫存區中 + 清除提交訊息歷史 + 您確定要清除所有提交訊息記錄嗎 (動作無法撤銷) ? 提 交 提交並推送 歷史輸入/範本 diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs index 162dbfc3..afaa05e3 100644 --- a/src/ViewModels/WorkingCopy.cs +++ b/src/ViewModels/WorkingCopy.cs @@ -606,13 +606,11 @@ namespace SourceGit.ViewModels CommitMessage = tmpl.Apply(_repo.CurrentBranch, _staged); } - public async Task ClearCommitMessageHistory() + public async Task ClearCommitMessageHistoryAsync() { - if (await App.AskConfirmAsync(App.Text("WorkingCopy.ConfirmClearHistories"))) - Dispatcher.UIThread.Invoke(() => - { - _repo.Settings.CommitMessages.Clear(); - }); + var sure = await App.AskConfirmAsync(App.Text("WorkingCopy.ClearCommitHistories.Confirm")); + if (sure) + _repo.Settings.CommitMessages.Clear(); } public async Task CommitAsync(bool autoStage, bool autoPush, Models.CommitCheckPassed checkPassed = Models.CommitCheckPassed.None) diff --git a/src/Views/CommitMessageTextBox.axaml.cs b/src/Views/CommitMessageTextBox.axaml.cs index a4edfd88..dc0ec58e 100644 --- a/src/Views/CommitMessageTextBox.axaml.cs +++ b/src/Views/CommitMessageTextBox.axaml.cs @@ -199,10 +199,10 @@ namespace SourceGit.Views var item = new MenuItem(); item.Header = App.Text("WorkingCopy.UseCommitTemplate", template.Name); item.Icon = App.CreateMenuIcon("Icons.Code"); - item.Click += (_, e) => + item.Click += (_, ev) => { vm.ApplyCommitMessageTemplate(template); - e.Handled = true; + ev.Handled = true; }; menu.Items.Add(item); } @@ -224,11 +224,11 @@ namespace SourceGit.Views var gitTemplateItem = new MenuItem(); gitTemplateItem.Header = App.Text("WorkingCopy.UseCommitTemplate", friendlyName); gitTemplateItem.Icon = App.CreateMenuIcon("Icons.Code"); - gitTemplateItem.Click += (_, e) => + gitTemplateItem.Click += (_, ev) => { if (File.Exists(gitTemplate)) vm.CommitMessage = File.ReadAllText(gitTemplate); - e.Handled = true; + ev.Handled = true; }; menu.Items.Add(gitTemplateItem); } @@ -261,10 +261,10 @@ namespace SourceGit.Views var item = new MenuItem(); item.Header = header; item.Icon = App.CreateMenuIcon("Icons.Histories"); - item.Click += (_, e) => + item.Click += (_, ev) => { vm.CommitMessage = dup; - e.Handled = true; + ev.Handled = true; }; menu.Items.Add(item); @@ -272,15 +272,13 @@ namespace SourceGit.Views menu.Items.Add(new MenuItem() { Header = "-" }); - var clearHistoryItem = new MenuItem() + var clearHistoryItem = new MenuItem(); + clearHistoryItem.Header = App.Text("WorkingCopy.ClearCommitHistories"); + clearHistoryItem.Icon = App.CreateMenuIcon("Icons.Clear"); + clearHistoryItem.Click += async (_, ev) => { - Header = App.Text("WorkingCopy.ClearCommitHistories"), - Icon = App.CreateMenuIcon("Icons.Clear") - }; - clearHistoryItem.Click += async (_, e) => - { - await vm.ClearCommitMessageHistory(); - e.Handled = true; + await vm.ClearCommitMessageHistoryAsync(); + ev.Handled = true; }; menu.Items.Add(clearHistoryItem); @@ -324,10 +322,10 @@ namespace SourceGit.Views var dup = service; var item = new MenuItem(); item.Header = service.Name; - item.Click += async (_, e) => + item.Click += async (_, ev) => { await App.ShowDialog(new ViewModels.AIAssistant(repo, dup, vm.Staged, t => vm.CommitMessage = t)); - e.Handled = true; + ev.Handled = true; }; menu.Items.Add(item);