diff options
| author | Bruce Momjian <bruce@momjian.us> | 2005-02-22 04:43:23 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2005-02-22 04:43:23 +0000 |
| commit | 0542b1e2fee5fe7c7fa1a83fa9fe81618b2bc69e (patch) | |
| tree | eb42bea6234c92d377cb52257855b4b882120e78 /src/pl | |
| parent | 64011b4dce7db05bd7bb1911fe81fcc8f2da75e1 (diff) | |
| download | postgresql-0542b1e2fee5fe7c7fa1a83fa9fe81618b2bc69e.tar.gz | |
Use _() macro consistently rather than gettext(). Add translation
macros around strings that were missing them.
Diffstat (limited to 'src/pl')
| -rw-r--r-- | src/pl/plperl/SPI.xs | 2 | ||||
| -rw-r--r-- | src/pl/plperl/plperl.c | 4 | ||||
| -rw-r--r-- | src/pl/plperl/spi_internal.c | 2 | ||||
| -rw-r--r-- | src/pl/plpgsql/src/pl_exec.c | 4 |
4 files changed, 9 insertions, 3 deletions
diff --git a/src/pl/plperl/SPI.xs b/src/pl/plperl/SPI.xs index 7e71e77ade..de28459eba 100644 --- a/src/pl/plperl/SPI.xs +++ b/src/pl/plperl/SPI.xs @@ -1,5 +1,7 @@ /* this must be first: */ #include "postgres.h" +/* Defined by Perl */ +#undef _(x) /* perl stuff */ #include "EXTERN.h" diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index 2167f3f548..75d04ff5a1 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -33,11 +33,13 @@ * ENHANCEMENTS, OR MODIFICATIONS. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.67 2005/01/14 16:25:42 tgl Exp $ + * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.68 2005/02/22 04:42:44 momjian Exp $ * **********************************************************************/ #include "postgres.h" +/* Defined by Perl */ +#undef _(x) /* system stuff */ #include <ctype.h> diff --git a/src/pl/plperl/spi_internal.c b/src/pl/plperl/spi_internal.c index 390e76a7e7..7e26c5d505 100644 --- a/src/pl/plperl/spi_internal.c +++ b/src/pl/plperl/spi_internal.c @@ -5,6 +5,8 @@ */ #include "postgres.h" +/* Defined by Perl */ +#undef _(x) #include "spi_internal.h" diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index 1f3d4c4ab2..096f22b1d9 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -3,7 +3,7 @@ * procedural language * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.128 2005/02/01 19:35:14 tgl Exp $ + * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.129 2005/02/22 04:43:07 momjian Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -746,7 +746,7 @@ plpgsql_exec_error_callback(void *arg) */ errcontext("PL/pgSQL function \"%s\" %s", estate->err_func->fn_name, - gettext(estate->err_text)); + _(estate->err_text)); } else errcontext("PL/pgSQL function \"%s\"", |