diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/utils/init/miscinit.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/mb/mbutils.c | 33 |
2 files changed, 22 insertions, 15 deletions
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index b4b87b6f10a..30ecbd3779e 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.172 2009/01/05 13:57:12 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.173 2009/03/08 16:07:12 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -30,6 +30,7 @@ #endif #include "catalog/pg_authid.h" +#include "mb/pg_wchar.h" #include "miscadmin.h" #include "postmaster/autovacuum.h" #include "storage/fd.h" @@ -1241,6 +1242,7 @@ pg_bindtextdomain(const char *domain) get_locale_path(my_exec_path, locale_path); bindtextdomain(domain, locale_path); + pg_bind_textdomain_codeset(domain, GetDatabaseEncoding()); } #endif } diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c index f5ba80d101d..cf6e5d0824f 100644 --- a/src/backend/utils/mb/mbutils.c +++ b/src/backend/utils/mb/mbutils.c @@ -4,7 +4,7 @@ * (currently mule internal code (mic) is used) * Tatsuo Ishii * - * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.79 2009/03/02 15:10:09 teodor Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.80 2009/03/08 16:07:12 alvherre Exp $ */ #include "postgres.h" @@ -891,22 +891,27 @@ SetDatabaseEncoding(int encoding) DatabaseEncoding = &pg_enc2name_tbl[encoding]; Assert(DatabaseEncoding->encoding == encoding); - /* - * On Windows, we need to explicitly bind gettext to the correct - * encoding, because gettext() tends to get confused. - */ + pg_bind_textdomain_codeset(textdomain(NULL), encoding); +} + +/* + * On Windows, we need to explicitly bind gettext to the correct + * encoding, because gettext() tends to get confused. + */ +void +pg_bind_textdomain_codeset(const char *domainname, int encoding) +{ #if defined(ENABLE_NLS) && defined(WIN32) - { - int i; + int i; - for (i = 0; i < sizeof(codeset_map_array) / sizeof(codeset_map_array[0]); i++) + for (i = 0; i < lengthof(codeset_map_array); i++) + { + if (codeset_map_array[i].encoding == encoding) { - if (codeset_map_array[i].encoding == encoding) - { - if (bind_textdomain_codeset(textdomain(NULL), codeset_map_array[i].codeset) == NULL) - elog(LOG, "bind_textdomain_codeset failed"); - break; - } + if (bind_textdomain_codeset(domainname, + codeset_map_array[i].codeset) == NULL) + elog(LOG, "bind_textdomain_codeset failed"); + break; } } #endif |