Skip to content

Commit 1d31f5f

Browse files
NathanBaulchNathanBaulch
authored
localization: move strings into resources (#1535)
1 parent 58e63b9 commit 1d31f5f

File tree

9 files changed

+39
-22
lines changed

9 files changed

+39
-22
lines changed

‎src/Resources/Locales/en_US.axaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<x:String x:Key="Text.Archive.Revision" xml:space="preserve">Revision:</x:String>
3636
<x:String x:Key="Text.Archive.Title" xml:space="preserve">Archive</x:String>
3737
<x:String x:Key="Text.Askpass" xml:space="preserve">SourceGit Askpass</x:String>
38+
<x:String x:Key="Text.Askpass.Passphrase" xml:space="preserve">Enter passphrase:</x:String>
3839
<x:String x:Key="Text.AssumeUnchanged" xml:space="preserve">FILES ASSUME UNCHANGED</x:String>
3940
<x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">NO FILES ASSUMED AS UNCHANGED</x:String>
4041
<x:String x:Key="Text.Avatar.Load" xml:space="preserve">Load Image...</x:String>
@@ -147,17 +148,20 @@
147148
<x:String x:Key="Text.CommitDetail.Info.ContainsIn" xml:space="preserve">Check refs that contains this commit</x:String>
148149
<x:String x:Key="Text.CommitDetail.Info.ContainsIn.Title" xml:space="preserve">COMMIT IS CONTAINED BY</x:String>
149150
<x:String x:Key="Text.CommitDetail.Info.GotoChangesPage" xml:space="preserve">Shows only the first 100 changes. See all changes on the CHANGES tab.</x:String>
151+
<x:String x:Key="Text.CommitDetail.Info.Key" xml:space="preserve">Key:</x:String>
150152
<x:String x:Key="Text.CommitDetail.Info.Message" xml:space="preserve">MESSAGE</x:String>
151153
<x:String x:Key="Text.CommitDetail.Info.Parents" xml:space="preserve">PARENTS</x:String>
152154
<x:String x:Key="Text.CommitDetail.Info.Refs" xml:space="preserve">REFS</x:String>
153155
<x:String x:Key="Text.CommitDetail.Info.SHA" xml:space="preserve">SHA</x:String>
156+
<x:String x:Key="Text.CommitDetail.Info.Signer" xml:space="preserve">Signer:</x:String>
154157
<x:String x:Key="Text.CommitDetail.Info.WebLinks" xml:space="preserve">Open in Browser</x:String>
155158
<x:String x:Key="Text.CommitMessageTextBox.MessagePlaceholder" xml:space="preserve">Description</x:String>
156159
<x:String x:Key="Text.CommitMessageTextBox.SubjectCount" xml:space="preserve">SUBJECT</x:String>
157160
<x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Enter commit subject</x:String>
158161
<x:String x:Key="Text.Configure" xml:space="preserve">Repository Configure</x:String>
159162
<x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">COMMIT TEMPLATE</x:String>
160163
<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>
161165
<x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Template Name:</x:String>
162166
<x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">CUSTOM ACTION</x:String>
163167
<x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Arguments:</x:String>
@@ -218,6 +222,8 @@
218222
<x:String x:Key="Text.ConfirmEmptyCommit.NoLocalChanges" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty)?</x:String>
219223
<x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">STAGE ALL &amp; COMMIT</x:String>
220224
<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>
225+
<x:String x:Key="Text.ConfirmRestart.Title" xml:space="preserve">Restart Required</x:String>
226+
<x:String x:Key="Text.ConfirmRestart.Message" xml:space="preserve">You need to restart this app to apply changes.</x:String>
221227
<x:String x:Key="Text.ConventionalCommit" xml:space="preserve">Conventional Commit Helper</x:String>
222228
<x:String x:Key="Text.ConventionalCommit.BreakingChanges" xml:space="preserve">Breaking Change:</x:String>
223229
<x:String x:Key="Text.ConventionalCommit.ClosedIssue" xml:space="preserve">Closed Issue:</x:String>
@@ -282,6 +288,9 @@
282288
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">File Mode Changed</x:String>
283289
<x:String x:Key="Text.Diff.First" xml:space="preserve">First Difference</x:String>
284290
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignore All Whitespace Changes</x:String>
291+
<x:String x:Key="Text.Diff.Image.SideBySide" xml:space="preserve">SIDE-BY-SIDE</x:String>
292+
<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>
285294
<x:String x:Key="Text.Diff.Last" xml:space="preserve">Last Difference</x:String>
286295
<x:String x:Key="Text.Diff.LFS" xml:space="preserve">LFS OBJECT CHANGE</x:String>
287296
<x:String x:Key="Text.Diff.Next" xml:space="preserve">Next Difference</x:String>
@@ -443,8 +452,14 @@
443452
<x:String x:Key="Text.InProgress.Revert" xml:space="preserve">Revert in progress.</x:String>
444453
<x:String x:Key="Text.InProgress.Revert.Head" xml:space="preserve">Reverting commit</x:String>
445454
<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>
446458
<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>
447460
<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>
448463
<x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Target Branch:</x:String>
449464
<x:String x:Key="Text.IssueLinkCM.CopyLink" xml:space="preserve">Copy Link</x:String>
450465
<x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Open in Browser</x:String>
@@ -568,6 +583,7 @@
568583
<x:String x:Key="Text.Push.CheckSubmodules" xml:space="preserve">Make sure submodules have been pushed</x:String>
569584
<x:String x:Key="Text.Push.Force" xml:space="preserve">Force push</x:String>
570585
<x:String x:Key="Text.Push.Local" xml:space="preserve">Local Branch:</x:String>
586+
<x:String x:Key="Text.Push.New" xml:space="preserve">NEW</x:String>
571587
<x:String x:Key="Text.Push.Remote" xml:space="preserve">Remote:</x:String>
572588
<x:String x:Key="Text.Push.Revision" xml:space="preserve">Revision:</x:String>
573589
<x:String x:Key="Text.Push.Revision.Title" xml:space="preserve">Push Revision To Remote</x:String>

‎src/Views/Askpass.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
<StackPanel Grid.Row="1" Margin="0,16" Orientation="Vertical">
3838
<Border Margin="16,0">
39-
<TextBlock x:Name="TxtDescription" Text="Enter passphrase:" TextWrapping="Wrap"/>
39+
<TextBlock x:Name="TxtDescription" Text="{DynamicResource Text.Askpass.Passphrase}" TextWrapping="Wrap"/>
4040
</Border>
4141

4242
<TextBox x:Name="TxtPassphrase"

‎src/Views/CommitBaseInfo.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@
8080
<StackPanel Orientation="Vertical">
8181
<TextBlock Margin="0,0,0,12" Text="{Binding ToolTip}"/>
8282
<Grid ColumnDefinitions="Auto,8,Auto" RowDefinitions="Auto,Auto">
83-
<TextBlock Grid.Row="0" Grid.Column="0" Text="Signer:" IsVisible="{Binding HasSigner}" VerticalAlignment="Center"/>
83+
<TextBlock Grid.Row="0" Grid.Column="0" Text="{DynamicResource Text.CommitDetail.Info.Signer}" IsVisible="{Binding HasSigner}" VerticalAlignment="Center"/>
8484
<TextBlock Grid.Row="0" Grid.Column="2" Text="{Binding Signer}" IsVisible="{Binding HasSigner}" VerticalAlignment="Center"/>
85-
<TextBlock Grid.Row="1" Grid.Column="0" Text="Key:" VerticalAlignment="Center"/>
85+
<TextBlock Grid.Row="1" Grid.Column="0" Text="{DynamicResource Text.CommitDetail.Info.Key}" VerticalAlignment="Center"/>
8686
<TextBlock Grid.Row="1" Grid.Column="2" Text="{Binding Key}" VerticalAlignment="Center"/>
8787
</Grid>
8888
</StackPanel>

‎src/Views/CommitMessageEditor.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</Grid>
3737

3838
<StackPanel Grid.Row="1" Orientation="Vertical" Margin="8">
39-
<v:CommitMessageTextBox x:Name="Editor" Height="400" Text=""/>
39+
<v:CommitMessageTextBox x:Name="Editor" Height="400"/>
4040
<Button Classes="flat primary"
4141
Width="80"
4242
Margin="0,8,0,4"

‎src/Views/ConfirmRestart.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
IsVisible="{OnPlatform True, macOS=False}"/>
2626

2727
<TextBlock Classes="bold"
28-
Text="Restart Required"
28+
Text="{DynamicResource Text.ConfirmRestart.Title}"
2929
HorizontalAlignment="Center" VerticalAlignment="Center"
3030
IsHitTestVisible="False"/>
3131

@@ -36,7 +36,7 @@
3636

3737
<StackPanel Grid.Row="1" Margin="0,16" Orientation="Vertical">
3838
<Border Margin="16,0">
39-
<TextBlock Text="You need to restart this app to apply changes."/>
39+
<TextBlock Text="{DynamicResource Text.ConfirmRestart.Message}"/>
4040
</Border>
4141

4242
<Button Classes="flat primary"

‎src/Views/ImageDiffView.axaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<TabItem>
1919
<TabItem.Header>
20-
<TextBlock Text="SIDE-BY-SIDE" FontSize="11"/>
20+
<TextBlock Text="{DynamicResource Text.Diff.Image.SideBySide}" FontSize="11"/>
2121
</TabItem.Header>
2222

2323
<UniformGrid Rows="1" Margin="0,16" HorizontalAlignment="Center" VerticalAlignment="Center">
@@ -63,7 +63,7 @@
6363

6464
<TabItem>
6565
<TabItem.Header>
66-
<TextBlock Text="SWIPE" FontSize="11"/>
66+
<TextBlock Text="{DynamicResource Text.Diff.Image.Swipe}" FontSize="11"/>
6767
</TabItem.Header>
6868

6969
<Grid RowDefinitions="Auto,*" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="8,16">
@@ -97,7 +97,7 @@
9797

9898
<TabItem>
9999
<TabItem.Header>
100-
<TextBlock Text="BLEND" FontSize="11"/>
100+
<TextBlock Text="{DynamicResource Text.Diff.Image.Blend}" FontSize="11"/>
101101
</TabItem.Header>
102102

103103
<Grid RowDefinitions="Auto,*,Auto" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="8,16,8,0">
@@ -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="OLD"/>
132+
<TextBlock Classes="primary" Text="{DynamicResource Text.Diff.Binary.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="NEW"/>
150+
<TextBlock Classes="primary" Text="{DynamicResource Text.Diff.Binary.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: 10 additions & 9 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, "Pick", "Use this commit", "P", item, Models.InteractiveRebaseAction.Pick);
165-
CreateActionMenuItem(flyout, Brushes.Orange, "Edit", "Stop for amending", "E", item, Models.InteractiveRebaseAction.Edit);
166-
CreateActionMenuItem(flyout, Brushes.Orange, "Reword", "Edit the commit message", "R", item, Models.InteractiveRebaseAction.Reword);
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);
167167

168168
if (item.CanSquashOrFixup)
169169
{
170-
CreateActionMenuItem(flyout, Brushes.LightGray, "Squash", "Meld into previous commit", "S", item, Models.InteractiveRebaseAction.Squash);
171-
CreateActionMenuItem(flyout, Brushes.LightGray, "Fixup", "Like 'Squash' but discard message", "F", item, Models.InteractiveRebaseAction.Fixup);
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);
172172
}
173173

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

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

205-
private void CreateActionMenuItem(MenuFlyout flyout, IBrush iconBrush, string label, string desc, string hotkey, ViewModels.InteractiveRebaseItem item, Models.InteractiveRebaseAction action)
205+
private void CreateActionMenuItem(MenuFlyout flyout, IBrush iconBrush, Models.InteractiveRebaseAction action, string desc, ViewModels.InteractiveRebaseItem item)
206206
{
207+
var name = action.ToString();
207208
var header = new Grid()
208209
{
209210
ColumnDefinitions =
@@ -217,7 +218,7 @@ private void CreateActionMenuItem(MenuFlyout flyout, IBrush iconBrush, string la
217218
{
218219
[Grid.ColumnProperty] = 0,
219220
Margin = new Thickness(4, 0),
220-
Text = label
221+
Text = name
221222
},
222223
new TextBlock()
223224
{
@@ -231,7 +232,7 @@ private void CreateActionMenuItem(MenuFlyout flyout, IBrush iconBrush, string la
231232
var menuItem = new MenuItem();
232233
menuItem.Icon = new Ellipse() { Width = 14, Height = 14, Fill = iconBrush };
233234
menuItem.Header = header;
234-
menuItem.Tag = hotkey;
235+
menuItem.Tag = name[0];
235236
menuItem.Click += (_, e) =>
236237
{
237238
if (DataContext is ViewModels.InteractiveRebase vm)

‎src/Views/Push.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
VerticalAlignment="Center"
8181
Background="Green"
8282
IsVisible="{Binding Head, Converter={x:Static StringConverters.IsNullOrEmpty}}">
83-
<TextBlock Text="NEW" FontSize="9" FontFamily="{DynamicResource Fonts.Monospace}" Foreground="White" VerticalAlignment="Center"/>
83+
<TextBlock Text="{DynamicResource Text.Push.New}" FontSize="9" FontFamily="{DynamicResource Fonts.Monospace}" Foreground="White" VerticalAlignment="Center"/>
8484
</Border>
8585
</StackPanel>
8686
</DataTemplate>

‎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="You can use ${files_num}, ${branch_name}, ${files} and ${files:N} where N is the max number of file paths to output."
263+
Text="{DynamicResource Text.Configure.CommitMessageTemplate.Explanation}"
264264
Foreground="{DynamicResource Brush.FG2}"
265265
TextWrapping="Wrap"/>
266266
</StackPanel>

0 commit comments

Comments
 (0)