From 6c7a4e97b21296e3452850757ffdfe6641892275 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sat, 5 Jul 2025 21:30:38 +0800
Subject: [PATCH] code_review: PR #1521

- Remove `ConfigureAwait(false)` since we need go back to UIThread
- Add Chinese translations for `Text.CommitCM.CopyCommitMessage`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/en_US.axaml |  2 +-
 src/Resources/Locales/zh_CN.axaml |  1 +
 src/Resources/Locales/zh_TW.axaml |  1 +
 src/ViewModels/Histories.cs       | 13 ++++++-------
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index d0f4b212..99c422f4 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -119,8 +119,8 @@
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">Compare with HEAD</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">Compare with Worktree</x:String>
   <x:String x:Key="Text.CommitCM.CopyAuthor" xml:space="preserve">Author</x:String>
-  <x:String x:Key="Text.CommitCM.CopyCommitter" xml:space="preserve">Committer</x:String>
   <x:String x:Key="Text.CommitCM.CopyCommitMessage" xml:space="preserve">Message</x:String>
+  <x:String x:Key="Text.CommitCM.CopyCommitter" xml:space="preserve">Committer</x:String>
   <x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">SHA</x:String>
   <x:String x:Key="Text.CommitCM.CopySubject" xml:space="preserve">Subject</x:String>
   <x:String x:Key="Text.CommitCM.CustomAction" xml:space="preserve">Custom Action</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index e7803940..7fc02833 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -123,6 +123,7 @@
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">与当前HEAD比较</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">与本地工作树比较</x:String>
   <x:String x:Key="Text.CommitCM.CopyAuthor" xml:space="preserve">作者</x:String>
+  <x:String x:Key="Text.CommitCM.CopyCommitMessage" xml:space="preserve">提交信息</x:String>
   <x:String x:Key="Text.CommitCM.CopyCommitter" xml:space="preserve">提交者</x:String>
   <x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">提交指纹</x:String>
   <x:String x:Key="Text.CommitCM.CopySubject" xml:space="preserve">主题</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 8aa2d108..63273cb0 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -123,6 +123,7 @@
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">與目前 HEAD 比較</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">與本機工作區比較</x:String>
   <x:String x:Key="Text.CommitCM.CopyAuthor" xml:space="preserve">作者</x:String>
+  <x:String x:Key="Text.CommitCM.CopyCommitMessage" xml:space="preserve">提交訊息</x:String>
   <x:String x:Key="Text.CommitCM.CopyCommitter" xml:space="preserve">提交者</x:String>
   <x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">提交編號</x:String>
   <x:String x:Key="Text.CommitCM.CopySubject" xml:space="preserve">標題</x:String>
diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index ba5fc887..6291bfe9 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -845,13 +845,12 @@ namespace SourceGit.ViewModels
                 e.Handled = true;
             };
 
-            var copyFullInfo = new MenuItem();
-            copyFullInfo.Header = App.Text("CommitCM.CopyCommitMessage");
-            copyFullInfo.Icon = App.CreateMenuIcon("Icons.Info");
-            copyFullInfo.Click += async (_, e) =>
+            var copyMessage = new MenuItem();
+            copyMessage.Header = App.Text("CommitCM.CopyCommitMessage");
+            copyMessage.Icon = App.CreateMenuIcon("Icons.Info");
+            copyMessage.Click += async (_, e) =>
             {
-                var message = await new Commands.QueryCommitFullMessage(_repo.FullPath, commit.SHA).
-                                   GetResultAsync().ConfigureAwait(false);
+                var message = await new Commands.QueryCommitFullMessage(_repo.FullPath, commit.SHA).GetResultAsync();
                 await App.CopyTextAsync(message);
                 e.Handled = true;
             };
@@ -880,7 +879,7 @@ namespace SourceGit.ViewModels
             copy.Items.Add(copySHA);
             copy.Items.Add(copySubject);
             copy.Items.Add(copyInfo);
-            copy.Items.Add(copyFullInfo);
+            copy.Items.Add(copyMessage);
             copy.Items.Add(copyAuthor);
             copy.Items.Add(copyCommitter);
             menu.Items.Add(copy);