From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Tue, 15 Jan 2013 20:09:41 +0000 (+0200)
Subject: On second thought, use an empty string instead of "none" when not connected.
X-Git-Tag: REL8_4_16~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94b6458c10cd2f0c41f0561a562811ff4b05e2e5;p=postgresql

On second thought, use an empty string instead of "none" when not connected.

"none" could mislead to think that you're connected a database with that
name. Also, it needs to be translated, which might be hard without some
context. So in back-branches, use empty string, so that the message is
(currently ""), which is at least unambiguous and doens't require
translation. In master, it's no problem to add translatable strings, so use
a different fix there.
---

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 12ea5fdac0..68ffba7fac 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -165,7 +165,7 @@ slashUsage(unsigned short int pager)
 
 	currdb = PQdb(pset.db);
 	if (currdb == NULL)
-		currdb = _("none");
+		currdb = "";
 
 	output = PageOutput(86, pager);