Arrange that the string "syntax error" generated by bison is translated.

petere · petere · commit 0465c52b00ee · 2009-06-10T23:11:52.000Z
diff --git a/src/interfaces/ecpg/preproc/ecpg.header b/src/interfaces/ecpg/preproc/ecpg.header
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.header,v 1.6 2009/06/03 20:24:51 tgl Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.header,v 1.7 2009/06/10 23:11:52 petere Exp $ */
 
 /* Copyright comment */
 %{
@@ -22,6 +22,12 @@
  */
 #define base_yylex filtered_base_yylex
 
+/*
+ * This is only here so the string gets into the POT.  Bison uses it
+ * internally.
+ */
+#define bison_gettext_dummy gettext_noop("syntax error")
+
 /*
  * Variables containing simple states.
  */
diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.8 2009/06/03 20:24:51 tgl Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.9 2009/06/10 23:11:52 petere Exp $ */
 
 statements: /*EMPTY*/
                 | statements statement
@@ -1987,8 +1987,9 @@ ecpg_into: INTO into_list	{ $$ = EMPTY; }
 
 void base_yyerror(const char *error)
 {
+	/* translator: %s is typically the translation of "syntax error" */
 	mmerror(PARSE_ERROR, ET_ERROR, "%s at or near \"%s\"",
-			error, token_start ? token_start : yytext);
+			_(error), token_start ? token_start : yytext);
 }
 
 void parser_init(void)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.8 2009/06/03 20:24:51 tgl Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.9 2009/06/10 23:11:52 petere Exp $ */`
`2`	`2`
`3`	`3`	`statements: /EMPTY/`
`4`	`4`	`\| statements statement`
`@@ -1987,8 +1987,9 @@ ecpg_into: INTO into_list { $$ = EMPTY; }`
`1987`	`1987`
`1988`	`1988`	`void base_yyerror(const char *error)`
`1989`	`1989`	`{`
	`1990`	`+ /* translator: %s is typically the translation of "syntax error" */`
`1990`	`1991`	`mmerror(PARSE_ERROR, ET_ERROR, "%s at or near \"%s\"",`
`1991`		`- error, token_start ? token_start : yytext);`
	`1992`	`+ _(error), token_start ? token_start : yytext);`
`1992`	`1993`	`}`
`1993`	`1994`
`1994`	`1995`	`void parser_init(void)`