mirror of
https://github.com/postgres/postgres.git
synced 2025-07-30 11:03:19 +03:00
Append major version number and for libraries soname major version number
to the gettext domain name, to simplify parallel installations. Also, rename set_text_domain() to pg_bindtextdomain(), because that is what it does.
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.43 2008/11/01 19:53:35 meskes Exp $ */
|
||||
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.44 2008/12/11 07:34:09 petere Exp $ */
|
||||
|
||||
#define POSTGRES_ECPG_INTERNAL
|
||||
#include "postgres_fe.h"
|
||||
@ -474,7 +474,7 @@ ecpg_gettext(const char *msgid)
|
||||
ldir = getenv("PGLOCALEDIR");
|
||||
if (!ldir)
|
||||
ldir = LOCALEDIR;
|
||||
bindtextdomain("ecpg", ldir);
|
||||
bindtextdomain(PG_TEXTDOMAIN("ecpg"), ldir);
|
||||
#ifdef WIN32
|
||||
SetLastError(save_errno);
|
||||
#else
|
||||
@ -482,7 +482,7 @@ ecpg_gettext(const char *msgid)
|
||||
#endif
|
||||
}
|
||||
|
||||
return dgettext("ecpg", msgid);
|
||||
return dgettext(PG_TEXTDOMAIN("ecpg"), msgid);
|
||||
}
|
||||
|
||||
#endif /* ENABLE_NLS */
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.105 2008/05/16 15:20:04 petere Exp $ */
|
||||
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.106 2008/12/11 07:34:09 petere Exp $ */
|
||||
|
||||
/* New main for ecpg, the PostgreSQL embedded SQL precompiler. */
|
||||
/* (C) Michael Meskes <meskes@postgresql.org> Feb 5th, 1998 */
|
||||
@ -138,7 +138,7 @@ main(int argc, char *const argv[])
|
||||
char my_exec_path[MAXPGPATH];
|
||||
char include_path[MAXPGPATH];
|
||||
|
||||
set_pglocale_pgservice(argv[0], "ecpg");
|
||||
set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("ecpg"));
|
||||
|
||||
progname = get_progname(argv[0]);
|
||||
|
||||
|
@ -23,7 +23,7 @@
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.136 2008/10/27 09:42:31 mha Exp $
|
||||
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.137 2008/12/11 07:34:09 petere Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -1166,7 +1166,7 @@ libpq_gettext(const char *msgid)
|
||||
ldir = getenv("PGLOCALEDIR");
|
||||
if (!ldir)
|
||||
ldir = LOCALEDIR;
|
||||
bindtextdomain("libpq", ldir);
|
||||
bindtextdomain(PG_TEXTDOMAIN("libpq"), ldir);
|
||||
#ifdef WIN32
|
||||
SetLastError(save_errno);
|
||||
#else
|
||||
@ -1174,7 +1174,7 @@ libpq_gettext(const char *msgid)
|
||||
#endif
|
||||
}
|
||||
|
||||
return dgettext("libpq", msgid);
|
||||
return dgettext(PG_TEXTDOMAIN("libpq"), msgid);
|
||||
}
|
||||
|
||||
#endif /* ENABLE_NLS */
|
||||
|
Reference in New Issue
Block a user