From 8d276904735616ee2ba31d9c6fe18fcf7bedd220 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sun, 26 May 2024 14:35:57 +0800
Subject: [PATCH] code_style: keep ux/code in a uniform style

---
 src/Resources/Locales/en_US.axaml | 2 +-
 src/Resources/Locales/zh_CN.axaml | 2 +-
 src/ViewModels/Histories.cs       | 5 +++--
 src/ViewModels/Repository.cs      | 8 --------
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 76b18a11..08864bd1 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -77,7 +77,7 @@
   <x:String x:Key="Text.Close" xml:space="preserve">CLOSE</x:String>
   <x:String x:Key="Text.CommitCM.CherryPick" xml:space="preserve">Cherry-Pick This Commit</x:String>
   <x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">Copy SHA</x:String>
-  <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Checkout commit${0}</x:String>
+  <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Checkout Commit</x:String>
   <x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">Rebase${0}$to Here</x:String>
   <x:String x:Key="Text.CommitCM.Reset" xml:space="preserve">Reset${0}$to Here</x:String>
   <x:String x:Key="Text.CommitCM.Revert" xml:space="preserve">Revert Commit</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 310a9aba..2f79f29e 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -76,7 +76,7 @@
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">远程仓库 ：</x:String>
   <x:String x:Key="Text.Close" xml:space="preserve">关闭</x:String>
   <x:String x:Key="Text.CommitCM.CherryPick" xml:space="preserve">挑选(cherry-pick)此提交</x:String>
-  <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">检出提交${0}</x:String>
+  <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">检出此提交</x:String>
   <x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">复制提交指纹</x:String>
   <x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">变基(rebase)${0}$到此处</x:String>
   <x:String x:Key="Text.CommitCM.Reset" xml:space="preserve">重置(reset)${0}$到此处</x:String>
diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index d1eb05d6..c28b4ade 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -236,11 +236,12 @@ namespace SourceGit.ViewModels
                 menu.Items.Add(reset);
 
                 var checkoutCommit = new MenuItem();
-                checkoutCommit.Header = new Views.NameHighlightedTextBlock("CommitCM.Checkout", commit.SHA.Substring(0, 10));
+                checkoutCommit.Header = App.Text("CommitCM.Checkout");
                 checkoutCommit.Icon = App.CreateMenuIcon("Icons.Check");
                 checkoutCommit.Click += (o, e) =>
                 {
-                    _repo.CheckoutCommit(commit);
+                    if (PopupHost.CanCreatePopup())
+                        PopupHost.ShowPopup(new CheckoutCommit(_repo, commit));
                     e.Handled = true;
                 };
                 menu.Items.Add(checkoutCommit);
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index d2ea73fa..94a04172 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -721,14 +721,6 @@ namespace SourceGit.ViewModels
             else
                 PopupHost.ShowAndStartPopup(new Checkout(this, branch));
         }
-
-        public void CheckoutCommit(Models.Commit commit)
-        {
-            if (!PopupHost.CanCreatePopup())
-                return;
-            
-            PopupHost.ShowPopup(new CheckoutCommit(this, commit));
-        }
         
         public void DeleteMultipleBranches(List<Models.Branch> branches, bool isLocal)
         {