Skip to content

P
Postgres FD Implementation
Commit c697337c authored by Peter Eisentraut's avatar Peter Eisentraut
Browse files
Options

Convert some messages to use ngettext(). 

Author: Euler Taveira de Oliveira <euler@timbira.com>
parent 65ffbbf1
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 11 deletions
src/bin/pg_dump/pg_dump.c
View file @ c697337c
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* by PostgreSQL * by PostgreSQL
* *
* IDENTIFICATION * 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) ...@@ -7728,7 +7728,9 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
ntups = PQntuples(res); ntups = PQntuples(res);
if (ntups != 1) 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); ntups, query->data);
exit_nicely(); exit_nicely();
} }
...@@ -7976,7 +7978,9 @@ convertTSFunction(Oid funcOid) ...@@ -7976,7 +7978,9 @@ convertTSFunction(Oid funcOid)
ntups = PQntuples(res); ntups = PQntuples(res);
if (ntups != 1) 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); ntups, query);
exit_nicely(); exit_nicely();
} }
...@@ -8080,7 +8084,9 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo) ...@@ -8080,7 +8084,9 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
ntups = PQntuples(res); ntups = PQntuples(res);
if (ntups != 1) 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); ntups, query->data);
exit_nicely(); exit_nicely();
} }
...@@ -8459,7 +8465,9 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo) ...@@ -8459,7 +8465,9 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
ntups = PQntuples(res); ntups = PQntuples(res);
if (ntups != 1) 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); ntups, query->data);
exit_nicely(); exit_nicely();
} }
...@@ -8633,7 +8641,9 @@ dumpConversion(Archive *fout, ConvInfo *convinfo) ...@@ -8633,7 +8641,9 @@ dumpConversion(Archive *fout, ConvInfo *convinfo)
ntups = PQntuples(res); ntups = PQntuples(res);
if (ntups != 1) 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); ntups, query->data);
exit_nicely(); exit_nicely();
} }
...@@ -8828,7 +8838,9 @@ dumpAgg(Archive *fout, AggInfo *agginfo) ...@@ -8828,7 +8838,9 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
ntups = PQntuples(res); ntups = PQntuples(res);
if (ntups != 1) 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); ntups, query->data);
exit_nicely(); exit_nicely();
} }
...@@ -9053,7 +9065,9 @@ dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo) ...@@ -9053,7 +9065,9 @@ dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo)
ntups = PQntuples(res); ntups = PQntuples(res);
if (ntups != 1) 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); ntups, query->data);
exit_nicely(); exit_nicely();
} }
...@@ -9206,7 +9220,9 @@ dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo) ...@@ -9206,7 +9220,9 @@ dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo)
ntups = PQntuples(res); ntups = PQntuples(res);
if (ntups != 1) 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); ntups, query->data);
exit_nicely(); exit_nicely();
} }
...@@ -9390,7 +9406,9 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo) ...@@ -9390,7 +9406,9 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo)
ntups = PQntuples(res); ntups = PQntuples(res);
if (ntups != 1) 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); ntups, query->data);
exit_nicely(); exit_nicely();
} }
...@@ -11244,7 +11262,9 @@ getFormattedTypeName(Oid oid, OidOptions opts) ...@@ -11244,7 +11262,9 @@ getFormattedTypeName(Oid oid, OidOptions opts)
ntups = PQntuples(res); ntups = PQntuples(res);
if (ntups != 1) 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); ntups, query->data);
exit_nicely(); exit_nicely();
} }
......
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