From 02ca7be416db8d83a62536acddb94d486d3633fe Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Fri, 18 Jan 2019 23:40:52 +0100 Subject: [PATCH] functions/_.fish: Use ggetext if available It turns out the default gettext on the sunny operating system with the many names interprets at least `\n` itself, so we'd end up swallowing it. This allows us to move past the interactive tests and onto the expect ones. See #5472. --- share/functions/_.fish | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/share/functions/_.fish b/share/functions/_.fish index 3c58a73bc..ee4e25b37 100644 --- a/share/functions/_.fish +++ b/share/functions/_.fish @@ -1,7 +1,16 @@ # # Alias for gettext or a fallback if gettext isn't installed. # -if command -sq gettext +# Use ggettext if available. +# This is the case on OpenIndiana, where the default gettext +# interprets `\n` itself, so +# printf (_ 'somemessage\n') +# won't print a newline. +if command -sq ggettext + function _ --description "Alias for the ggettext command" + command ggettext fish $argv + end +else if command -sq gettext function _ --description "Alias for the gettext command" command gettext fish $argv end