From 7c87c21fa0e38cce1c9cc7779d0f957704d6845e Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Thu, 11 Jul 2019 23:15:40 +1000 Subject: [PATCH] show y/n options on confirmation panels --- pkg/gui/confirmation_panel.go | 8 ++++++++ pkg/gui/options_menu_panel.go | 2 +- pkg/gui/view_helpers.go | 2 ++ pkg/i18n/dutch.go | 4 ++-- pkg/i18n/english.go | 10 ++++++++-- pkg/i18n/german.go | 4 ++-- pkg/i18n/polish.go | 4 ++-- pkg/i18n/turkish.go | 4 ++-- 8 files changed, 27 insertions(+), 11 deletions(-) diff --git a/pkg/gui/confirmation_panel.go b/pkg/gui/confirmation_panel.go index fc3605d5..64753b74 100644 --- a/pkg/gui/confirmation_panel.go +++ b/pkg/gui/confirmation_panel.go @@ -168,3 +168,11 @@ func (gui *Gui) createSpecificErrorPanel(message string, nextView *gocui.View, w func (gui *Gui) createErrorPanel(g *gocui.Gui, message string) error { return gui.createSpecificErrorPanel(message, g.CurrentView(), true) } + +func (gui *Gui) renderConfirmationOptions() error { + optionsMap := map[string]string{ + "n/esc": gui.Tr.No, + "y/enter": gui.Tr.Yes, + } + return gui.renderOptionsMap(optionsMap) +} diff --git a/pkg/gui/options_menu_panel.go b/pkg/gui/options_menu_panel.go index 7f071076..5a548187 100644 --- a/pkg/gui/options_menu_panel.go +++ b/pkg/gui/options_menu_panel.go @@ -55,7 +55,7 @@ func (gui *Gui) getBindings(v *gocui.View) []*Binding { } func (gui *Gui) handleCreateOptionsMenu(g *gocui.Gui, v *gocui.View) error { - if v.Name() == "menu" { + if v.Name() == "menu" || v.Name() == "confirmation" { return nil } diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go index d661a9d9..797012b7 100644 --- a/pkg/gui/view_helpers.go +++ b/pkg/gui/view_helpers.go @@ -314,6 +314,8 @@ func (gui *Gui) renderPanelOptions() error { switch currentView.Name() { case "menu": return gui.renderMenuOptions() + case "confirmation": + return gui.renderConfirmationOptions() } return gui.renderGlobalOptions() } diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go index b5d642e7..5a2b5cdd 100644 --- a/pkg/i18n/dutch.go +++ b/pkg/i18n/dutch.go @@ -53,7 +53,7 @@ func dutchSet() TranslationSet { RunCustomCommand: "draai een vooraf bedacht aangepaste opdracht", AnonymousReportingTitle: "Help mee met lazydocker beter maken", - AnonymousReportingPrompt: "Zou je anonieme data rapportage willen aanzetten om lazydocker beter te kunnen maken? (enter/esc)", + AnonymousReportingPrompt: "Zou je anonieme data rapportage willen aanzetten om lazydocker beter te kunnen maken?", GlobalTitle: "Globaal", MainTitle: "Hooft", @@ -84,7 +84,7 @@ func dutchSet() TranslationSet { ConfirmPruneImages: "Weet je zeker dat je alle niet gebruikte images wil vernietigen?", ConfirmPruneContainers: "Weet je zeker dat je alle niet gestopte containers wil vernietigen?", ConfirmPruneVolumes: "Weet je zeker dat je alle niet gebruikte volumes wil vernietigen?", - StopService: "Weet je zeker dat je deze service zijn containers wil stoppen (enter/esc)?", + StopService: "Weet je zeker dat je deze service zijn containers wil stoppen?", StopContainer: "Weet je zeker dat je deze container wil stoppen?", PressEnterToReturn: "Druk op enter om terug te gaan naar lazydocker (Deze popup kan uit gezet worden door in de config dit neer te zetten `gui.returnImmediately: true`)", } diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 54384549..3c2fc413 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -81,6 +81,9 @@ type TranslationSet struct { StatsTitle string CreditsTitle string ContainerConfigTitle string + + No string + Yes string } func englishSet() TranslationSet { @@ -136,7 +139,7 @@ func englishSet() TranslationSet { RunCustomCommand: "run predefined custom command", AnonymousReportingTitle: "Help make lazydocker better", - AnonymousReportingPrompt: "Would you like to enable anonymous reporting data to help improve lazydocker? (enter/esc)", + AnonymousReportingPrompt: "Would you like to enable anonymous reporting data to help improve lazydocker?", GlobalTitle: "Global", MainTitle: "Main", @@ -167,8 +170,11 @@ func englishSet() TranslationSet { ConfirmPruneImages: "Are you sure you want to prune all unused images?", ConfirmPruneContainers: "Are you sure you want to prune all stopped containers?", ConfirmPruneVolumes: "Are you sure you want to prune all unused volumes?", - StopService: "Are you sure you want to stop this service's containers? (enter/esc)", + StopService: "Are you sure you want to stop this service's containers?", StopContainer: "Are you sure you want to stop this container?", PressEnterToReturn: "Press enter to return to lazydocker (this prompt can be disabled in your config by setting `gui.returnImmediately: true`)", + + No: "no", + Yes: "yes", } } diff --git a/pkg/i18n/german.go b/pkg/i18n/german.go index c8086a8a..c843018a 100644 --- a/pkg/i18n/german.go +++ b/pkg/i18n/german.go @@ -52,7 +52,7 @@ func germanSet() TranslationSet { RunCustomCommand: "führe vordefinierten benutzerdefinierten Befehl aus", AnonymousReportingTitle: "Mache dabei mit lazydocker besser zu machen", - AnonymousReportingPrompt: "Möchtest du anonymiserte Datensammlung erlauben, um zu helfen lazydocker zu erbessern? (enter/esc)", + AnonymousReportingPrompt: "Möchtest du anonymiserte Datensammlung erlauben, um zu helfen lazydocker zu erbessern?", GlobalTitle: "Global", MainTitle: "Haupt", @@ -83,7 +83,7 @@ func germanSet() TranslationSet { ConfirmPruneImages: "Bist du dir sicher, dass du alle unbenutzten Images entfernen möchtest?", ConfirmPruneContainers: "Bist du dir sicher, dass du alle angehaltenen Container entfernen möchtes?", ConfirmPruneVolumes: "Bist du dir sicher, dass du alle unbenutzen Volumen entfernen möchtest?", - StopService: "Bist du dir sicher, dass du den Dienst dieses Containers anhalten möchtest? (enter/esc)", + StopService: "Bist du dir sicher, dass du den Dienst dieses Containers anhalten möchtest?", StopContainer: "Bist du dir sicher, dass du den Container anhalten möchtest?", PressEnterToReturn: "Drücke Eingabe um zu lazydocker zurück zu kehren. (Diese Nachfrage kann in Deiner Konfiguration deaktiviert werden, indem du folgenden Wert setzt: `gui.returnImmediately: true`)", } diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go index 27ed144a..b2d46fc0 100644 --- a/pkg/i18n/polish.go +++ b/pkg/i18n/polish.go @@ -52,7 +52,7 @@ func polishSet() TranslationSet { RunCustomCommand: "wykonaj predefiniowaną własną komende", AnonymousReportingTitle: "Pomóż czynić lazydocker lepszym", - AnonymousReportingPrompt: "Czy zechciałbyś włączyć anonimowe raportowanie danych w celu ulepszania programu? (enter/esc)", + AnonymousReportingPrompt: "Czy zechciałbyś włączyć anonimowe raportowanie danych w celu ulepszania programu?", GlobalTitle: "Globalne", MainTitle: "Główne", @@ -83,7 +83,7 @@ func polishSet() TranslationSet { ConfirmPruneImages: "Na pewno wyczyścić wszystkie nieużywane obrazy?", ConfirmPruneContainers: "Na pewno wyczyścić wszystkie nieuruchomione kontenery?", ConfirmPruneVolumes: "Na pewno wyczyścić wszystkie nieużywane wolumeny?", - StopService: "Na pewno zatrzymać kontenery tego serwisu? (enter/esc)", + StopService: "Na pewno zatrzymać kontenery tego serwisu?", StopContainer: "Na pewno zatrzymać ten kontener?", PressEnterToReturn: "Wciśnij enter aby powrócić do lazydockera (ten komunikat może być wyłączony w konfiguracji poprzez ustawienie `gui.returnImmediately: true`)", } diff --git a/pkg/i18n/turkish.go b/pkg/i18n/turkish.go index de5d6e52..24dbd6be 100644 --- a/pkg/i18n/turkish.go +++ b/pkg/i18n/turkish.go @@ -52,7 +52,7 @@ func turkishSet() TranslationSet { RunCustomCommand: "önceden tanımlanmış özel komutu çalıştır", AnonymousReportingTitle: "lazydocker' ı daha iyi hale getirmeye yardımcı olun", - AnonymousReportingPrompt: "lazydocker'ın geliştirilmesine yardımcı olmak için anonim raporlama verilerini etkinleştirmek ister misiniz? (enter/esc)", + AnonymousReportingPrompt: "lazydocker'ın geliştirilmesine yardımcı olmak için anonim raporlama verilerini etkinleştirmek ister misiniz?", GlobalTitle: "Global", MainTitle: "Ana", @@ -83,7 +83,7 @@ func turkishSet() TranslationSet { ConfirmPruneImages: "Kullanılmayan tüm görüntüleri temizlemek istediğinize emin misiniz?", ConfirmPruneContainers: "Durdurulan tüm konteynerları temizlemek istediğinizden emin misiniz?", ConfirmPruneVolumes: "Kullanılmayan tüm alanları temizlemek istediğinizden emin misiniz?", - StopService: "Bu servisin konteynerlerini durdurmak istediğinize emin misiniz? (enter/esc)", + StopService: "Bu servisin konteynerlerini durdurmak istediğinize emin misiniz?", StopContainer: "Bu konteyneri durdurmak istediğinize emin misiniz?", PressEnterToReturn: "lazydocker' a geri dönmek için enter tuşuna basın ( Bu uyarı, `gui.return Immediately: true` ayarıyla devre dışı bırakılabilir)", }