Thread: [MASSMAIL]NLS doesn't work for pg_combinebackup
Hello. I noticed that NLS doesn't work for pg_combinebackup. The cause is that the tool forgets to call set_pglocale_pgservice(). This issue is fixed by the following chage. diff --git a/src/bin/pg_combinebackup/pg_combinebackup.c b/src/bin/pg_combinebackup/pg_combinebackup.c index 1b07ca3fb6..2788c78fdd 100644 --- a/src/bin/pg_combinebackup/pg_combinebackup.c +++ b/src/bin/pg_combinebackup/pg_combinebackup.c @@ -154,6 +154,7 @@ main(int argc, char *argv[]) pg_logging_init(argv[0]); progname = get_progname(argv[0]); + set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_combinebackup")); handle_help_version_opts(argc, argv, progname, help); memset(&opt, 0, sizeof(opt)); regards. -- Kyotaro Horiguchi NTT Open Source Software Center
At Mon, 08 Apr 2024 16:27:02 +0900 (JST), Kyotaro Horiguchi <horikyota.ntt@gmail.com> wrote in > Hello. > > I noticed that NLS doesn't work for pg_combinebackup. The cause is > that the tool forgets to call set_pglocale_pgservice(). > > This issue is fixed by the following chage. > > diff --git a/src/bin/pg_combinebackup/pg_combinebackup.c b/src/bin/pg_combinebackup/pg_combinebackup.c > index 1b07ca3fb6..2788c78fdd 100644 > --- a/src/bin/pg_combinebackup/pg_combinebackup.c > +++ b/src/bin/pg_combinebackup/pg_combinebackup.c > @@ -154,6 +154,7 @@ main(int argc, char *argv[]) > > pg_logging_init(argv[0]); > progname = get_progname(argv[0]); > + set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_combinebackup")); > handle_help_version_opts(argc, argv, progname, help); > > memset(&opt, 0, sizeof(opt)); Forgot to mention, but pg_walsummary has the same issue. diff --git a/src/bin/pg_walsummary/pg_walsummary.c b/src/bin/pg_walsummary/pg_walsummary.c index 5e41b376d7..daf6cd14ce 100644 --- a/src/bin/pg_walsummary/pg_walsummary.c +++ b/src/bin/pg_walsummary/pg_walsummary.c @@ -67,6 +67,7 @@ main(int argc, char *argv[]) pg_logging_init(argv[0]); progname = get_progname(argv[0]); + set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_walsummary")); handle_help_version_opts(argc, argv, progname, help); /* process command-line options */ regards. -- Kyotaro Horiguchi NTT Open Source Software Center
On Mon, Apr 08, 2024 at 04:27:02PM +0900, Kyotaro Horiguchi wrote: > I noticed that NLS doesn't work for pg_combinebackup. The cause is > that the tool forgets to call set_pglocale_pgservice(). > > This issue is fixed by the following chage. Indeed. Good catch. -- Michael
Attachment
On Mon, Apr 08, 2024 at 04:31:05PM +0900, Kyotaro Horiguchi wrote: >> diff --git a/src/bin/pg_combinebackup/pg_combinebackup.c b/src/bin/pg_combinebackup/pg_combinebackup.c >> index 1b07ca3fb6..2788c78fdd 100644 >> +++ b/src/bin/pg_combinebackup/pg_combinebackup.c > +++ b/src/bin/pg_walsummary/pg_walsummary.c > progname = get_progname(argv[0]); > + set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_walsummary")); I've checked the whole tree, and the two you are pointing at are the only incorrect paths. So applied, thanks! -- Michael
Attachment
At Tue, 9 Apr 2024 15:00:27 +0900, Michael Paquier <michael@paquier.xyz> wrote in > I've checked the whole tree, and the two you are pointing at are the > only incorrect paths. So applied, thanks! Thank you for cross-checking and committing! regards. -- Kyotaro Horiguchi NTT Open Source Software Center