Mark 3rd argument of validate_tupdesc_compat() for translation, instead of

petere · petere · commit 1d6b681ed398 · 2009-02-17T12:51:59.000Z
marking up each instance separately.
diff --git a/src/pl/plpgsql/src/nls.mk b/src/pl/plpgsql/src/nls.mk
@@ -1,8 +1,8 @@
-# $PostgreSQL: pgsql/src/pl/plpgsql/src/nls.mk,v 1.3 2009/02/17 09:24:57 petere Exp $
+# $PostgreSQL: pgsql/src/pl/plpgsql/src/nls.mk,v 1.4 2009/02/17 12:51:59 petere Exp $
 CATALOG_NAME	:= plpgsql
 AVAIL_LANGUAGES	:= es
 GETTEXT_FILES	:= pl_comp.c pl_exec.c pl_gram.c pl_funcs.c pl_handler.c pl_scan.c
-GETTEXT_TRIGGERS:= _ errmsg errdetail errdetail_log errhint errcontext yyerror
+GETTEXT_TRIGGERS:= _ errmsg errdetail errdetail_log errhint errcontext validate_tupdesc_compat:3 yyerror
 
 .PHONY: gettext-files
 gettext-files: distprep
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.232 2009/02/05 15:25:49 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.233 2009/02/17 12:51:59 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -387,8 +387,7 @@ plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo)
 				case TYPEFUNC_COMPOSITE:
 					/* got the expected result rowtype, now check it */
 					validate_tupdesc_compat(tupdesc, estate.rettupdesc,
-											gettext_noop("returned record type does "
-														 "not match expected record type"));
+											"returned record type does not match expected record type");
 					break;
 				case TYPEFUNC_RECORD:
 
@@ -707,8 +706,7 @@ plpgsql_exec_trigger(PLpgSQL_function *func,
 	{
 		validate_tupdesc_compat(trigdata->tg_relation->rd_att,
 								estate.rettupdesc,
-								gettext_noop("returned tuple structure does "
-											 "not match table of trigger event"));
+								"returned tuple structure does not match table of trigger event");
 		/* Copy tuple to upper executor memory */
 		rettup = SPI_copytuple((HeapTuple) DatumGetPointer(estate.retval));
 	}
@@ -2201,8 +2199,7 @@ exec_stmt_return_next(PLpgSQL_execstate *estate,
 						   errdetail("The tuple structure of a not-yet-assigned"
 									 " record is indeterminate.")));
 					validate_tupdesc_compat(tupdesc, rec->tupdesc,
-						                    gettext_noop("wrong record type supplied "
-														 "in RETURN NEXT"));
+						                    "wrong record type supplied in RETURN NEXT");
 					tuple = rec->tup;
 				}
 				break;
@@ -2310,8 +2307,7 @@ exec_stmt_return_query(PLpgSQL_execstate *estate,
 	}
 
 	validate_tupdesc_compat(estate->rettupdesc, portal->tupDesc,
-							gettext_noop("structure of query does not match "
-										 "function result type"));
+							"structure of query does not match function result type");
 
 	while (true)
 	{

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.232 2009/02/05 15:25:49 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.233 2009/02/17 12:51:59 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -387,8 +387,7 @@ plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo)`
`387`	`387`	`case TYPEFUNC_COMPOSITE:`
`388`	`388`	`/* got the expected result rowtype, now check it */`
`389`	`389`	`validate_tupdesc_compat(tupdesc, estate.rettupdesc,`
`390`		`- gettext_noop("returned record type does "`
`391`		`- "not match expected record type"));`
	`390`	`+ "returned record type does not match expected record type");`
`392`	`391`	`break;`
`393`	`392`	`case TYPEFUNC_RECORD:`
`394`	`393`
`@@ -707,8 +706,7 @@ plpgsql_exec_trigger(PLpgSQL_function *func,`
`707`	`706`	`{`
`708`	`707`	`validate_tupdesc_compat(trigdata->tg_relation->rd_att,`
`709`	`708`	`estate.rettupdesc,`
`710`		`- gettext_noop("returned tuple structure does "`
`711`		`- "not match table of trigger event"));`
	`709`	`+ "returned tuple structure does not match table of trigger event");`
`712`	`710`	`/* Copy tuple to upper executor memory */`
`713`	`711`	`rettup = SPI_copytuple((HeapTuple) DatumGetPointer(estate.retval));`
`714`	`712`	`}`
`@@ -2201,8 +2199,7 @@ exec_stmt_return_next(PLpgSQL_execstate *estate,`
`2201`	`2199`	`errdetail("The tuple structure of a not-yet-assigned"`
`2202`	`2200`	`" record is indeterminate.")));`
`2203`	`2201`	`validate_tupdesc_compat(tupdesc, rec->tupdesc,`
`2204`		`- gettext_noop("wrong record type supplied "`
`2205`		`- "in RETURN NEXT"));`
	`2202`	`+ "wrong record type supplied in RETURN NEXT");`
`2206`	`2203`	`tuple = rec->tup;`
`2207`	`2204`	`}`
`2208`	`2205`	`break;`
`@@ -2310,8 +2307,7 @@ exec_stmt_return_query(PLpgSQL_execstate *estate,`
`2310`	`2307`	`}`
`2311`	`2308`
`2312`	`2309`	`validate_tupdesc_compat(estate->rettupdesc, portal->tupDesc,`
`2313`		`- gettext_noop("structure of query does not match "`
`2314`		`- "function result type"));`
	`2310`	`+ "structure of query does not match function result type");`
`2315`	`2311`
`2316`	`2312`	`while (true)`
`2317`	`2313`	`{`