From 4cfd1fc897f8f9264c66119246c1cd641d403114 Mon Sep 17 00:00:00 2001 From: Christian Rocha Date: Thu, 16 Jul 2020 15:41:16 -0400 Subject: [PATCH] Better error view language depending on whether error is fatal --- ui/stash.go | 2 +- ui/ui.go | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ui/stash.go b/ui/stash.go index bf6aa00..4e01ade 100644 --- a/ui/stash.go +++ b/ui/stash.go @@ -443,7 +443,7 @@ func stashUpdate(msg tea.Msg, m stashModel) (stashModel, tea.Cmd) { func stashView(m stashModel) string { if m.showError { - return errorView(m.err) + return errorView(m.err, false) } var s string diff --git a/ui/ui.go b/ui/ui.go index 02dbc96..114a68a 100644 --- a/ui/ui.go +++ b/ui/ui.go @@ -323,7 +323,7 @@ func view(mdl tea.Model) string { } if m.fatalErr != nil { - return errorView(m.fatalErr) + return errorView(m.fatalErr, true) } var s string @@ -338,14 +338,20 @@ func view(mdl tea.Model) string { return "\n" + indent(s, 2) } -func errorView(err error) string { +func errorView(err error, fatal bool) string { + exitMsg := "press any key to " + if fatal { + exitMsg += "exit" + } else { + exitMsg += "return" + } s := fmt.Sprintf("%s\n\n%v\n\n%s", te.String(" ERROR "). Foreground(common.Cream.Color()). Background(common.Red.Color()). String(), err, - common.Subtle("Press any key to exit"), + common.Subtle(exitMsg), ) return "\n" + indent(s, 3) }