Commit 8606dd81 authored by Heikki Linnakangas's avatar Heikki Linnakangas

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.
parent b04ce529
...@@ -164,8 +164,6 @@ slashUsage(unsigned short int pager) ...@@ -164,8 +164,6 @@ slashUsage(unsigned short int pager)
char *currdb; char *currdb;
currdb = PQdb(pset.db); currdb = PQdb(pset.db);
if (currdb == NULL)
currdb = _("none");
output = PageOutput(94, pager); output = PageOutput(94, pager);
...@@ -257,9 +255,13 @@ slashUsage(unsigned short int pager) ...@@ -257,9 +255,13 @@ slashUsage(unsigned short int pager)
fprintf(output, "\n"); fprintf(output, "\n");
fprintf(output, _("Connection\n")); fprintf(output, _("Connection\n"));
fprintf(output, _(" \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n" if (currdb)
" connect to new database (currently \"%s\")\n"), fprintf(output, _(" \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
currdb); " 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, _(" \\encoding [ENCODING] show or set client encoding\n"));
fprintf(output, _(" \\password [USERNAME] securely change the password for a user\n")); fprintf(output, _(" \\password [USERNAME] securely change the password for a user\n"));
fprintf(output, _(" \\conninfo display information about current connection\n")); fprintf(output, _(" \\conninfo display information about current connection\n"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment