diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2020-06-15 08:22:52 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2020-06-15 08:46:56 +0200 |
| commit | 47d4d0cfad6921fe1f6aabacc8a7a328ce9acb76 (patch) | |
| tree | 8dc086dbc7319af309b3e25753de660c09d9b402 /src | |
| parent | 46241b28d84551bf6aeec3aa7e2391cda2757a21 (diff) | |
Error message refactoring
Take some untranslatable things out of the message and replace by
format placeholders, to reduce translatable strings and reduce
translation mistakes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_basebackup/pg_basebackup.c | 12 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 20 |
2 files changed, 20 insertions, 12 deletions
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index b9ec640d2fc..b81b5679ec3 100644 --- a/src/bin/pg_basebackup/pg_basebackup.c +++ b/src/bin/pg_basebackup/pg_basebackup.c @@ -2505,7 +2505,8 @@ main(int argc, char **argv) if (no_slot) { - pg_log_error("--create-slot and --no-slot are incompatible options"); + pg_log_error("%s and %s are incompatible options", + "--create-slot", "--no-slot"); fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname); exit(1); @@ -2543,7 +2544,8 @@ main(int argc, char **argv) if (showprogress && !estimatesize) { - pg_log_error("--progress and --no-estimate-size are incompatible options"); + pg_log_error("%s and %s are incompatible options", + "--progress", "--no-estimate-size"); fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname); exit(1); @@ -2551,7 +2553,8 @@ main(int argc, char **argv) if (!manifest && manifest_checksums != NULL) { - pg_log_error("--no-manifest and --manifest-checksums are incompatible options"); + pg_log_error("%s and %s are incompatible options", + "--no-manifest", "--manifest-checksums"); fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname); exit(1); @@ -2559,7 +2562,8 @@ main(int argc, char **argv) if (!manifest && manifest_force_encode) { - pg_log_error("--no-manifest and --manifest-force-encode are incompatible options"); + pg_log_error("%s and %s are incompatible options", + "--no-manifest", "--manifest-force-encode"); fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname); exit(1); diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index ae4a32e45b2..2c87b34028d 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -1240,8 +1240,8 @@ connectOptions2(PGconn *conn) { conn->status = CONNECTION_BAD; printfPQExpBuffer(&conn->errorMessage, - libpq_gettext("invalid channel_binding value: \"%s\"\n"), - conn->channel_binding); + libpq_gettext("invalid %s value: \"%s\"\n"), + "channel_binding", conn->channel_binding); return false; } } @@ -1266,8 +1266,8 @@ connectOptions2(PGconn *conn) { conn->status = CONNECTION_BAD; printfPQExpBuffer(&conn->errorMessage, - libpq_gettext("invalid sslmode value: \"%s\"\n"), - conn->sslmode); + libpq_gettext("invalid %s value: \"%s\"\n"), + "sslmode", conn->sslmode); return false; } @@ -1308,7 +1308,8 @@ connectOptions2(PGconn *conn) { conn->status = CONNECTION_BAD; printfPQExpBuffer(&conn->errorMessage, - libpq_gettext("invalid ssl_min_protocol_version value: \"%s\"\n"), + libpq_gettext("invalid %s value: \"%s\"\n"), + "ssl_min_protocol_version", conn->ssl_min_protocol_version); return false; } @@ -1316,7 +1317,8 @@ connectOptions2(PGconn *conn) { conn->status = CONNECTION_BAD; printfPQExpBuffer(&conn->errorMessage, - libpq_gettext("invalid ssl_max_protocol_version value: \"%s\"\n"), + libpq_gettext("invalid %s value: \"%s\"\n"), + "ssl_max_protocol_version", conn->ssl_max_protocol_version); return false; } @@ -1348,7 +1350,8 @@ connectOptions2(PGconn *conn) { conn->status = CONNECTION_BAD; printfPQExpBuffer(&conn->errorMessage, - libpq_gettext("invalid gssencmode value: \"%s\"\n"), + libpq_gettext("invalid %s value: \"%s\"\n"), + "gssencmode", conn->gssencmode); return false; } @@ -1392,7 +1395,8 @@ connectOptions2(PGconn *conn) { conn->status = CONNECTION_BAD; printfPQExpBuffer(&conn->errorMessage, - libpq_gettext("invalid target_session_attrs value: \"%s\"\n"), + libpq_gettext("invalid %s value: \"%s\"\n"), + "target_settion_attrs", conn->target_session_attrs); return false; } |