From 73d38c4730bf59ef5189c472dfc07b025ca9d2cf Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 12 Mar 2026 11:32:36 +0800
Subject: [PATCH] ux: init repo popup tips (#2182)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/en_US.axaml |  2 ++
 src/Resources/Locales/zh_CN.axaml |  2 ++
 src/Resources/Locales/zh_TW.axaml |  2 ++
 src/ViewModels/Init.cs            |  4 +++-
 src/Views/Init.axaml              | 13 +++++++++++--
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 2090693a..52e7a0b4 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -524,6 +524,8 @@
   <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">Stage</x:String>
   <x:String x:Key="Text.Hunk.Unstage" xml:space="preserve">Unstage</x:String>
   <x:String x:Key="Text.Init" xml:space="preserve">Initialize Repository</x:String>
+  <x:String x:Key="Text.Init.CommandTip" xml:space="preserve">Do you want to run `git init` command under this path?</x:String>
+  <x:String x:Key="Text.Init.ErrorMessageTip" xml:space="preserve">Open repository failed. Reason:  </x:String>
   <x:String x:Key="Text.Init.Path" xml:space="preserve">Path:</x:String>
   <x:String x:Key="Text.InProgress.CherryPick" xml:space="preserve">Cherry-Pick in progress.</x:String>
   <x:String x:Key="Text.InProgress.CherryPick.Head" xml:space="preserve">Processing commit</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index bbf3d21d..41e870a0 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -528,6 +528,8 @@
   <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">暂存</x:String>
   <x:String x:Key="Text.Hunk.Unstage" xml:space="preserve">移出暂存区</x:String>
   <x:String x:Key="Text.Init" xml:space="preserve">初始化新仓库</x:String>
+  <x:String x:Key="Text.Init.CommandTip" xml:space="preserve">是否在该路径下执行 `git init` 命令（初始化仓库）？</x:String>
+  <x:String x:Key="Text.Init.ErrorMessageTip" xml:space="preserve">打开本地仓库失败，原因：</x:String>
   <x:String x:Key="Text.Init.Path" xml:space="preserve">路径 ：</x:String>
   <x:String x:Key="Text.InProgress.CherryPick" xml:space="preserve">挑选（Cherry-Pick）操作进行中。</x:String>
   <x:String x:Key="Text.InProgress.CherryPick.Head" xml:space="preserve">正在处理提交</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 9fec4643..963e1123 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -528,6 +528,8 @@
   <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">暫存</x:String>
   <x:String x:Key="Text.Hunk.Unstage" xml:space="preserve">取消暫存</x:String>
   <x:String x:Key="Text.Init" xml:space="preserve">初始化存放庫</x:String>
+  <x:String x:Key="Text.Init.CommandTip" xml:space="preserve">在該路徑執行 git init 以初始化 git 倉庫?</x:String>
+  <x:String x:Key="Text.Init.ErrorMessageTip" xml:space="preserve">無法在指定路徑開啟本機儲存庫。原因：</x:String>
   <x:String x:Key="Text.Init.Path" xml:space="preserve">路徑:</x:String>
   <x:String x:Key="Text.InProgress.CherryPick" xml:space="preserve">揀選 (cherry-pick) 操作進行中。</x:String>
   <x:String x:Key="Text.InProgress.CherryPick.Head" xml:space="preserve">正在處理提交</x:String>
diff --git a/src/ViewModels/Init.cs b/src/ViewModels/Init.cs
index f6740d0f..338ee606 100644
--- a/src/ViewModels/Init.cs
+++ b/src/ViewModels/Init.cs
@@ -21,7 +21,9 @@ namespace SourceGit.ViewModels
             _pageId = pageId;
             _targetPath = path;
             _parentNode = parent;
-            Reason = string.IsNullOrEmpty(reason) ? "Invalid repository detected!" : reason;
+
+            Reason = string.IsNullOrEmpty(reason) ? "unknown error" : reason;
+            Reason = Reason.Trim();
         }
 
         public override async Task<bool> Sure()
diff --git a/src/Views/Init.axaml b/src/Views/Init.axaml
index e0ea1a27..a83ea507 100644
--- a/src/Views/Init.axaml
+++ b/src/Views/Init.axaml
@@ -16,11 +16,12 @@
                  Classes="bold"
                  Text="{DynamicResource Text.Init}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,8,0" ColumnDefinitions="100,*">
       <Grid.RowDefinitions>
         <RowDefinition Height="32"/>
         <RowDefinition Height="Auto" MinHeight="32"/>
+        <RowDefinition Height="Auto" MinHeight="32"/>
       </Grid.RowDefinitions>
 
       <TextBlock Grid.Row="0" Grid.Column="0"
@@ -29,9 +30,17 @@
                  Margin="0,0,8,0"/>
       <TextBlock Grid.Row="0" Grid.Column="1"
                  Text="{Binding TargetPath}"/>
+
       <TextBlock Grid.Row="1" Grid.Column="1"
                  Foreground="{DynamicResource Brush.FG2}"
-                 Text="{Binding Reason}"
+                 TextWrapping="Wrap">
+        <Run Text="{DynamicResource Text.Init.ErrorMessageTip}"/>
+        <Run Text="{Binding Reason, Mode=OneWay}" />
+      </TextBlock>
+
+      <TextBlock Grid.Row="2" Grid.Column="1"
+                 Margin="0,8,0,0"
+                 Text="{DynamicResource Text.Init.CommandTip}"
                  TextWrapping="Wrap"/>
     </Grid>
   </StackPanel>