Skip to content

Commit b1801e7

Browse files
love-lingerlove-linger
committed
code_review: PR #1535
- Do not translate interactive rebase action description. - For slider label in `BLEND` diff mode, it can not use `Text.Diff.Binary.New` or `Text.Diff.Binary.Old`. Because those keys are labels for size. Signed-off-by: leo <[email protected]>
1 parent 14bea8e commit b1801e7

File tree

6 files changed

+34
-21
lines changed

6 files changed

+34
-21
lines changed

‎src/Resources/Locales/en_US.axaml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@
160160
<x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Enter commit subject</x:String>
161161
<x:String x:Key="Text.Configure" xml:space="preserve">Repository Configure</x:String>
162162
<x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">COMMIT TEMPLATE</x:String>
163+
<x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">You can use ${files_num}, ${branch_name}, ${files} and ${files:N} where N is the max number of file paths to output.</x:String>
163164
<x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">Template Content:</x:String>
164-
<x:String x:Key="Text.Configure.CommitMessageTemplate.Explanation" xml:space="preserve">You can use ${files_num}, ${branch_name}, ${files} and ${files:N} where N is the max number of file paths to output.</x:String>
165165
<x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Template Name:</x:String>
166166
<x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">CUSTOM ACTION</x:String>
167167
<x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Arguments:</x:String>
@@ -288,9 +288,9 @@
288288
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">File Mode Changed</x:String>
289289
<x:String x:Key="Text.Diff.First" xml:space="preserve">First Difference</x:String>
290290
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignore All Whitespace Changes</x:String>
291+
<x:String x:Key="Text.Diff.Image.Blend" xml:space="preserve">BLEND</x:String>
291292
<x:String x:Key="Text.Diff.Image.SideBySide" xml:space="preserve">SIDE-BY-SIDE</x:String>
292293
<x:String x:Key="Text.Diff.Image.Swipe" xml:space="preserve">SWIPE</x:String>
293-
<x:String x:Key="Text.Diff.Image.Blend" xml:space="preserve">BLEND</x:String>
294294
<x:String x:Key="Text.Diff.Last" xml:space="preserve">Last Difference</x:String>
295295
<x:String x:Key="Text.Diff.LFS" xml:space="preserve">LFS OBJECT CHANGE</x:String>
296296
<x:String x:Key="Text.Diff.Next" xml:space="preserve">Next Difference</x:String>
@@ -452,14 +452,8 @@
452452
<x:String x:Key="Text.InProgress.Revert" xml:space="preserve">Revert in progress.</x:String>
453453
<x:String x:Key="Text.InProgress.Revert.Head" xml:space="preserve">Reverting commit</x:String>
454454
<x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Interactive Rebase</x:String>
455-
<x:String x:Key="Text.InteractiveRebase.Drop.Message" xml:space="preserve">Remove commit</x:String>
456-
<x:String x:Key="Text.InteractiveRebase.Edit.Message" xml:space="preserve">Stop for amending</x:String>
457-
<x:String x:Key="Text.InteractiveRebase.Fixup.Message" xml:space="preserve">Like 'Squash' but discard message</x:String>
458455
<x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">On:</x:String>
459-
<x:String x:Key="Text.InteractiveRebase.Pick.Message" xml:space="preserve">Use this commit</x:String>
460456
<x:String x:Key="Text.InteractiveRebase.ReorderTip" xml:space="preserve">Drag-drop to reorder commits</x:String>
461-
<x:String x:Key="Text.InteractiveRebase.Reword.Message" xml:space="preserve">Edit the commit message</x:String>
462-
<x:String x:Key="Text.InteractiveRebase.Squash.Message" xml:space="preserve">Squash into previous commit</x:String>
463457
<x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Target Branch:</x:String>
464458
<x:String x:Key="Text.IssueLinkCM.CopyLink" xml:space="preserve">Copy Link</x:String>
465459
<x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Open in Browser</x:String>

‎src/Resources/Locales/zh_CN.axaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<x:String x:Key="Text.Archive.Revision" xml:space="preserve">指定的提交：</x:String>
4040
<x:String x:Key="Text.Archive.Title" xml:space="preserve">存档</x:String>
4141
<x:String x:Key="Text.Askpass" xml:space="preserve">SourceGit Askpass</x:String>
42+
<x:String x:Key="Text.Askpass.Passphrase" xml:space="preserve">请输入密码 ：</x:String>
4243
<x:String x:Key="Text.AssumeUnchanged" xml:space="preserve">不跟踪更改的文件</x:String>
4344
<x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">没有不跟踪更改的文件</x:String>
4445
<x:String x:Key="Text.Avatar.Load" xml:space="preserve">加载本地图片</x:String>
@@ -151,16 +152,19 @@
151152
<x:String x:Key="Text.CommitDetail.Info.ContainsIn" xml:space="preserve">查看包含此提交的分支/标签</x:String>
152153
<x:String x:Key="Text.CommitDetail.Info.ContainsIn.Title" xml:space="preserve">本提交已被以下分支/标签包含</x:String>
153154
<x:String x:Key="Text.CommitDetail.Info.GotoChangesPage" xml:space="preserve">仅显示前100项变更。请前往【变更对比】页面查看全部。</x:String>
155+
<x:String x:Key="Text.CommitDetail.Info.Key" xml:space="preserve">签名密钥 ：</x:String>
154156
<x:String x:Key="Text.CommitDetail.Info.Message" xml:space="preserve">提交信息</x:String>
155157
<x:String x:Key="Text.CommitDetail.Info.Parents" xml:space="preserve">父提交</x:String>
156158
<x:String x:Key="Text.CommitDetail.Info.Refs" xml:space="preserve">相关引用</x:String>
157159
<x:String x:Key="Text.CommitDetail.Info.SHA" xml:space="preserve">提交指纹</x:String>
160+
<x:String x:Key="Text.CommitDetail.Info.Signer" xml:space="preserve">签名者 ：</x:String>
158161
<x:String x:Key="Text.CommitDetail.Info.WebLinks" xml:space="preserve">浏览器中查看</x:String>
159162
<x:String x:Key="Text.CommitMessageTextBox.MessagePlaceholder" xml:space="preserve">详细描述</x:String>
160163
<x:String x:Key="Text.CommitMessageTextBox.SubjectCount" xml:space="preserve">主题</x:String>
161164
<x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">填写提交信息主题</x:String>
162165
<x:String x:Key="Text.Configure" xml:space="preserve">仓库配置</x:String>
163166
<x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">提交信息模板</x:String>
167+
<x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">您可使用 ${files_num}, ${branch_name}, ${files} 或 ${files:N}（N表示最大显示的文件数）</x:String>
164168
<x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">模板内容 ：</x:String>
165169
<x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">模板名 ：</x:String>
166170
<x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">自定义操作</x:String>
@@ -222,6 +226,8 @@
222226
<x:String x:Key="Text.ConfirmEmptyCommit.NoLocalChanges" xml:space="preserve">提交未包含变更文件！是否继续(--allow-empty)？</x:String>
223227
<x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">自动暂存并提交</x:String>
224228
<x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">提交未包含变更文件！是否继续(--allow-empty)或是自动暂存所有变更并提交？</x:String>
229+
<x:String x:Key="Text.ConfirmRestart.Title" xml:space="preserve">系统提示</x:String>
230+
<x:String x:Key="Text.ConfirmRestart.Message" xml:space="preserve">程序需要重新启动，以便修改生效！</x:String>
225231
<x:String x:Key="Text.ConventionalCommit" xml:space="preserve">规范化提交信息生成</x:String>
226232
<x:String x:Key="Text.ConventionalCommit.BreakingChanges" xml:space="preserve">破坏性更新：</x:String>
227233
<x:String x:Key="Text.ConventionalCommit.ClosedIssue" xml:space="preserve">关闭的ISSUE：</x:String>
@@ -286,6 +292,9 @@
286292
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">文件权限已变化</x:String>
287293
<x:String x:Key="Text.Diff.First" xml:space="preserve">首个差异</x:String>
288294
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">忽略空白符号变化</x:String>
295+
<x:String x:Key="Text.Diff.Image.Blend" xml:space="preserve">混合对比</x:String>
296+
<x:String x:Key="Text.Diff.Image.SideBySide" xml:space="preserve">分列对比</x:String>
297+
<x:String x:Key="Text.Diff.Image.Swipe" xml:space="preserve">填充对比</x:String>
289298
<x:String x:Key="Text.Diff.Last" xml:space="preserve">最后一个差异</x:String>
290299
<x:String x:Key="Text.Diff.LFS" xml:space="preserve">LFS对象变更</x:String>
291300
<x:String x:Key="Text.Diff.Next" xml:space="preserve">下一个差异</x:String>
@@ -572,6 +581,7 @@
572581
<x:String x:Key="Text.Push.CheckSubmodules" xml:space="preserve">确保子模块变更已推送</x:String>
573582
<x:String x:Key="Text.Push.Force" xml:space="preserve">启用强制推送</x:String>
574583
<x:String x:Key="Text.Push.Local" xml:space="preserve">本地分支 ：</x:String>
584+
<x:String x:Key="Text.Push.New" xml:space="preserve">新建</x:String>
575585
<x:String x:Key="Text.Push.Remote" xml:space="preserve">远程仓库 ：</x:String>
576586
<x:String x:Key="Text.Push.Revision" xml:space="preserve">修订 ：</x:String>
577587
<x:String x:Key="Text.Push.Revision.Title" xml:space="preserve">推送指定修订到远程仓库</x:String>

‎src/Resources/Locales/zh_TW.axaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<x:String x:Key="Text.Archive.Revision" xml:space="preserve">指定的提交:</x:String>
4040
<x:String x:Key="Text.Archive.Title" xml:space="preserve">封存</x:String>
4141
<x:String x:Key="Text.Askpass" xml:space="preserve">SourceGit Askpass</x:String>
42+
<x:String x:Key="Text.Askpass.Passphrase" xml:space="preserve">輸入您的密碼:</x:String>
4243
<x:String x:Key="Text.AssumeUnchanged" xml:space="preserve">不追蹤變更的檔案</x:String>
4344
<x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">沒有不追蹤變更的檔案</x:String>
4445
<x:String x:Key="Text.Avatar.Load" xml:space="preserve">載入本機圖片...</x:String>
@@ -151,16 +152,19 @@
151152
<x:String x:Key="Text.CommitDetail.Info.ContainsIn" xml:space="preserve">檢視包含此提交的分支或標籤</x:String>
152153
<x:String x:Key="Text.CommitDetail.Info.ContainsIn.Title" xml:space="preserve">本提交包含於以下分支或標籤</x:String>
153154
<x:String x:Key="Text.CommitDetail.Info.GotoChangesPage" xml:space="preserve">僅顯示前 100 項變更。請前往 [變更對比] 頁面以瀏覽所有變更。</x:String>
155+
<x:String x:Key="Text.CommitDetail.Info.Key" xml:space="preserve">簽名鑰匙:</x:String>
154156
<x:String x:Key="Text.CommitDetail.Info.Message" xml:space="preserve">提交訊息</x:String>
155157
<x:String x:Key="Text.CommitDetail.Info.Parents" xml:space="preserve">前次提交</x:String>
156158
<x:String x:Key="Text.CommitDetail.Info.Refs" xml:space="preserve">相關參照</x:String>
157159
<x:String x:Key="Text.CommitDetail.Info.SHA" xml:space="preserve">提交編號</x:String>
160+
<x:String x:Key="Text.CommitDetail.Info.Signer" xml:space="preserve">簽署人:</x:String>
158161
<x:String x:Key="Text.CommitDetail.Info.WebLinks" xml:space="preserve">在瀏覽器中檢視</x:String>
159162
<x:String x:Key="Text.CommitMessageTextBox.MessagePlaceholder" xml:space="preserve">詳細描述</x:String>
160163
<x:String x:Key="Text.CommitMessageTextBox.SubjectCount" xml:space="preserve">標題</x:String>
161164
<x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">填寫提交訊息標題</x:String>
162165
<x:String x:Key="Text.Configure" xml:space="preserve">存放庫設定</x:String>
163166
<x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">提交訊息範本</x:String>
167+
<x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">您可以使用 ${files_num}、${branch_name}、${files} 或 ${files:N} 其中 N 是要輸出的檔案路徑的最大數目。</x:String>
164168
<x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">範本內容:</x:String>
165169
<x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">範本名稱:</x:String>
166170
<x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">自訂動作</x:String>
@@ -222,6 +226,8 @@
222226
<x:String x:Key="Text.ConfirmEmptyCommit.NoLocalChanges" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty)?</x:String>
223227
<x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">自動暫存並提交</x:String>
224228
<x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty) 或者自動暫存全部變更並提交?</x:String>
229+
<x:String x:Key="Text.ConfirmRestart.Title" xml:space="preserve">系統提示</x:String>
230+
<x:String x:Key="Text.ConfirmRestart.Message" xml:space="preserve">您需要重新啟動此應用程式才能套用變更！</x:String>
225231
<x:String x:Key="Text.ConventionalCommit" xml:space="preserve">產生約定式提交訊息</x:String>
226232
<x:String x:Key="Text.ConventionalCommit.BreakingChanges" xml:space="preserve">破壞性變更:</x:String>
227233
<x:String x:Key="Text.ConventionalCommit.ClosedIssue" xml:space="preserve">關閉的 Issue:</x:String>
@@ -286,6 +292,9 @@
286292
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">檔案權限已變更</x:String>
287293
<x:String x:Key="Text.Diff.First" xml:space="preserve">第一個差異</x:String>
288294
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">忽略空白符號變化</x:String>
295+
<x:String x:Key="Text.Diff.Image.Blend" xml:space="preserve">混合對比</x:String>
296+
<x:String x:Key="Text.Diff.Image.SideBySide" xml:space="preserve">並排對比</x:String>
297+
<x:String x:Key="Text.Diff.Image.Swipe" xml:space="preserve">填充對比</x:String>
289298
<x:String x:Key="Text.Diff.Last" xml:space="preserve">最後一個差異</x:String>
290299
<x:String x:Key="Text.Diff.LFS" xml:space="preserve">LFS 物件變更</x:String>
291300
<x:String x:Key="Text.Diff.Next" xml:space="preserve">下一個差異</x:String>
@@ -572,6 +581,7 @@
572581
<x:String x:Key="Text.Push.CheckSubmodules" xml:space="preserve">確保已推送子模組</x:String>
573582
<x:String x:Key="Text.Push.Force" xml:space="preserve">啟用強制推送</x:String>
574583
<x:String x:Key="Text.Push.Local" xml:space="preserve">本機分支:</x:String>
584+
<x:String x:Key="Text.Push.New" xml:space="preserve">新增</x:String>
575585
<x:String x:Key="Text.Push.Remote" xml:space="preserve">遠端存放庫:</x:String>
576586
<x:String x:Key="Text.Push.Revision" xml:space="preserve">修訂:</x:String>
577587
<x:String x:Key="Text.Push.Revision.Title" xml:space="preserve">推送修訂到遠端存放庫</x:String>

‎src/Views/ImageDiffView.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129

130130
<Grid Grid.Row="2" ColumnDefinitions="100,200,100" Margin="0,12,0,0" HorizontalAlignment="Center">
131131
<StackPanel Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,8,0">
132-
<TextBlock Classes="primary" Text="{DynamicResource Text.Diff.Binary.Old}"/>
132+
<TextBlock Classes="primary" Text="OLD"/>
133133
<TextBlock Classes="primary"
134134
Margin="8,0,0,0"
135135
Text="{Binding #ImageBlendSlider.Value, Converter={x:Static c:DoubleConverters.OneMinusToPercentage}}"
@@ -147,7 +147,7 @@
147147
Value="0.5"/>
148148

149149
<StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Top" Margin="8,0,0,0">
150-
<TextBlock Classes="primary" Text="{DynamicResource Text.Diff.Binary.New}"/>
150+
<TextBlock Classes="primary" Text="NEW"/>
151151
<TextBlock Classes="primary"
152152
Margin="8,0,0,0"
153153
Text="{Binding #ImageBlendSlider.Value, Converter={x:Static c:DoubleConverters.ToPercentage}}"

‎src/Views/InteractiveRebase.axaml.cs‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -161,17 +161,17 @@ private void OnButtonActionClicked(object sender, RoutedEventArgs e)
161161
flyout.Placement = PlacementMode.BottomEdgeAlignedLeft;
162162
flyout.VerticalOffset = -4;
163163

164-
CreateActionMenuItem(flyout, Brushes.Green, Models.InteractiveRebaseAction.Pick, App.Text("InteractiveRebase.Pick.Message"), item);
165-
CreateActionMenuItem(flyout, Brushes.Orange, Models.InteractiveRebaseAction.Edit, App.Text("InteractiveRebase.Edit.Message"), item);
166-
CreateActionMenuItem(flyout, Brushes.Orange, Models.InteractiveRebaseAction.Reword, App.Text("InteractiveRebase.Reword.Message"), item);
164+
CreateActionMenuItem(flyout, item, Models.InteractiveRebaseAction.Pick, Brushes.Green, "Use this commit", "P");
165+
CreateActionMenuItem(flyout, item, Models.InteractiveRebaseAction.Edit, Brushes.Orange, "Stop for amending", "E");
166+
CreateActionMenuItem(flyout, item, Models.InteractiveRebaseAction.Reword, Brushes.Orange, "Edit the commit message", "R");
167167

168168
if (item.CanSquashOrFixup)
169169
{
170-
CreateActionMenuItem(flyout, Brushes.LightGray, Models.InteractiveRebaseAction.Squash, App.Text("InteractiveRebase.Squash.Message"), item);
171-
CreateActionMenuItem(flyout, Brushes.LightGray, Models.InteractiveRebaseAction.Fixup, App.Text("InteractiveRebase.Fixup.Message"), item);
170+
CreateActionMenuItem(flyout, item, Models.InteractiveRebaseAction.Squash, Brushes.LightGray, "Meld into previous commit", "S");
171+
CreateActionMenuItem(flyout, item, Models.InteractiveRebaseAction.Fixup, Brushes.LightGray, "Like 'Squash' but discard message", "F");
172172
}
173173

174-
CreateActionMenuItem(flyout, Brushes.Red, Models.InteractiveRebaseAction.Drop, App.Text("InteractiveRebase.Drop.Message"), item);
174+
CreateActionMenuItem(flyout, item, Models.InteractiveRebaseAction.Drop, Brushes.Red, "Remove commit", "D");
175175

176176
flyout.ShowAt(button);
177177
e.Handled = true;
@@ -202,9 +202,8 @@ private async void OnStartJobs(object _1, RoutedEventArgs _2)
202202
Close();
203203
}
204204

205-
private void CreateActionMenuItem(MenuFlyout flyout, IBrush iconBrush, Models.InteractiveRebaseAction action, string desc, ViewModels.InteractiveRebaseItem item)
205+
private void CreateActionMenuItem(MenuFlyout flyout, ViewModels.InteractiveRebaseItem item, Models.InteractiveRebaseAction action, IBrush iconBrush, string desc, string hotkey)
206206
{
207-
var name = action.ToString();
208207
var header = new Grid()
209208
{
210209
ColumnDefinitions =
@@ -218,7 +217,7 @@ private void CreateActionMenuItem(MenuFlyout flyout, IBrush iconBrush, Models.In
218217
{
219218
[Grid.ColumnProperty] = 0,
220219
Margin = new Thickness(4, 0),
221-
Text = name
220+
Text = action.ToString()
222221
},
223222
new TextBlock()
224223
{
@@ -232,7 +231,7 @@ private void CreateActionMenuItem(MenuFlyout flyout, IBrush iconBrush, Models.In
232231
var menuItem = new MenuItem();
233232
menuItem.Icon = new Ellipse() { Width = 14, Height = 14, Fill = iconBrush };
234233
menuItem.Header = header;
235-
menuItem.Tag = name[0];
234+
menuItem.Tag = hotkey;
236235
menuItem.Click += (_, e) =>
237236
{
238237
if (DataContext is ViewModels.InteractiveRebase vm)

‎src/Views/RepositoryConfigure.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@
260260
<TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Configure.CommitMessageTemplate.Content}"/>
261261
<v:CommitMessageTextBox Margin="0,4,0,0" Height="150" Text="{Binding Content, Mode=TwoWay}"/>
262262
<TextBlock Margin="0,2,0,0"
263-
Text="{DynamicResource Text.Configure.CommitMessageTemplate.Explanation}"
263+
Text="{DynamicResource Text.Configure.CommitMessageTemplate.BuiltinVars}"
264264
Foreground="{DynamicResource Brush.FG2}"
265265
TextWrapping="Wrap"/>
266266
</StackPanel>

0 commit comments

Comments
 (0)