diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2016-11-07 12:00:00 -0500 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2016-11-07 09:51:06 -0500 |
| commit | e98c3ab2bd65f0e78bce20ace477eeed76b87345 (patch) | |
| tree | c39a7f54d0ab6558dd07daa39e407018f5987907 | |
| parent | 6d779e05a03d2c06433b71b76f9b0168d47d1a3e (diff) | |
| download | postgresql-e98c3ab2bd65f0e78bce20ace477eeed76b87345.tar.gz postgresql-e98c3ab2bd65f0e78bce20ace477eeed76b87345.zip | |
pg_rewing pg_upgrade: Fix translation markers
In pg_log_v(), we need to translate the fmt before processing, not the
formatted message afterwards.
| -rw-r--r-- | src/bin/pg_rewind/logging.c | 10 | ||||
| -rw-r--r-- | src/bin/pg_upgrade/util.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/bin/pg_rewind/logging.c b/src/bin/pg_rewind/logging.c index 0e05f968fca..784ddf8e247 100644 --- a/src/bin/pg_rewind/logging.c +++ b/src/bin/pg_rewind/logging.c @@ -34,26 +34,26 @@ pg_log_v(eLogType type, const char *fmt, va_list ap) { char message[QUERY_ALLOC]; - vsnprintf(message, sizeof(message), fmt, ap); + vsnprintf(message, sizeof(message), _(fmt), ap); switch (type) { case PG_DEBUG: if (debug) - printf("%s", _(message)); + printf("%s", message); break; case PG_PROGRESS: if (showprogress) - printf("%s", _(message)); + printf("%s", message); break; case PG_WARNING: - printf("%s", _(message)); + printf("%s", message); break; case PG_FATAL: - printf("\n%s", _(message)); + printf("\n%s", message); printf("%s", _("Failure, exiting\n")); exit(1); break; diff --git a/src/bin/pg_upgrade/util.c b/src/bin/pg_upgrade/util.c index 3e3d2c3b019..8b5a1e13fe4 100644 --- a/src/bin/pg_upgrade/util.c +++ b/src/bin/pg_upgrade/util.c @@ -89,7 +89,7 @@ pg_log_v(eLogType type, const char *fmt, va_list ap) { 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 */ /* 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: if (log_opts.verbose) - printf("%s", _(message)); + printf("%s", message); break; case PG_STATUS: @@ -123,16 +123,16 @@ pg_log_v(eLogType type, const char *fmt, va_list ap) strlen(message) <= MESSAGE_WIDTH - 2 ? message : message + strlen(message) - MESSAGE_WIDTH + 3 + 2); else - printf(" %s\n", _(message)); + printf(" %s\n", message); break; case PG_REPORT: case PG_WARNING: - printf("%s", _(message)); + printf("%s", message); break; case PG_FATAL: - printf("\n%s", _(message)); + printf("\n%s", message); printf("Failure, exiting\n"); exit(1); break; |