Cleanup up psql \connect and \pset pager setting display, Dennis

bmomjian · bmomjian · commit 51b2b6433b33 · 2003-03-10T15:46:03.000Z
Bj?rklund.
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000-2002 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.90 2003/02/19 04:04:04 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.91 2003/03/10 15:46:01 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "command.h"
@@ -1899,11 +1899,11 @@ do_pset(const char *param, const char *value, printQueryOpt *popt, bool quiet)
 		if (!quiet)
 		{
 			if (popt->topt.pager == 1)
-				puts(gettext("Using pager is on."));
+				puts(gettext("Pager is on (for long output)."));
 			else if (popt->topt.pager == 2)
-				puts(gettext("Using pager is always."));
+				puts(gettext("Pager is always (used)."));
 			else
-				puts(gettext("Using pager is off."));
+				puts(gettext("Pager is off."));
 		}
 	}
 
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.69 2003/01/07 20:56:07 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.70 2003/03/10 15:46:03 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -173,7 +173,7 @@ slashUsage(unsigned short int pager)
 	 */
 	fprintf(output, _("General\n"));
 	fprintf(output, _("  \\c[onnect] [DBNAME|- [USER]]\n"
-					  "                connect to new database (currently \"%s\")\n"),
+					  "                 connect to new database (currently \"%s\")\n"),
 			PQdb(pset.db));
 	fprintf(output, _("  \\cd [DIR]      change the current working directory\n"));
 	fprintf(output, _("  \\copyright     show PostgreSQL usage and distribution terms\n"));

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000-2002 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.90 2003/02/19 04:04:04 momjian Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.91 2003/03/10 15:46:01 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`	`#include "command.h"`
`@@ -1899,11 +1899,11 @@ do_pset(const char param, const char value, printQueryOpt *popt, bool quiet)`
`1899`	`1899`	`if (!quiet)`
`1900`	`1900`	`{`
`1901`	`1901`	`if (popt->topt.pager == 1)`
`1902`		`- puts(gettext("Using pager is on."));`
	`1902`	`+ puts(gettext("Pager is on (for long output)."));`
`1903`	`1903`	`else if (popt->topt.pager == 2)`
`1904`		`- puts(gettext("Using pager is always."));`
	`1904`	`+ puts(gettext("Pager is always (used)."));`
`1905`	`1905`	`else`
`1906`		`- puts(gettext("Using pager is off."));`
	`1906`	`+ puts(gettext("Pager is off."));`
`1907`	`1907`	`}`
`1908`	`1908`	`}`
`1909`	`1909`