mirror of
https://github.com/postgres/postgres.git
synced 2025-06-14 18:42:34 +03:00
Gettext plural support
In the backend, I changed only a handful of exemplary or important-looking instances to make use of the plural support; there is probably more work there. For the rest of the source, this should cover all relevant cases.
This commit is contained in:
@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.241 2009/01/09 15:46:10 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.242 2009/03/26 22:26:06 petere Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -616,7 +616,9 @@ ExecEvalVar(ExprState *exprstate, ExprContext *econtext,
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_DATATYPE_MISMATCH),
|
||||
errmsg("table row type and query-specified row type do not match"),
|
||||
errdetail("Table row contains %d attributes, but query expects %d.",
|
||||
errdetail(ngettext("Table row contains %d attribute, but query expects %d.",
|
||||
"Table row contains %d attributes, but query expects %d.",
|
||||
slot_tupdesc->natts),
|
||||
slot_tupdesc->natts, var_tupdesc->natts)));
|
||||
else if (var_tupdesc->natts < slot_tupdesc->natts)
|
||||
needslow = true;
|
||||
@ -1041,7 +1043,9 @@ init_fcache(Oid foid, FuncExprState *fcache,
|
||||
if (list_length(fcache->args) > FUNC_MAX_ARGS)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_TOO_MANY_ARGUMENTS),
|
||||
errmsg("cannot pass more than %d arguments to a function",
|
||||
errmsg(ngettext("cannot pass more than %d argument to a function",
|
||||
"cannot pass more than %d arguments to a function",
|
||||
FUNC_MAX_ARGS),
|
||||
FUNC_MAX_ARGS)));
|
||||
|
||||
/* Set up the primary fmgr lookup information */
|
||||
@ -1310,7 +1314,9 @@ tupledesc_match(TupleDesc dst_tupdesc, TupleDesc src_tupdesc)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_DATATYPE_MISMATCH),
|
||||
errmsg("function return row and query-specified return row do not match"),
|
||||
errdetail("Returned row contains %d attributes, but query expects %d.",
|
||||
errdetail(ngettext("Returned row contains %d attribute, but query expects %d.",
|
||||
"Returned row contains %d attributes, but query expects %d.",
|
||||
src_tupdesc->natts),
|
||||
src_tupdesc->natts, dst_tupdesc->natts)));
|
||||
|
||||
for (i = 0; i < dst_tupdesc->natts; i++)
|
||||
|
Reference in New Issue
Block a user