summaryrefslogtreecommitdiff
path: root/src/interfaces
diff options
context:
space:
mode:
authorPeter Eisentraut2020-06-15 06:22:52 +0000
committerPeter Eisentraut2020-06-15 06:46:56 +0000
commit47d4d0cfad6921fe1f6aabacc8a7a328ce9acb76 (patch)
tree8dc086dbc7319af309b3e25753de660c09d9b402 /src/interfaces
parent46241b28d84551bf6aeec3aa7e2391cda2757a21 (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/interfaces')
-rw-r--r--src/interfaces/libpq/fe-connect.c20
1 files changed, 12 insertions, 8 deletions
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;
}