Skip to content

Commit 63096eb

Browse files
love-lingerlove-linger
committed
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 <[email protected]>
1 parent c402969 commit 63096eb

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

‎src/Resources/Locales/en_US.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -839,6 +839,8 @@
839839
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">Ignore this file only</x:String>
840840
<x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">Amend</x:String>
841841
<x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">You can stage this file now.</x:String>
842+
<x:String x:Key="Text.WorkingCopy.ClearCommitHistories" xml:space="preserve">Clear History</x:String>
843+
<x:String x:Key="Text.WorkingCopy.ClearCommitHistories.Confirm" xml:space="preserve">Are you sure you want to clear all commit message history? This action cannot be undone.</x:String>
842844
<x:String x:Key="Text.WorkingCopy.Commit" xml:space="preserve">COMMIT</x:String>
843845
<x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">COMMIT &amp; PUSH</x:String>
844846
<x:String x:Key="Text.WorkingCopy.CommitMessageHelper" xml:space="preserve">Template/History</x:String>
@@ -856,8 +858,6 @@
856858
<x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLUDE UNTRACKED FILES</x:String>
857859
<x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">NO RECENT INPUT MESSAGES</x:String>
858860
<x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">NO COMMIT TEMPLATES</x:String>
859-
<x:String x:Key="Text.WorkingCopy.ClearCommitHistories" xml:space="preserve">Clear History</x:String>
860-
<x:String x:Key="Text.WorkingCopy.ConfirmClearHistories" xml:space="preserve">Are you sure you want to clear all commit message history? This action cannot be undone.</x:String>
861861
<x:String x:Key="Text.WorkingCopy.ResetAuthor" xml:space="preserve">Reset Author</x:String>
862862
<x:String x:Key="Text.WorkingCopy.SignOff" xml:space="preserve">SignOff</x:String>
863863
<x:String x:Key="Text.WorkingCopy.Staged" xml:space="preserve">STAGED</x:String>

‎src/Resources/Locales/zh_CN.axaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -843,6 +843,8 @@
843843
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">忽略本文件</x:String>
844844
<x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">修补</x:String>
845845
<x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">现在您已可将其加入暂存区中</x:String>
846+
<x:String x:Key="Text.WorkingCopy.ClearCommitHistories" xml:space="preserve">清空历史提交信息</x:String>
847+
<x:String x:Key="Text.WorkingCopy.ClearCommitHistories.Confirm" xml:space="preserve">您确定要清空所有的历史提交信息记录吗（执行操作后无法撤回）？</x:String>
846848
<x:String x:Key="Text.WorkingCopy.Commit" xml:space="preserve">提交</x:String>
847849
<x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">提交并推送</x:String>
848850
<x:String x:Key="Text.WorkingCopy.CommitMessageHelper" xml:space="preserve">历史输入/模板</x:String>

‎src/Resources/Locales/zh_TW.axaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -843,6 +843,8 @@
843843
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">忽略本檔案</x:String>
844844
<x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">修補</x:String>
845845
<x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">現在您已可將其加入暫存區中</x:String>
846+
<x:String x:Key="Text.WorkingCopy.ClearCommitHistories" xml:space="preserve">清除提交訊息歷史</x:String>
847+
<x:String x:Key="Text.WorkingCopy.ClearCommitHistories.Confirm" xml:space="preserve">您確定要清除所有提交訊息記錄嗎 (動作無法撤銷) ?</x:String>
846848
<x:String x:Key="Text.WorkingCopy.Commit" xml:space="preserve">提 交</x:String>
847849
<x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">提交並推送</x:String>
848850
<x:String x:Key="Text.WorkingCopy.CommitMessageHelper" xml:space="preserve">歷史輸入/範本</x:String>

‎src/ViewModels/WorkingCopy.cs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -606,13 +606,11 @@ public void ApplyCommitMessageTemplate(Models.CommitTemplate tmpl)
606606
CommitMessage = tmpl.Apply(_repo.CurrentBranch, _staged);
607607
}
608608

609-
public async Task ClearCommitMessageHistory()
609+
public async Task ClearCommitMessageHistoryAsync()
610610
{
611-
if (await App.AskConfirmAsync(App.Text("WorkingCopy.ConfirmClearHistories")))
612-
Dispatcher.UIThread.Invoke(() =>
613-
{
614-
_repo.Settings.CommitMessages.Clear();
615-
});
611+
var sure = await App.AskConfirmAsync(App.Text("WorkingCopy.ClearCommitHistories.Confirm"));
612+
if (sure)
613+
_repo.Settings.CommitMessages.Clear();
616614
}
617615

618616
public async Task CommitAsync(bool autoStage, bool autoPush, Models.CommitCheckPassed checkPassed = Models.CommitCheckPassed.None)

‎src/Views/CommitMessageTextBox.axaml.cs‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,10 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
199199
var item = new MenuItem();
200200
item.Header = App.Text("WorkingCopy.UseCommitTemplate", template.Name);
201201
item.Icon = App.CreateMenuIcon("Icons.Code");
202-
item.Click += (_, e) =>
202+
item.Click += (_, ev) =>
203203
{
204204
vm.ApplyCommitMessageTemplate(template);
205-
e.Handled = true;
205+
ev.Handled = true;
206206
};
207207
menu.Items.Add(item);
208208
}
@@ -224,11 +224,11 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
224224
var gitTemplateItem = new MenuItem();
225225
gitTemplateItem.Header = App.Text("WorkingCopy.UseCommitTemplate", friendlyName);
226226
gitTemplateItem.Icon = App.CreateMenuIcon("Icons.Code");
227-
gitTemplateItem.Click += (_, e) =>
227+
gitTemplateItem.Click += (_, ev) =>
228228
{
229229
if (File.Exists(gitTemplate))
230230
vm.CommitMessage = File.ReadAllText(gitTemplate);
231-
e.Handled = true;
231+
ev.Handled = true;
232232
};
233233
menu.Items.Add(gitTemplateItem);
234234
}
@@ -261,26 +261,24 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
261261
var item = new MenuItem();
262262
item.Header = header;
263263
item.Icon = App.CreateMenuIcon("Icons.Histories");
264-
item.Click += (_, e) =>
264+
item.Click += (_, ev) =>
265265
{
266266
vm.CommitMessage = dup;
267-
e.Handled = true;
267+
ev.Handled = true;
268268
};
269269

270270
menu.Items.Add(item);
271271
}
272272

273273
menu.Items.Add(new MenuItem() { Header = "-" });
274274

275-
var clearHistoryItem = new MenuItem()
275+
var clearHistoryItem = new MenuItem();
276+
clearHistoryItem.Header = App.Text("WorkingCopy.ClearCommitHistories");
277+
clearHistoryItem.Icon = App.CreateMenuIcon("Icons.Clear");
278+
clearHistoryItem.Click += async (_, ev) =>
276279
{
277-
Header = App.Text("WorkingCopy.ClearCommitHistories"),
278-
Icon = App.CreateMenuIcon("Icons.Clear")
279-
};
280-
clearHistoryItem.Click += async (_, e) =>
281-
{
282-
await vm.ClearCommitMessageHistory();
283-
e.Handled = true;
280+
await vm.ClearCommitMessageHistoryAsync();
281+
ev.Handled = true;
284282
};
285283

286284
menu.Items.Add(clearHistoryItem);
@@ -324,10 +322,10 @@ private async void OnOpenOpenAIHelper(object sender, RoutedEventArgs e)
324322
var dup = service;
325323
var item = new MenuItem();
326324
item.Header = service.Name;
327-
item.Click += async (_, e) =>
325+
item.Click += async (_, ev) =>
328326
{
329327
await App.ShowDialog(new ViewModels.AIAssistant(repo, dup, vm.Staged, t => vm.CommitMessage = t));
330-
e.Handled = true;
328+
ev.Handled = true;
331329
};
332330

333331
menu.Items.Add(item);

0 commit comments

Comments
 (0)