File tree Expand file tree Collapse file tree 5 files changed +14
-4
lines changed Expand file tree Collapse file tree 5 files changed +14
-4
lines changed Original file line number Diff line number Diff line change 177
177
<x : String x : Key =" Text.ConfigureWorkspace" xml : space =" preserve" >Workspaces</x : String >
178
178
<x : String x : Key =" Text.ConfigureWorkspace.Color" xml : space =" preserve" >Color</x : String >
179
179
<x : String x : Key =" Text.ConfigureWorkspace.Restore" xml : space =" preserve" >Restore tabs on startup</x : String >
180
- <x : String x : Key =" Text.ConfirmEmptyCommit.Message" xml : space =" preserve" >Empty commit detected! Do you want to continue (--allow-empty) or stage all then commit?</x : String >
180
+ <x : String x : Key =" Text.ConfirmEmptyCommit.WithLocalChanges" xml : space =" preserve" >Empty commit detected! Do you want to continue (--allow-empty) or stage all then commit?</x : String >
181
+ <x : String x : Key =" Text.ConfirmEmptyCommit.NoLocalChanges" xml : space =" preserve" >Empty commit detected! Do you want to continue (--allow-empty)?</x : String >
181
182
<x : String x : Key =" Text.ConfirmEmptyCommit.Continue" xml : space =" preserve" >CONTINUE</x : String >
182
183
<x : String x : Key =" Text.ConfirmEmptyCommit.StageAllThenCommit" xml : space =" preserve" >STAGE ALL & COMMIT</x : String >
183
184
<x : String x : Key =" Text.ConventionalCommit" xml : space =" preserve" >Conventional Commit Helper</x : String >
Original file line number Diff line number Diff line change 181
181
<x : String x : Key =" Text.ConfigureWorkspace" xml : space =" preserve" >工作区</x : String >
182
182
<x : String x : Key =" Text.ConfigureWorkspace.Color" xml : space =" preserve" >颜色</x : String >
183
183
<x : String x : Key =" Text.ConfigureWorkspace.Restore" xml : space =" preserve" >启动时恢复打开的仓库</x : String >
184
- <x : String x : Key =" Text.ConfirmEmptyCommit.Message" xml : space =" preserve" >提交未包含变更文件!是否继续(--allow-empty)或是自动暂存所有变更并提交?</x : String >
184
+ <x : String x : Key =" Text.ConfirmEmptyCommit.WithLocalChanges" xml : space =" preserve" >提交未包含变更文件!是否继续(--allow-empty)或是自动暂存所有变更并提交?</x : String >
185
+ <x : String x : Key =" Text.ConfirmEmptyCommit.NoLocalChanges" xml : space =" preserve" >提交未包含变更文件!是否继续(--allow-empty)?</x : String >
185
186
<x : String x : Key =" Text.ConfirmEmptyCommit.Continue" xml : space =" preserve" >确认继续</x : String >
186
187
<x : String x : Key =" Text.ConfirmEmptyCommit.StageAllThenCommit" xml : space =" preserve" >自动暂存并提交</x : String >
187
188
<x : String x : Key =" Text.ConventionalCommit" xml : space =" preserve" >规范化提交信息生成</x : String >
Original file line number Diff line number Diff line change 181
181
<x : String x : Key =" Text.ConfigureWorkspace" xml : space =" preserve" >工作區</x : String >
182
182
<x : String x : Key =" Text.ConfigureWorkspace.Color" xml : space =" preserve" >顏色</x : String >
183
183
<x : String x : Key =" Text.ConfigureWorkspace.Restore" xml : space =" preserve" >啟動時還原上次開啟的存放庫</x : String >
184
- <x : String x : Key =" Text.ConfirmEmptyCommit.Message" xml : space =" preserve" >未包含任何檔案變更! 您是否仍要提交 (--allow-empty)或者自動暫存全部變更並提交?</x : String >
184
+ <x : String x : Key =" Text.ConfirmEmptyCommit.WithLocalChanges" xml : space =" preserve" >未包含任何檔案變更! 您是否仍要提交 (--allow-empty)或者自動暫存全部變更並提交?</x : String >
185
+ <x : String x : Key =" Text.ConfirmEmptyCommit.NoLocalChanges" xml : space =" preserve" >未包含任何檔案變更! 您是否仍要提交 (--allow-empty)?</x : String >
185
186
<x : String x : Key =" Text.ConfirmEmptyCommit.Continue" xml : space =" preserve" >确认继续</x : String >
186
187
<x : String x : Key =" Text.ConfirmEmptyCommit.StageAllThenCommit" xml : space =" preserve" >自动暂存并提交</x : String >
187
188
<x : String x : Key =" Text.ConventionalCommit" xml : space =" preserve" >產生約定式提交訊息</x : String >
Original file line number Diff line number Diff line change @@ -10,9 +10,16 @@ public bool HasLocalChanges
10
10
private set ;
11
11
}
12
12
13
+ public string Message
14
+ {
15
+ get ;
16
+ private set ;
17
+ }
18
+
13
19
public ConfirmEmptyCommit ( bool hasLocalChanges , Action < bool > onSure )
14
20
{
15
21
HasLocalChanges = hasLocalChanges ;
22
+ Message = App . Text ( hasLocalChanges ? "ConfirmEmptyCommit.WithLocalChanges" : "ConfirmEmptyCommit.NoLocalChanges" ) ;
16
23
_onSure = onSure ;
17
24
}
18
25
Original file line number Diff line number Diff line change 38
38
39
39
<!-- Body -->
40
40
<Border Grid.Row=" 1" Margin =" 16" >
41
- <TextBlock Text =" {DynamicResource Text.ConfirmEmptyCommit. Message}" MaxWidth =" 520" TextWrapping =" Wrap" />
41
+ <TextBlock Text =" {Binding Message}" MaxWidth =" 520" TextWrapping =" Wrap" />
42
42
</Border >
43
43
44
44
<!-- Buttons -->
You can’t perform that action at this time.
0 commit comments