Convert some messages to use ngettext().

petere · petere · commit c697337c766e · 2009-05-21T01:08:43.000Z
Author: Euler Taveira de Oliveira &lt;euler@timbira.com&gt;
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -12,7 +12,7 @@
  *	by PostgreSQL
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.535 2009/04/08 19:02:37 heikki Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.536 2009/05/21 01:08:43 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -7728,7 +7728,9 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "query returned %d rows instead of one: %s\n",
+		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
+								 "query returned %d rows instead of one: %s\n",
+								 ntups),
 				  ntups, query->data);
 		exit_nicely();
 	}
@@ -7976,7 +7978,9 @@ convertTSFunction(Oid funcOid)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "query returned %d rows instead of one: %s\n",
+		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
+								 "query returned %d rows instead of one: %s\n",
+								 ntups),
 				  ntups, query);
 		exit_nicely();
 	}
@@ -8080,7 +8084,9 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "query returned %d rows instead of one: %s\n",
+		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
+								 "query returned %d rows instead of one: %s\n",
+								 ntups),
 				  ntups, query->data);
 		exit_nicely();
 	}
@@ -8459,7 +8465,9 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "query returned %d rows instead of one: %s\n",
+		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
+								 "query returned %d rows instead of one: %s\n",
+								 ntups),
 				  ntups, query->data);
 		exit_nicely();
 	}
@@ -8633,7 +8641,9 @@ dumpConversion(Archive *fout, ConvInfo *convinfo)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "query returned %d rows instead of one: %s\n",
+		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
+								 "query returned %d rows instead of one: %s\n",
+								 ntups),
 				  ntups, query->data);
 		exit_nicely();
 	}
@@ -8828,7 +8838,9 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "query returned %d rows instead of one: %s\n",
+		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
+								 "query returned %d rows instead of one: %s\n",
+								 ntups),
 				  ntups, query->data);
 		exit_nicely();
 	}
@@ -9053,7 +9065,9 @@ dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "query returned %d rows instead of one: %s\n",
+		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
+								 "query returned %d rows instead of one: %s\n",
+								 ntups),
 				  ntups, query->data);
 		exit_nicely();
 	}
@@ -9206,7 +9220,9 @@ dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "query returned %d rows instead of one: %s\n",
+		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
+								 "query returned %d rows instead of one: %s\n",
+								 ntups),
 				  ntups, query->data);
 		exit_nicely();
 	}
@@ -9390,7 +9406,9 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "query returned %d rows instead of one: %s\n",
+		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
+								 "query returned %d rows instead of one: %s\n",
+								 ntups),
 				  ntups, query->data);
 		exit_nicely();
 	}
@@ -11244,7 +11262,9 @@ getFormattedTypeName(Oid oid, OidOptions opts)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "query returned %d rows instead of one: %s\n",
+		write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",
+								 "query returned %d rows instead of one: %s\n",
+								 ntups),
 				  ntups, query->data);
 		exit_nicely();
 	}

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* by PostgreSQL`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.535 2009/04/08 19:02:37 heikki Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.536 2009/05/21 01:08:43 petere Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -7728,7 +7728,9 @@ dumpOpr(Archive fout, OprInfo oprinfo)`
`7728`	`7728`	`ntups = PQntuples(res);`
`7729`	`7729`	`if (ntups != 1)`
`7730`	`7730`	`{`
`7731`		`- write_msg(NULL, "query returned %d rows instead of one: %s\n",`
	`7731`	`+ write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",`
	`7732`	`+ "query returned %d rows instead of one: %s\n",`
	`7733`	`+ ntups),`
`7732`	`7734`	`ntups, query->data);`
`7733`	`7735`	`exit_nicely();`
`7734`	`7736`	`}`
`@@ -7976,7 +7978,9 @@ convertTSFunction(Oid funcOid)`
`7976`	`7978`	`ntups = PQntuples(res);`
`7977`	`7979`	`if (ntups != 1)`
`7978`	`7980`	`{`
`7979`		`- write_msg(NULL, "query returned %d rows instead of one: %s\n",`
	`7981`	`+ write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",`
	`7982`	`+ "query returned %d rows instead of one: %s\n",`
	`7983`	`+ ntups),`
`7980`	`7984`	`ntups, query);`
`7981`	`7985`	`exit_nicely();`
`7982`	`7986`	`}`
`@@ -8080,7 +8084,9 @@ dumpOpclass(Archive fout, OpclassInfo opcinfo)`
`8080`	`8084`	`ntups = PQntuples(res);`
`8081`	`8085`	`if (ntups != 1)`
`8082`	`8086`	`{`
`8083`		`- write_msg(NULL, "query returned %d rows instead of one: %s\n",`
	`8087`	`+ write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",`
	`8088`	`+ "query returned %d rows instead of one: %s\n",`
	`8089`	`+ ntups),`
`8084`	`8090`	`ntups, query->data);`
`8085`	`8091`	`exit_nicely();`
`8086`	`8092`	`}`
`@@ -8459,7 +8465,9 @@ dumpOpfamily(Archive fout, OpfamilyInfo opfinfo)`
`8459`	`8465`	`ntups = PQntuples(res);`
`8460`	`8466`	`if (ntups != 1)`
`8461`	`8467`	`{`
`8462`		`- write_msg(NULL, "query returned %d rows instead of one: %s\n",`
	`8468`	`+ write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",`
	`8469`	`+ "query returned %d rows instead of one: %s\n",`
	`8470`	`+ ntups),`
`8463`	`8471`	`ntups, query->data);`
`8464`	`8472`	`exit_nicely();`
`8465`	`8473`	`}`
`@@ -8633,7 +8641,9 @@ dumpConversion(Archive fout, ConvInfo convinfo)`
`8633`	`8641`	`ntups = PQntuples(res);`
`8634`	`8642`	`if (ntups != 1)`
`8635`	`8643`	`{`
`8636`		`- write_msg(NULL, "query returned %d rows instead of one: %s\n",`
	`8644`	`+ write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",`
	`8645`	`+ "query returned %d rows instead of one: %s\n",`
	`8646`	`+ ntups),`
`8637`	`8647`	`ntups, query->data);`
`8638`	`8648`	`exit_nicely();`
`8639`	`8649`	`}`
`@@ -8828,7 +8838,9 @@ dumpAgg(Archive fout, AggInfo agginfo)`
`8828`	`8838`	`ntups = PQntuples(res);`
`8829`	`8839`	`if (ntups != 1)`
`8830`	`8840`	`{`
`8831`		`- write_msg(NULL, "query returned %d rows instead of one: %s\n",`
	`8841`	`+ write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",`
	`8842`	`+ "query returned %d rows instead of one: %s\n",`
	`8843`	`+ ntups),`
`8832`	`8844`	`ntups, query->data);`
`8833`	`8845`	`exit_nicely();`
`8834`	`8846`	`}`
`@@ -9053,7 +9065,9 @@ dumpTSDictionary(Archive fout, TSDictInfo dictinfo)`
`9053`	`9065`	`ntups = PQntuples(res);`
`9054`	`9066`	`if (ntups != 1)`
`9055`	`9067`	`{`
`9056`		`- write_msg(NULL, "query returned %d rows instead of one: %s\n",`
	`9068`	`+ write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",`
	`9069`	`+ "query returned %d rows instead of one: %s\n",`
	`9070`	`+ ntups),`
`9057`	`9071`	`ntups, query->data);`
`9058`	`9072`	`exit_nicely();`
`9059`	`9073`	`}`
`@@ -9206,7 +9220,9 @@ dumpTSConfig(Archive fout, TSConfigInfo cfginfo)`
`9206`	`9220`	`ntups = PQntuples(res);`
`9207`	`9221`	`if (ntups != 1)`
`9208`	`9222`	`{`
`9209`		`- write_msg(NULL, "query returned %d rows instead of one: %s\n",`
	`9223`	`+ write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",`
	`9224`	`+ "query returned %d rows instead of one: %s\n",`
	`9225`	`+ ntups),`
`9210`	`9226`	`ntups, query->data);`
`9211`	`9227`	`exit_nicely();`
`9212`	`9228`	`}`
`@@ -9390,7 +9406,9 @@ dumpForeignServer(Archive fout, ForeignServerInfo srvinfo)`
`9390`	`9406`	`ntups = PQntuples(res);`
`9391`	`9407`	`if (ntups != 1)`
`9392`	`9408`	`{`
`9393`		`- write_msg(NULL, "query returned %d rows instead of one: %s\n",`
	`9409`	`+ write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",`
	`9410`	`+ "query returned %d rows instead of one: %s\n",`
	`9411`	`+ ntups),`
`9394`	`9412`	`ntups, query->data);`
`9395`	`9413`	`exit_nicely();`
`9396`	`9414`	`}`
`@@ -11244,7 +11262,9 @@ getFormattedTypeName(Oid oid, OidOptions opts)`
`11244`	`11262`	`ntups = PQntuples(res);`
`11245`	`11263`	`if (ntups != 1)`
`11246`	`11264`	`{`
`11247`		`- write_msg(NULL, "query returned %d rows instead of one: %s\n",`
	`11265`	`+ write_msg(NULL, ngettext("query returned %d row instead of one: %s\n",`
	`11266`	`+ "query returned %d rows instead of one: %s\n",`
	`11267`	`+ ntups),`
`11248`	`11268`	`ntups, query->data);`
`11249`	`11269`	`exit_nicely();`
`11250`	`11270`	`}`