go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-06 08:59:31 +02:00
Code Issues Releases Activity

Merge branch 'master' into custom-keybindings

Browse Source
This commit is contained in:
David Chen
2020-01-04 08:12:36 +00:00
committed by GitHub
parent f99a200db0 96ca7262e4
commit 86b101c410
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/gui/keybindings.go
View File

@@ -421,6 +421,13 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Handler: gui.handleCreateRebaseOptionsMenu,
Description: gui.Tr.SLocalize("ViewMergeRebaseOptions"),
},
{
ViewName: "",
Key: gui.getKey("universal.createPatchOptionsMenu"),
Modifier: gocui.ModNone,
Handler: gui.handleCreatePatchOptionsMenu,
Description: gui.Tr.SLocalize("ViewPatchOptions"),
},
{
ViewName: "",
Key: gui.getKey("universal.pushFiles"),
@@ -460,12 +467,6 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Modifier: gocui.ModNone,
Handler: gui.handleCreateOptionsMenu,
},
{
ViewName: "",
Key: gui.getKey("universal.createPatchOptionsMenu"),
Modifier: gocui.ModNone,
Handler: gui.handleCreatePatchOptionsMenu,
},
{
ViewName: "status",
Key: gui.getKey("universal.edit"),

3
pkg/i18n/english.go
View File

@@ -822,6 +822,9 @@ func addEnglish(i18nObject *i18n.Bundle) error {
}, &i18n.Message{
ID: "toggleAddToPatch",
Other: "toggle file included in patch",
}, &i18n.Message{
ID: "ViewPatchOptions",
Other: "view custom patch options",
}, &i18n.Message{
ID: "PatchOptionsTitle",
Other: "Patch Options",