Skip to content

Commit 6c7a4e9

Browse files
committed
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 <[email protected]>
1 parent 151bfa1 commit 6c7a4e9

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

src/Resources/Locales/en_US.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@
119119
<x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">Compare with HEAD</x:String>
120120
<x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">Compare with Worktree</x:String>
121121
<x:String x:Key="Text.CommitCM.CopyAuthor" xml:space="preserve">Author</x:String>
122-
<x:String x:Key="Text.CommitCM.CopyCommitter" xml:space="preserve">Committer</x:String>
123122
<x:String x:Key="Text.CommitCM.CopyCommitMessage" xml:space="preserve">Message</x:String>
123+
<x:String x:Key="Text.CommitCM.CopyCommitter" xml:space="preserve">Committer</x:String>
124124
<x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">SHA</x:String>
125125
<x:String x:Key="Text.CommitCM.CopySubject" xml:space="preserve">Subject</x:String>
126126
<x:String x:Key="Text.CommitCM.CustomAction" xml:space="preserve">Custom Action</x:String>

src/Resources/Locales/zh_CN.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
<x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">与当前HEAD比较</x:String>
124124
<x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">与本地工作树比较</x:String>
125125
<x:String x:Key="Text.CommitCM.CopyAuthor" xml:space="preserve">作者</x:String>
126+
<x:String x:Key="Text.CommitCM.CopyCommitMessage" xml:space="preserve">提交信息</x:String>
126127
<x:String x:Key="Text.CommitCM.CopyCommitter" xml:space="preserve">提交者</x:String>
127128
<x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">提交指纹</x:String>
128129
<x:String x:Key="Text.CommitCM.CopySubject" xml:space="preserve">主题</x:String>

src/Resources/Locales/zh_TW.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
<x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">與目前 HEAD 比較</x:String>
124124
<x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">與本機工作區比較</x:String>
125125
<x:String x:Key="Text.CommitCM.CopyAuthor" xml:space="preserve">作者</x:String>
126+
<x:String x:Key="Text.CommitCM.CopyCommitMessage" xml:space="preserve">提交訊息</x:String>
126127
<x:String x:Key="Text.CommitCM.CopyCommitter" xml:space="preserve">提交者</x:String>
127128
<x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">提交編號</x:String>
128129
<x:String x:Key="Text.CommitCM.CopySubject" xml:space="preserve">標題</x:String>

src/ViewModels/Histories.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -845,13 +845,12 @@ public ContextMenu MakeContextMenu(DataGrid list)
845845
e.Handled = true;
846846
};
847847

848-
var copyFullInfo = new MenuItem();
849-
copyFullInfo.Header = App.Text("CommitCM.CopyCommitMessage");
850-
copyFullInfo.Icon = App.CreateMenuIcon("Icons.Info");
851-
copyFullInfo.Click += async (_, e) =>
848+
var copyMessage = new MenuItem();
849+
copyMessage.Header = App.Text("CommitCM.CopyCommitMessage");
850+
copyMessage.Icon = App.CreateMenuIcon("Icons.Info");
851+
copyMessage.Click += async (_, e) =>
852852
{
853-
var message = await new Commands.QueryCommitFullMessage(_repo.FullPath, commit.SHA).
854-
GetResultAsync().ConfigureAwait(false);
853+
var message = await new Commands.QueryCommitFullMessage(_repo.FullPath, commit.SHA).GetResultAsync();
855854
await App.CopyTextAsync(message);
856855
e.Handled = true;
857856
};
@@ -880,7 +879,7 @@ public ContextMenu MakeContextMenu(DataGrid list)
880879
copy.Items.Add(copySHA);
881880
copy.Items.Add(copySubject);
882881
copy.Items.Add(copyInfo);
883-
copy.Items.Add(copyFullInfo);
882+
copy.Items.Add(copyMessage);
884883
copy.Items.Add(copyAuthor);
885884
copy.Items.Add(copyCommitter);
886885
menu.Items.Add(copy);

0 commit comments

Comments
 (0)