Skip to content

Commit 2504a52

Browse files
love-lingerlove-linger
committed
fix: wrong display when merge tag
* remove `Text.Merge.Source` translations from `de_DE`/`es_ES`/`fr_FR`/`it_IT`/`pt_BR`/`ru_RU` because its content has been changed
1 parent 4dd3b7f commit 2504a52

File tree

13 files changed

+55
-24
lines changed

13 files changed

+55
-24
lines changed

‎src/Resources/Locales/de_DE.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,6 @@
403403
<x:String x:Key="Text.Merge" xml:space="preserve">Branch mergen</x:String>
404404
<x:String x:Key="Text.Merge.Into" xml:space="preserve">Ziel-Branch:</x:String>
405405
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">Merge Option:</x:String>
406-
<x:String x:Key="Text.Merge.Source" xml:space="preserve">Quell-Branch:</x:String>
407406
<x:String x:Key="Text.MoveRepositoryNode" xml:space="preserve">Bewege Repository Knoten</x:String>
408407
<x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">Wähle Vorgänger-Knoten für:</x:String>
409408
<x:String x:Key="Text.Name" xml:space="preserve">Name:</x:String>

‎src/Resources/Locales/en_US.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@
408408
<x:String x:Key="Text.Merge" xml:space="preserve">Merge Branch</x:String>
409409
<x:String x:Key="Text.Merge.Into" xml:space="preserve">Into:</x:String>
410410
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">Merge Option:</x:String>
411-
<x:String x:Key="Text.Merge.Source" xml:space="preserve">Source Branch:</x:String>
411+
<x:String x:Key="Text.Merge.Source" xml:space="preserve">Source:</x:String>
412412
<x:String x:Key="Text.MergeMultiple" xml:space="preserve">Merge (Multiple)</x:String>
413413
<x:String x:Key="Text.MergeMultiple.CommitChanges" xml:space="preserve">Commit all changes</x:String>
414414
<x:String x:Key="Text.MergeMultiple.Strategy" xml:space="preserve">Strategy:</x:String>

‎src/Resources/Locales/es_ES.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,6 @@
404404
<x:String x:Key="Text.Merge" xml:space="preserve">Merge Rama</x:String>
405405
<x:String x:Key="Text.Merge.Into" xml:space="preserve">En:</x:String>
406406
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">Opción de Merge:</x:String>
407-
<x:String x:Key="Text.Merge.Source" xml:space="preserve">Rama Fuente:</x:String>
408407
<x:String x:Key="Text.MoveRepositoryNode" xml:space="preserve">Mover Nodo del Repositorio</x:String>
409408
<x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">Seleccionar nodo padre para:</x:String>
410409
<x:String x:Key="Text.Name" xml:space="preserve">Nombre:</x:String>

‎src/Resources/Locales/fr_FR.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,6 @@
400400
<x:String x:Key="Text.Merge" xml:space="preserve">Merger la branche </x:String>
401401
<x:String x:Key="Text.Merge.Into" xml:space="preserve">Dans :</x:String>
402402
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">Option de merge:</x:String>
403-
<x:String x:Key="Text.Merge.Source" xml:space="preserve">Branche source :</x:String>
404403
<x:String x:Key="Text.MoveRepositoryNode" xml:space="preserve">Déplacer le noeud du repository</x:String>
405404
<x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">Sélectionnier le noeud parent pour :</x:String>
406405
<x:String x:Key="Text.Name" xml:space="preserve">Nom :</x:String>

‎src/Resources/Locales/it_IT.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,6 @@
403403
<x:String x:Key="Text.Merge" xml:space="preserve">Unisci Branch</x:String>
404404
<x:String x:Key="Text.Merge.Into" xml:space="preserve">In:</x:String>
405405
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">Opzione di Merge:</x:String>
406-
<x:String x:Key="Text.Merge.Source" xml:space="preserve">Branch Sorgente:</x:String>
407406
<x:String x:Key="Text.MoveRepositoryNode" xml:space="preserve">Sposta Nodo Repository</x:String>
408407
<x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">Seleziona nodo padre per:</x:String>
409408
<x:String x:Key="Text.Name" xml:space="preserve">Nome:</x:String>

‎src/Resources/Locales/pt_BR.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,6 @@
426426
<x:String x:Key="Text.Merge" xml:space="preserve">Mesclar Ramo</x:String>
427427
<x:String x:Key="Text.Merge.Into" xml:space="preserve">Para:</x:String>
428428
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">Opção de Mesclagem:</x:String>
429-
<x:String x:Key="Text.Merge.Source" xml:space="preserve">Ramo de Origem:</x:String>
430429
<x:String x:Key="Text.MoveRepositoryNode" xml:space="preserve">Mover nó do repositório</x:String>
431430
<x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">Selecionar nó pai para:</x:String>
432431
<x:String x:Key="Text.Name" xml:space="preserve">Nome:</x:String>

‎src/Resources/Locales/ru_RU.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,6 @@
406406
<x:String x:Key="Text.Merge" xml:space="preserve">Слить ветку</x:String>
407407
<x:String x:Key="Text.Merge.Into" xml:space="preserve">В:</x:String>
408408
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">Опции слияния:</x:String>
409-
<x:String x:Key="Text.Merge.Source" xml:space="preserve">Исходная ветка:</x:String>
410409
<x:String x:Key="Text.MoveRepositoryNode" xml:space="preserve">Переместить узел хранилища</x:String>
411410
<x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">Выбрать родительский узел для:</x:String>
412411
<x:String x:Key="Text.Name" xml:space="preserve">Имя:</x:String>

‎src/Resources/Locales/zh_CN.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@
411411
<x:String x:Key="Text.Merge" xml:space="preserve">合并分支</x:String>
412412
<x:String x:Key="Text.Merge.Into" xml:space="preserve">目标分支 ：</x:String>
413413
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">合并方式 ：</x:String>
414-
<x:String x:Key="Text.Merge.Source" xml:space="preserve">合并分支 ：</x:String>
414+
<x:String x:Key="Text.Merge.Source" xml:space="preserve">合并目标 ：</x:String>
415415
<x:String x:Key="Text.MergeMultiple" xml:space="preserve">合并（多目标）</x:String>
416416
<x:String x:Key="Text.MergeMultiple.CommitChanges" xml:space="preserve">提交变化</x:String>
417417
<x:String x:Key="Text.MergeMultiple.Strategy" xml:space="preserve">合并策略 ：</x:String>

‎src/Resources/Locales/zh_TW.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@
411411
<x:String x:Key="Text.Merge" xml:space="preserve">合併分支</x:String>
412412
<x:String x:Key="Text.Merge.Into" xml:space="preserve">目標分支:</x:String>
413413
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">合併方式:</x:String>
414-
<x:String x:Key="Text.Merge.Source" xml:space="preserve">合併分支:</x:String>
414+
<x:String x:Key="Text.Merge.Source" xml:space="preserve">合併目標:</x:String>
415415
<x:String x:Key="Text.MergeMultiple" xml:space="preserve">合併（多目標）</x:String>
416416
<x:String x:Key="Text.MergeMultiple.CommitChanges" xml:space="preserve">提交變更</x:String>
417417
<x:String x:Key="Text.MergeMultiple.Strategy" xml:space="preserve">合併策略:</x:String>

‎src/ViewModels/Histories.cs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -847,8 +847,13 @@ private void FillCurrentBranchMenu(ContextMenu menu, Models.Branch current)
847847
fastForward.IsEnabled = current.TrackStatus.Ahead.Count == 0;
848848
fastForward.Click += (_, e) =>
849849
{
850+
var b = _repo.Branches.Find(x => x.FriendlyName == upstream);
851+
if (b == null)
852+
return;
853+
850854
if (PopupHost.CanCreatePopup())
851-
PopupHost.ShowAndStartPopup(new Merge(_repo, upstream, current.Name));
855+
PopupHost.ShowAndStartPopup(new Merge(_repo, b, current.Name));
856+
852857
e.Handled = true;
853858
};
854859
submenu.Items.Add(fastForward);
@@ -943,7 +948,7 @@ private void FillOtherLocalBranchMenu(ContextMenu menu, Models.Branch branch, Mo
943948
merge.Click += (_, e) =>
944949
{
945950
if (PopupHost.CanCreatePopup())
946-
PopupHost.ShowPopup(new Merge(_repo, branch.Name, current.Name));
951+
PopupHost.ShowPopup(new Merge(_repo, branch, current.Name));
947952
e.Handled = true;
948953
};
949954
submenu.Items.Add(merge);
@@ -1027,7 +1032,7 @@ private void FillRemoteBranchMenu(ContextMenu menu, Models.Branch branch, Models
10271032
merge.Click += (_, e) =>
10281033
{
10291034
if (PopupHost.CanCreatePopup())
1030-
PopupHost.ShowPopup(new Merge(_repo, name, current.Name));
1035+
PopupHost.ShowPopup(new Merge(_repo, branch, current.Name));
10311036
e.Handled = true;
10321037
};
10331038

@@ -1086,7 +1091,7 @@ private void FillTagMenu(ContextMenu menu, Models.Tag tag, Models.Branch current
10861091
merge.Click += (_, e) =>
10871092
{
10881093
if (PopupHost.CanCreatePopup())
1089-
PopupHost.ShowPopup(new Merge(_repo, tag.Name, current.Name));
1094+
PopupHost.ShowPopup(new Merge(_repo, tag, current.Name));
10901095
e.Handled = true;
10911096
};
10921097
submenu.Items.Add(merge);

‎src/ViewModels/Merge.cs

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace SourceGit.ViewModels
55
{
66
public class Merge : Popup
77
{
8-
public string Source
8+
public object Source
99
{
1010
get;
1111
}
@@ -21,9 +21,22 @@ public Models.MergeMode SelectedMode
2121
set;
2222
}
2323

24-
public Merge(Repository repo, string source, string into)
24+
public Merge(Repository repo, Models.Branch source, string into)
2525
{
2626
_repo = repo;
27+
_sourceName = source.FriendlyName;
28+
29+
Source = source;
30+
Into = into;
31+
SelectedMode = AutoSelectMergeMode();
32+
View = new Views.Merge() { DataContext = this };
33+
}
34+
35+
public Merge(Repository repo, Models.Tag source, string into)
36+
{
37+
_repo = repo;
38+
_sourceName = source.Name;
39+
2740
Source = source;
2841
Into = into;
2942
SelectedMode = AutoSelectMergeMode();
@@ -33,11 +46,11 @@ public Merge(Repository repo, string source, string into)
3346
public override Task<bool> Sure()
3447
{
3548
_repo.SetWatcherEnabled(false);
36-
ProgressDescription = $"Merging '{Source}' into '{Into}' ...";
49+
ProgressDescription = $"Merging '{_sourceName}' into '{Into}' ...";
3750

3851
return Task.Run(() =>
3952
{
40-
var succ = new Commands.Merge(_repo.FullPath, Source, SelectedMode.Arg, SetProgressDescription).Exec();
53+
var succ = new Commands.Merge(_repo.FullPath, _sourceName, SelectedMode.Arg, SetProgressDescription).Exec();
4154
CallUIThread(() => _repo.SetWatcherEnabled(true));
4255
return succ;
4356
});
@@ -59,5 +72,6 @@ private Models.MergeMode AutoSelectMergeMode()
5972
}
6073

6174
private readonly Repository _repo = null;
75+
private readonly string _sourceName = string.Empty;
6276
}
6377
}

‎src/ViewModels/Repository.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1311,8 +1311,13 @@ public ContextMenu CreateContextMenuForLocalBranch(Models.Branch branch)
13111311
fastForward.IsEnabled = branch.TrackStatus.Ahead.Count == 0;
13121312
fastForward.Click += (_, e) =>
13131313
{
1314+
var b = _branches.Find(x => x.FriendlyName == upstream);
1315+
if (b == null)
1316+
return;
1317+
13141318
if (PopupHost.CanCreatePopup())
1315-
PopupHost.ShowAndStartPopup(new Merge(this, upstream, branch.Name));
1319+
PopupHost.ShowAndStartPopup(new Merge(this, b, branch.Name));
1320+
13161321
e.Handled = true;
13171322
};
13181323

@@ -1391,7 +1396,7 @@ public ContextMenu CreateContextMenuForLocalBranch(Models.Branch branch)
13911396
merge.Click += (_, e) =>
13921397
{
13931398
if (PopupHost.CanCreatePopup())
1394-
PopupHost.ShowPopup(new Merge(this, branch.Name, _currentBranch.Name));
1399+
PopupHost.ShowPopup(new Merge(this, branch, _currentBranch.Name));
13951400
e.Handled = true;
13961401
};
13971402

@@ -1687,7 +1692,7 @@ public ContextMenu CreateContextMenuForRemoteBranch(Models.Branch branch)
16871692
merge.Click += (_, e) =>
16881693
{
16891694
if (PopupHost.CanCreatePopup())
1690-
PopupHost.ShowPopup(new Merge(this, name, _currentBranch.Name));
1695+
PopupHost.ShowPopup(new Merge(this, branch, _currentBranch.Name));
16911696
e.Handled = true;
16921697
};
16931698

‎src/Views/Merge.axaml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,23 @@
1616
HorizontalAlignment="Right" VerticalAlignment="Center"
1717
Margin="0,0,8,0"
1818
Text="{DynamicResource Text.Merge.Source}"/>
19-
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Height="20" VerticalAlignment="Center">
20-
<Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
21-
<TextBlock Text="{Binding Source}"/>
22-
</StackPanel>
19+
<ContentControl Grid.Row="0" Grid.Column="1" Content="{Binding Source}">
20+
<ContentControl.DataTemplates>
21+
<DataTemplate DataType="m:Branch">
22+
<StackPanel Orientation="Horizontal">
23+
<Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
24+
<TextBlock VerticalAlignment="Center" Text="{Binding FriendlyName}" Margin="8,0,0,0"/>
25+
</StackPanel>
26+
</DataTemplate>
27+
28+
<DataTemplate DataType="m:Tag">
29+
<StackPanel Orientation="Horizontal">
30+
<Path Width="14" Height="14" Data="{StaticResource Icons.Tag}"/>
31+
<TextBlock VerticalAlignment="Center" Text="{Binding Name}" Margin="8,0,0,0"/>
32+
</StackPanel>
33+
</DataTemplate>
34+
</ContentControl.DataTemplates>
35+
</ContentControl>
2336

2437
<TextBlock Grid.Row="1" Grid.Column="0"
2538
HorizontalAlignment="Right" VerticalAlignment="Center"

0 commit comments

Comments
 (0)