diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-10-04 11:00:48 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-10-10 00:23:01 +1100 |
| commit | 37bb89dac33cb4236bf817e1e2e09cb1cbfade5c (patch) | |
| tree | ea06fa4595a7f2d7eff80c2602648b18450f5988 /pkg/gui/rebase_options_panel.go | |
| parent | 7d9aa97f9691dd0a8658c4b6626877a198c5d03c (diff) | |
type i18n
Diffstat (limited to 'pkg/gui/rebase_options_panel.go')
| -rw-r--r-- | pkg/gui/rebase_options_panel.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/gui/rebase_options_panel.go b/pkg/gui/rebase_options_panel.go index b8fc1d8a2..f36ea77ab 100644 --- a/pkg/gui/rebase_options_panel.go +++ b/pkg/gui/rebase_options_panel.go @@ -26,9 +26,9 @@ func (gui *Gui) handleCreateRebaseOptionsMenu() error { var title string if gui.GitCommand.WorkingTreeState() == "merging" { - title = gui.Tr.SLocalize("MergeOptionsTitle") + title = gui.Tr.MergeOptionsTitle } else { - title = gui.Tr.SLocalize("RebaseOptionsTitle") + title = gui.Tr.RebaseOptionsTitle } return gui.createMenu(title, menuItems, createMenuOptions{showCancel: true}) @@ -38,7 +38,7 @@ func (gui *Gui) genericMergeCommand(command string) error { status := gui.GitCommand.WorkingTreeState() if status != "merging" && status != "rebasing" { - return gui.createErrorPanel(gui.Tr.SLocalize("NotMergingOrRebasing")) + return gui.createErrorPanel(gui.Tr.NotMergingOrRebasing) } commandType := strings.Replace(status, "ing", "e", 1) @@ -77,8 +77,8 @@ func (gui *Gui) handleGenericMergeCommandResult(result error) error { return nil } else if strings.Contains(result.Error(), "When you have resolved this problem") || strings.Contains(result.Error(), "fix conflicts") || strings.Contains(result.Error(), "Resolve all conflicts manually") { return gui.ask(askOpts{ - title: gui.Tr.SLocalize("FoundConflictsTitle"), - prompt: gui.Tr.SLocalize("FoundConflicts"), + title: gui.Tr.FoundConflictsTitle, + prompt: gui.Tr.FoundConflicts, handlersManageFocus: true, handleConfirm: func() error { return gui.switchContext(gui.Contexts.Files.Context) |