8000 Error message refactoring · postgres/postgres@47d4d0c · GitHub
[go: up one dir, main page]
Skip to content

Commit 47d4d0c

Browse files
peterepetere
committed
Error message refactoring
Take some untranslatable things out of the message and replace by format placeholders, to reduce translatable strings and reduce translation mistakes.
1 parent 46241b2 commit 47d4d0c

File tree

2 files changed

+20
-12
lines changed

2 files changed

+20
-12
lines changed

‎src/bin/pg_basebackup/pg_basebackup.c‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2505,7 +2505,8 @@ main(int argc, char **argv)
25052505

25062506
if (no_slot)
25072507
{
2508-
pg_log_error("--create-slot and --no-slot are incompatible options");
2508+
pg_log_error("%s and %s are incompatible options",
2509+
"--create-slot", "--no-slot");
25092510
fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
25102511
progname);
25112512
exit(1);
@@ -2543,23 +2544,26 @@ main(int argc, char **argv)
25432544

25442545
if (showprogress && !estimatesize)
25452546
{
2546-
pg_log_error("--progress and --no-estimate-size are incompatible options");
2547+
pg_log_error("%s and %s are incompatible options",
2548+
"--progress", "--no-estimate-size");
25472549
fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
25482550
progname);
25492551
exit(1);
25502552
}
25512553

25522554
if (!manifest && manifest_checksums != NULL)
25532555
{
2554-
pg_log_error("--no-manifest and --manifest-checksums are incompatible options");
2556+
pg_log_error("%s and %s are incompatible options",
2557+
"--no-manifest", "--manifest-checksums");
25552558
fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
25562559
progname);
25572560
exit(1);
25582561
}
25592562

25602563
if (!manifest && manifest_force_encode)
25612564
{
2562-
pg_log_error("--no-manifest and --manifest-force-encode are incompatible options");
2565+
pg_log_error("%s and %s are incompatible options",
2566+
"--no-manifest", "--manifest-force-encode");
25632567
fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
25642568
progname);
25652569
exit(1);

‎src/interfaces/libpq/fe-connect.c‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,8 +1240,8 @@ connectOptions2(PGconn *conn)
12401240
{
12411241
conn->status = CONNECTION_BAD;
12421242
printfPQExpBuffer(&conn->errorMessage,
1243-
libpq_gettext("invalid channel_binding value: \"%s\"\n"),
1244-
conn->channel_binding);
1243+
libpq_gettext("invalid %s value: \"%s\"\n"),
1244+
"channel_binding", conn->channel_binding);
12451245
return false;
12461246
}
12471247
}
@@ -1266,8 +1266,8 @@ connectOptions2(PGconn *conn)
12661266
{
12671267
conn->status = CONNECTION_BAD;
12681268
printfPQExpBuffer(&conn->errorMessage,
1269-
libpq_gettext("invalid sslmode value: \"%s\"\n"),
1270-
conn->sslmode);
1269+
libpq_gettext("invalid %s value: \"%s\"\n"),
1270+
"sslmode", conn->sslmode);
12711271
return false;
12721272
}
12731273

@@ -1308,15 +1308,17 @@ connectOptions2(PGconn *conn)
13081308
{
13091309
conn->status = CONNECTION_BAD;
13101310
printfPQExpBuffer(&conn->errorMessage,
1311-
libpq_gettext("invalid ssl_min_protocol_version value: \"%s\"\n"),
1311+
libpq_gettext("invalid %s value: \"%s\"\n"),
1312+
"ssl_min_protocol_version",
13121313
conn->ssl_min_protocol_version);
13131314
return false;
13141315
}
13151316
if (!sslVerifyProtocolVersion(conn->ssl_max_protocol_version))
13161317
{
13171318
conn->status = CONNECTION_BAD;
13181319
printfPQExpBuffer(&conn->errorMessage,
1319-
libpq_gettext("invalid ssl_max_protocol_version value: \"%s\"\n"),
1320+
libpq_gettext("invalid %s value: \"%s\"\n"),
1321+
"ssl_max_protocol_version",
13201322
conn->ssl_max_protocol_version);
13211323
return false;
13221324
}
@@ -1348,7 +1350,8 @@ connectOptions2(PGconn *conn)
13481350
{
13491351
conn->status = CONNECTION_BAD;
13501352
printfPQExpBuffer(&conn->errorMessage,
1351-
libpq_gettext("invalid gssencmode value: \"%s\"\n"),
1353+
libpq_gettext("invalid %s value: \"%s\"\n"),
1354+
"gssencmode",
13521355
conn->gssencmode);
13531356
return false;
13541357
}
@@ -1392,7 +1395,8 @@ connectOptions2(PGconn *conn)
13921395
{
13931396
conn->status = CONNECTION_BAD;
13941397
printfPQExpBuffer(&conn->errorMessage,
1395-
libpq_gettext("invalid target_session_attrs value: \"%s\"\n"),
1398+
libpq_gettext("invalid %s value: \"%s\"\n"),
1399+
"target_settion_attrs",
13961400
conn->target_session_attrs);
13971401
return false;
13981402
}

0 commit comments

Comments
 (0)
0