From 9ad6181420742fc26dd725867797e5b65513423a Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sat, 18 May 2019 23:01:10 +1000
Subject: [PATCH] more progress

---
 pkg/gui/containers_panel.go |  4 ++--
 pkg/gui/keybindings.go      | 45 ++++++++++++++++++++-----------------
 pkg/gui/view_helpers.go     |  2 +-
 pkg/i18n/english.go         | 20 +++++++++++++++++
 4 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/pkg/gui/containers_panel.go b/pkg/gui/containers_panel.go
index a8638ac7..9b24c88d 100644
--- a/pkg/gui/containers_panel.go
+++ b/pkg/gui/containers_panel.go
@@ -272,7 +272,7 @@ func (gui *Gui) handleContainersPrevContext(g *gocui.Gui, v *gocui.View) error {
 		gui.State.Panels.Containers.ContextIndex++
 	}
 
-	gui.handleContainerSelect(gui.g, v, true)
+	gui.handleContainerSelect(gui.g, v, false)
 
 	return nil
 }
@@ -285,7 +285,7 @@ func (gui *Gui) handleContainersNextContext(g *gocui.Gui, v *gocui.View) error {
 		gui.State.Panels.Containers.ContextIndex--
 	}
 
-	gui.handleContainerSelect(gui.g, v, true)
+	gui.handleContainerSelect(gui.g, v, false)
 
 	return nil
 }
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
index d8ccde71..5521baee 100644
--- a/pkg/gui/keybindings.go
+++ b/pkg/gui/keybindings.go
@@ -139,33 +139,38 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Modifier: gocui.ModNone,
 			Handler:  gui.handleDonate,
 		}, {
-			ViewName: "containers",
-			Key:      '[',
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleContainersPrevContext,
+			ViewName:    "containers",
+			Key:         '[',
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleContainersPrevContext,
+			Description: gui.Tr.SLocalize("previousContext"),
 		}, {
-			ViewName: "containers",
-			Key:      ']',
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleContainersNextContext,
+			ViewName:    "containers",
+			Key:         ']',
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleContainersNextContext,
+			Description: gui.Tr.SLocalize("nextContext"),
 		},
 		{
-			ViewName: "containers",
-			Key:      'd',
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleContainersRemoveMenu,
+			ViewName:    "containers",
+			Key:         'd',
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleContainersRemoveMenu,
+			Description: gui.Tr.SLocalize("removeContainer"),
 		},
 		{
-			ViewName: "containers",
-			Key:      's',
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleContainerStop,
+			ViewName:    "containers",
+			Key:         's',
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleContainerStop,
+			Description: gui.Tr.SLocalize("stopContainer"),
 		},
 		{
-			ViewName: "containers",
-			Key:      'r',
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleContainerRestart,
+			ViewName:    "containers",
+			Key:         'r',
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleContainerRestart,
+			Description: gui.Tr.SLocalize("restartContainer"),
 		},
 	}
 
diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go
index dd098bb5..6be81f32 100644
--- a/pkg/gui/view_helpers.go
+++ b/pkg/gui/view_helpers.go
@@ -74,7 +74,7 @@ func (gui *Gui) newLineFocused(g *gocui.Gui, v *gocui.View) error {
 	case "status":
 		return gui.handleStatusSelect(g, v)
 	case "containers":
-		return gui.handleContainerSelect(g, v, false)
+		return gui.handleContainerSelect(g, v, true)
 	case "confirmation":
 		return nil
 	case "main":
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index c1e8d6d8..433df208 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -786,5 +786,25 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 			ID:    "RestartingStatus",
 			Other: "restarting",
 		},
+		&i18n.Message{
+			ID:    "removeContainer",
+			Other: "remove container",
+		},
+		&i18n.Message{
+			ID:    "stopContainer",
+			Other: "stop container",
+		},
+		&i18n.Message{
+			ID:    "restartContainer",
+			Other: "restart container",
+		},
+		&i18n.Message{
+			ID:    "previousContext",
+			Other: "previous context",
+		},
+		&i18n.Message{
+			ID:    "nextContext",
+			Other: "next context",
+		},
 	)
 }