psql: Add missing file to nls.mk

petere · petere · commit d8c2dccfdb94 · 2016-06-07T10:58:46.000-04:00
crosstabview.c was not added to nls.mk when it was added.  Also remove
redundant gettext markers, since psql_error() is already registered as a
gettext keyword.
diff --git a/src/bin/psql/crosstabview.c b/src/bin/psql/crosstabview.c
@@ -122,13 +122,13 @@ PrintResultsInCrosstab(const PGresult *res)
 
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		psql_error(_("\\crosstabview: query must return results to be shown in crosstab\n"));
+		psql_error("\\crosstabview: query must return results to be shown in crosstab\n");
 		goto error_return;
 	}
 
 	if (PQnfields(res) < 3)
 	{
-		psql_error(_("\\crosstabview: query must return at least three columns\n"));
+		psql_error("\\crosstabview: query must return at least three columns\n");
 		goto error_return;
 	}
 
@@ -155,7 +155,7 @@ PrintResultsInCrosstab(const PGresult *res)
 	/* Insist that header columns be distinct */
 	if (field_for_columns == field_for_rows)
 	{
-		psql_error(_("\\crosstabview: vertical and horizontal headers must be different columns\n"));
+		psql_error("\\crosstabview: vertical and horizontal headers must be different columns\n");
 		goto error_return;
 	}
 
@@ -171,7 +171,7 @@ PrintResultsInCrosstab(const PGresult *res)
 		 */
 		if (PQnfields(res) != 3)
 		{
-			psql_error(_("\\crosstabview: data column must be specified when query returns more than three columns\n"));
+			psql_error("\\crosstabview: data column must be specified when query returns more than three columns\n");
 			goto error_return;
 		}
 
@@ -227,7 +227,7 @@ PrintResultsInCrosstab(const PGresult *res)
 
 		if (piv_columns.count > CROSSTABVIEW_MAX_COLUMNS)
 		{
-			psql_error(_("\\crosstabview: maximum number of columns (%d) exceeded\n"),
+			psql_error("\\crosstabview: maximum number of columns (%d) exceeded\n",
 					   CROSSTABVIEW_MAX_COLUMNS);
 			goto error_return;
 		}
@@ -395,7 +395,7 @@ printCrosstab(const PGresult *results,
 			 */
 			if (cont.cells[idx] != NULL)
 			{
-				psql_error(_("\\crosstabview: query result contains multiple data values for row \"%s\", column \"%s\"\n"),
+				psql_error("\\crosstabview: query result contains multiple data values for row \"%s\", column \"%s\"\n",
 							 piv_rows[row_number].name ? piv_rows[row_number].name :
 							 popt.nullPrint ? popt.nullPrint : "(null)",
 							 piv_columns[col_number].name ? piv_columns[col_number].name :
@@ -643,7 +643,7 @@ indexOfColumn(char *arg, const PGresult *res)
 		idx = atoi(arg) - 1;
 		if (idx < 0 || idx >= PQnfields(res))
 		{
-			psql_error(_("\\crosstabview: invalid column number: \"%s\"\n"), arg);
+			psql_error("\\crosstabview: invalid column number: \"%s\"\n", arg);
 			return -1;
 		}
 	}
@@ -667,15 +667,15 @@ indexOfColumn(char *arg, const PGresult *res)
 				if (idx >= 0)
 				{
 					/* another idx was already found for the same name */
-					psql_error(_("\\crosstabview: ambiguous column name: \"%s\"\n"), arg);
+					psql_error("\\crosstabview: ambiguous column name: \"%s\"\n", arg);
 					return -1;
 				}
 				idx = i;
 			}
 		}
 		if (idx == -1)
 		{
-			psql_error(_("\\crosstabview: column name not found: \"%s\"\n"), arg);
+			psql_error("\\crosstabview: column name not found: \"%s\"\n", arg);
 			return -1;
 		}
 	}
diff --git a/src/bin/psql/nls.mk b/src/bin/psql/nls.mk
@@ -1,7 +1,7 @@
 # src/bin/psql/nls.mk
 CATALOG_NAME     = psql
 AVAIL_LANGUAGES  = cs de es fr it ja pl pt_BR ru zh_CN zh_TW
-GETTEXT_FILES    = command.c common.c copy.c help.c input.c large_obj.c \
+GETTEXT_FILES    = command.c common.c copy.c crosstabview.c help.c input.c large_obj.c \
                    mainloop.c psqlscanslash.c startup.c \
                    describe.c sql_help.h sql_help.c \
                    tab-complete.c variables.c \

Original file line number	Diff line number	Diff line change
`@@ -122,13 +122,13 @@ PrintResultsInCrosstab(const PGresult *res)`
`122`	`122`
`123`	`123`	`if (PQresultStatus(res) != PGRES_TUPLES_OK)`
`124`	`124`	`{`
`125`		`- psql_error(_("\\crosstabview: query must return results to be shown in crosstab\n"));`
	`125`	`+ psql_error("\\crosstabview: query must return results to be shown in crosstab\n");`
`126`	`126`	`goto error_return;`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`if (PQnfields(res) < 3)`
`130`	`130`	`{`
`131`		`- psql_error(_("\\crosstabview: query must return at least three columns\n"));`
	`131`	`+ psql_error("\\crosstabview: query must return at least three columns\n");`
`132`	`132`	`goto error_return;`
`133`	`133`	`}`
`134`	`134`
`@@ -155,7 +155,7 @@ PrintResultsInCrosstab(const PGresult *res)`
`155`	`155`	`/* Insist that header columns be distinct */`
`156`	`156`	`if (field_for_columns == field_for_rows)`
`157`	`157`	`{`
`158`		`- psql_error(_("\\crosstabview: vertical and horizontal headers must be different columns\n"));`
	`158`	`+ psql_error("\\crosstabview: vertical and horizontal headers must be different columns\n");`
`159`	`159`	`goto error_return;`
`160`	`160`	`}`
`161`	`161`
`@@ -171,7 +171,7 @@ PrintResultsInCrosstab(const PGresult *res)`
`171`	`171`	`*/`
`172`	`172`	`if (PQnfields(res) != 3)`
`173`	`173`	`{`
`174`		`- psql_error(_("\\crosstabview: data column must be specified when query returns more than three columns\n"));`
	`174`	`+ psql_error("\\crosstabview: data column must be specified when query returns more than three columns\n");`
`175`	`175`	`goto error_return;`
`176`	`176`	`}`
`177`	`177`
`@@ -227,7 +227,7 @@ PrintResultsInCrosstab(const PGresult *res)`
`227`	`227`
`228`	`228`	`if (piv_columns.count > CROSSTABVIEW_MAX_COLUMNS)`
`229`	`229`	`{`
`230`		`- psql_error(_("\\crosstabview: maximum number of columns (%d) exceeded\n"),`
	`230`	`+ psql_error("\\crosstabview: maximum number of columns (%d) exceeded\n",`
`231`	`231`	`CROSSTABVIEW_MAX_COLUMNS);`
`232`	`232`	`goto error_return;`
`233`	`233`	`}`
`@@ -395,7 +395,7 @@ printCrosstab(const PGresult *results,`
`395`	`395`	`*/`
`396`	`396`	`if (cont.cells[idx] != NULL)`
`397`	`397`	`{`
`398`		`- psql_error(_("\\crosstabview: query result contains multiple data values for row \"%s\", column \"%s\"\n"),`
	`398`	`+ psql_error("\\crosstabview: query result contains multiple data values for row \"%s\", column \"%s\"\n",`
`399`	`399`	`piv_rows[row_number].name ? piv_rows[row_number].name :`
`400`	`400`	`popt.nullPrint ? popt.nullPrint : "(null)",`
`401`	`401`	`piv_columns[col_number].name ? piv_columns[col_number].name :`
`@@ -643,7 +643,7 @@ indexOfColumn(char arg, const PGresult res)`
`643`	`643`	`idx = atoi(arg) - 1;`
`644`	`644`	`if (idx < 0 \|\| idx >= PQnfields(res))`
`645`	`645`	`{`
`646`		`- psql_error(_("\\crosstabview: invalid column number: \"%s\"\n"), arg);`
	`646`	`+ psql_error("\\crosstabview: invalid column number: \"%s\"\n", arg);`
`647`	`647`	`return -1;`
`648`	`648`	`}`
`649`	`649`	`}`
`@@ -667,15 +667,15 @@ indexOfColumn(char arg, const PGresult res)`
`667`	`667`	`if (idx >= 0)`
`668`	`668`	`{`
`669`	`669`	`/* another idx was already found for the same name */`
`670`		`- psql_error(_("\\crosstabview: ambiguous column name: \"%s\"\n"), arg);`
	`670`	`+ psql_error("\\crosstabview: ambiguous column name: \"%s\"\n", arg);`
`671`	`671`	`return -1;`
`672`	`672`	`}`
`673`	`673`	`idx = i;`
`674`	`674`	`}`
`675`	`675`	`}`
`676`	`676`	`if (idx == -1)`
`677`	`677`	`{`
`678`		`- psql_error(_("\\crosstabview: column name not found: \"%s\"\n"), arg);`
	`678`	`+ psql_error("\\crosstabview: column name not found: \"%s\"\n", arg);`
`679`	`679`	`return -1;`
`680`	`680`	`}`
`681`	`681`	`}`