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/merge_panel.go | |
| parent | 7d9aa97f9691dd0a8658c4b6626877a198c5d03c (diff) | |
type i18n
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index 736d969d7..e9d3626ed 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -244,7 +244,7 @@ func (gui *Gui) refreshMergePanel() error { return gui.refreshMainViews(refreshMainOpts{ main: &viewUpdateOpts{ - title: gui.Tr.SLocalize("MergeConflictsTitle"), + title: gui.Tr.MergeConflictsTitle, task: gui.createRenderStringWithoutScrollTask(content), noWrap: true, }, @@ -254,11 +254,11 @@ func (gui *Gui) refreshMergePanel() error { func (gui *Gui) catSelectedFile(g *gocui.Gui) (string, error) { item := gui.getSelectedFile() if item == nil { - return "", errors.New(gui.Tr.SLocalize("NoFilesDisplay")) + return "", errors.New(gui.Tr.NoFilesDisplay) } if item.Type != "file" { - return "", errors.New(gui.Tr.SLocalize("NotAFile")) + return "", errors.New(gui.Tr.NotAFile) } cat, err := gui.GitCommand.CatFile(item.Name) @@ -294,11 +294,11 @@ func (gui *Gui) getMergingOptions() map[string]string { keybindingConfig := gui.Config.GetUserConfig().Keybinding return map[string]string{ - fmt.Sprintf("%s %s", gui.getKeyDisplay(keybindingConfig.Universal.PrevItem), gui.getKeyDisplay(keybindingConfig.Universal.NextItem)): gui.Tr.SLocalize("selectHunk"), - fmt.Sprintf("%s %s", gui.getKeyDisplay(keybindingConfig.Universal.PrevBlock), gui.getKeyDisplay(keybindingConfig.Universal.NextBlock)): gui.Tr.SLocalize("navigateConflicts"), - gui.getKeyDisplay(keybindingConfig.Universal.Select): gui.Tr.SLocalize("pickHunk"), - gui.getKeyDisplay(keybindingConfig.Main.PickBothHunks): gui.Tr.SLocalize("pickBothHunks"), - gui.getKeyDisplay(keybindingConfig.Universal.Undo): gui.Tr.SLocalize("undo"), + fmt.Sprintf("%s %s", gui.getKeyDisplay(keybindingConfig.Universal.PrevItem), gui.getKeyDisplay(keybindingConfig.Universal.NextItem)): gui.Tr.LcSelectHunk, + fmt.Sprintf("%s %s", gui.getKeyDisplay(keybindingConfig.Universal.PrevBlock), gui.getKeyDisplay(keybindingConfig.Universal.NextBlock)): gui.Tr.LcNavigateConflicts, + gui.getKeyDisplay(keybindingConfig.Universal.Select): gui.Tr.LcPickHunk, + gui.getKeyDisplay(keybindingConfig.Main.PickBothHunks): gui.Tr.LcPickBothHunks, + gui.getKeyDisplay(keybindingConfig.Universal.Undo): gui.Tr.LcUndo, } } @@ -342,7 +342,7 @@ func (gui *Gui) promptToContinue() error { return gui.ask(askOpts{ title: "continue", - prompt: gui.Tr.SLocalize("ConflictsResolved"), + prompt: gui.Tr.ConflictsResolved, handlersManageFocus: true, handleConfirm: func() error { if err := gui.switchContext(gui.Contexts.Files.Context); err != nil { |