From 8606dd81905a004eda74f0bfa0a9c9c18a488725 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Tue, 15 Jan 2013 22:21:03 +0200 Subject: [PATCH] Make \? help message more clear when not connected. On second thought, "none" could mislead to think that you're connected a database with that name. Duplicate the whole string, so that it can be more easily translated. In back-branches, thought, just use an empty string in place of the database name, to avoid adding a translatable string. --- src/bin/psql/help.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index ef36583db8..fd7effa87b 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -164,8 +164,6 @@ slashUsage(unsigned short int pager) char *currdb; currdb = PQdb(pset.db); - if (currdb == NULL) - currdb = _("none"); output = PageOutput(94, pager); @@ -257,9 +255,13 @@ slashUsage(unsigned short int pager) fprintf(output, "\n"); fprintf(output, _("Connection\n")); - fprintf(output, _(" \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n" - " connect to new database (currently \"%s\")\n"), - currdb); + if (currdb) + fprintf(output, _(" \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n" + " connect to new database (currently \"%s\")\n"), + currdb); + else + fprintf(output, _(" \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n" + " connect to new database (currently no connection)\n")), fprintf(output, _(" \\encoding [ENCODING] show or set client encoding\n")); fprintf(output, _(" \\password [USERNAME] securely change the password for a user\n")); fprintf(output, _(" \\conninfo display information about current connection\n")); -- 2.40.0