rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pg_rewing pg_upgrade: Fix translation markers 

In pg_log_v(), we need to translate the fmt before processing, not the
formatted message afterwards.
This commit is contained in:
Peter Eisentraut 2016-11-07 12:00:00 -05:00
parent 6d779e05a0
commit e98c3ab2bd
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/pg_rewind/logging.c
View File

@ -34,26 +34,26 @@ pg_log_v(eLogType type, const char *fmt, va_list ap)
{ {
char message[QUERY_ALLOC]; char message[QUERY_ALLOC];
vsnprintf(message, sizeof(message), fmt, ap); vsnprintf(message, sizeof(message), _(fmt), ap);
switch (type) switch (type)
{ {
case PG_DEBUG: case PG_DEBUG:
if (debug) if (debug)
printf("%s", _(message)); printf("%s", message);
break; break;
case PG_PROGRESS: case PG_PROGRESS:
if (showprogress) if (showprogress)
printf("%s", _(message)); printf("%s", message);
break; break;
case PG_WARNING: case PG_WARNING:
printf("%s", _(message)); printf("%s", message);
break; break;
case PG_FATAL: case PG_FATAL:
printf("\n%s", _(message)); printf("\n%s", message);
printf("%s", _("Failure, exiting\n")); printf("%s", _("Failure, exiting\n"));
exit(1); exit(1);
break; break;

10
src/bin/pg_upgrade/util.c
View File

@ -89,7 +89,7 @@ pg_log_v(eLogType type, const char *fmt, va_list ap)
{ {
char message[QUERY_ALLOC]; char message[QUERY_ALLOC];
vsnprintf(message, sizeof(message), fmt, ap); vsnprintf(message, sizeof(message), _(fmt), ap);
/* PG_VERBOSE and PG_STATUS are only output in verbose mode */ /* PG_VERBOSE and PG_STATUS are only output in verbose mode */
/* fopen() on log_opts.internal might have failed, so check it */ /* fopen() on log_opts.internal might have failed, so check it */
@ -108,7 +108,7 @@ pg_log_v(eLogType type, const char *fmt, va_list ap)
{ {
case PG_VERBOSE: case PG_VERBOSE:
if (log_opts.verbose) if (log_opts.verbose)
printf("%s", _(message)); printf("%s", message);
break; break;
case PG_STATUS: case PG_STATUS:
@ -123,16 +123,16 @@ pg_log_v(eLogType type, const char *fmt, va_list ap)
strlen(message) <= MESSAGE_WIDTH - 2 ? message : strlen(message) <= MESSAGE_WIDTH - 2 ? message :
message + strlen(message) - MESSAGE_WIDTH + 3 + 2); message + strlen(message) - MESSAGE_WIDTH + 3 + 2);
else else
printf(" %s\n", _(message)); printf(" %s\n", message);
break; break;
case PG_REPORT: case PG_REPORT:
case PG_WARNING: case PG_WARNING:
printf("%s", _(message)); printf("%s", message);
break; break;
case PG_FATAL: case PG_FATAL:
printf("\n%s", _(message)); printf("\n%s", message);
printf("Failure, exiting\n"); printf("Failure, exiting\n");
exit(1); exit(1);
break; break;