mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-12 18:34:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

psql: Add missing file to nls.mk

Browse Source 
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.
This commit is contained in:
Peter Eisentraut 2016-06-07 10:58:46 -04:00
parent 552346c550
commit d8c2dccfdb
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/bin/psql/crosstabview.c
View File

@ -122,13 +122,13 @@ PrintResultsInCrosstab(const PGresult *res)
if (PQresultStatus(res) != PGRES_TUPLES_OK) 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; goto error_return;
} }
if (PQnfields(res) < 3) 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; goto error_return;
} }
@ -155,7 +155,7 @@ PrintResultsInCrosstab(const PGresult *res)
/* Insist that header columns be distinct */ /* Insist that header columns be distinct */
if (field_for_columns == field_for_rows) 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; goto error_return;
} }
@ -171,7 +171,7 @@ PrintResultsInCrosstab(const PGresult *res)
*/ */
if (PQnfields(res) != 3) 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; goto error_return;
} }
@ -227,7 +227,7 @@ PrintResultsInCrosstab(const PGresult *res)
if (piv_columns.count > CROSSTABVIEW_MAX_COLUMNS) 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); CROSSTABVIEW_MAX_COLUMNS);
goto error_return; goto error_return;
} }
@ -395,7 +395,7 @@ printCrosstab(const PGresult *results,
*/ */
if (cont.cells[idx] != NULL) 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 : piv_rows[row_number].name ? piv_rows[row_number].name :
popt.nullPrint ? popt.nullPrint : "(null)", popt.nullPrint ? popt.nullPrint : "(null)",
piv_columns[col_number].name ? piv_columns[col_number].name : piv_columns[col_number].name ? piv_columns[col_number].name :
@ -643,7 +643,7 @@ indexOfColumn(char *arg, const PGresult *res)
idx = atoi(arg) - 1; idx = atoi(arg) - 1;
if (idx < 0 || idx >= PQnfields(res)) 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; return -1;
} }
} }
@ -667,7 +667,7 @@ indexOfColumn(char *arg, const PGresult *res)
if (idx >= 0) if (idx >= 0)
{ {
/* another idx was already found for the same name */ /* 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; return -1;
} }
idx = i; idx = i;
@ -675,7 +675,7 @@ indexOfColumn(char *arg, const PGresult *res)
} }
if (idx == -1) 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; return -1;
} }
} }

2
src/bin/psql/nls.mk
View File

@ -1,7 +1,7 @@
# src/bin/psql/nls.mk # src/bin/psql/nls.mk
CATALOG_NAME = psql CATALOG_NAME = psql
AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru zh_CN zh_TW 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 \ mainloop.c psqlscanslash.c startup.c \
describe.c sql_help.h sql_help.c \ describe.c sql_help.h sql_help.c \
tab-complete.c variables.c \ tab-complete.c variables.c \