Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitd8c2dcc

Browse files
committed
psql: Add missing file to nls.mk
crosstabview.c was not added to nls.mk when it was added. Also removeredundant gettext markers, since psql_error() is already registered as agettext keyword.
1 parent552346c commitd8c2dcc

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

‎src/bin/psql/crosstabview.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,13 @@ PrintResultsInCrosstab(const PGresult *res)
122122

123123
if (PQresultStatus(res)!=PGRES_TUPLES_OK)
124124
{
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");
126126
gotoerror_return;
127127
}
128128

129129
if (PQnfields(res)<3)
130130
{
131-
psql_error(_("\\crosstabview: query must return at least three columns\n"));
131+
psql_error("\\crosstabview: query must return at least three columns\n");
132132
gotoerror_return;
133133
}
134134

@@ -155,7 +155,7 @@ PrintResultsInCrosstab(const PGresult *res)
155155
/* Insist that header columns be distinct */
156156
if (field_for_columns==field_for_rows)
157157
{
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");
159159
gotoerror_return;
160160
}
161161

@@ -171,7 +171,7 @@ PrintResultsInCrosstab(const PGresult *res)
171171
*/
172172
if (PQnfields(res)!=3)
173173
{
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");
175175
gotoerror_return;
176176
}
177177

@@ -227,7 +227,7 @@ PrintResultsInCrosstab(const PGresult *res)
227227

228228
if (piv_columns.count>CROSSTABVIEW_MAX_COLUMNS)
229229
{
230-
psql_error(_("\\crosstabview: maximum number of columns (%d) exceeded\n"),
230+
psql_error("\\crosstabview: maximum number of columns (%d) exceeded\n",
231231
CROSSTABVIEW_MAX_COLUMNS);
232232
gotoerror_return;
233233
}
@@ -395,7 +395,7 @@ printCrosstab(const PGresult *results,
395395
*/
396396
if (cont.cells[idx]!=NULL)
397397
{
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",
399399
piv_rows[row_number].name ?piv_rows[row_number].name :
400400
popt.nullPrint ?popt.nullPrint :"(null)",
401401
piv_columns[col_number].name ?piv_columns[col_number].name :
@@ -643,7 +643,7 @@ indexOfColumn(char *arg, const PGresult *res)
643643
idx=atoi(arg)-1;
644644
if (idx<0||idx >=PQnfields(res))
645645
{
646-
psql_error(_("\\crosstabview: invalid column number: \"%s\"\n"),arg);
646+
psql_error("\\crosstabview: invalid column number: \"%s\"\n",arg);
647647
return-1;
648648
}
649649
}
@@ -667,15 +667,15 @@ indexOfColumn(char *arg, const PGresult *res)
667667
if (idx >=0)
668668
{
669669
/* 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);
671671
return-1;
672672
}
673673
idx=i;
674674
}
675675
}
676676
if (idx==-1)
677677
{
678-
psql_error(_("\\crosstabview: column name not found: \"%s\"\n"),arg);
678+
psql_error("\\crosstabview: column name not found: \"%s\"\n",arg);
679679
return-1;
680680
}
681681
}

‎src/bin/psql/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# src/bin/psql/nls.mk
22
CATALOG_NAME = psql
33
AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru zh_CN zh_TW
4-
GETTEXT_FILES = command.c common.c copy.c help.c input.c large_obj.c\
4+
GETTEXT_FILES = command.c common.c copy.ccrosstabview.chelp.c input.c large_obj.c\
55
mainloop.c psqlscanslash.c startup.c\
66
describe.c sql_help.h sql_help.c\
77
tab-complete.c variables.c\

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp