libpq: Add missing gettext markers

petere · petere · commit a0fe90efef91 · 2024-06-12T15:31:31.000+02:00
Follow-up to 87d2801: That commit restored some lost error messages, but they ended up in a place where xgettext wouldn't find them. Rather than elevating ENCRYPTION_NEGOTIATION_FAILED() to a gettext trigger, it's easiest for now to put in some explicit libpq_gettext() calls in the couple of call sites.
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -3519,7 +3519,7 @@ PQconnectPoll(PGconn *conn)
 						 * continue without SSL, we can proceed using this
 						 * connection.  Otherwise return with an error.
 						 */
-						ENCRYPTION_NEGOTIATION_FAILED("server does not support SSL, but SSL was required");
+						ENCRYPTION_NEGOTIATION_FAILED(libpq_gettext("server does not support SSL, but SSL was required"));
 					}
 					else if (SSLok == 'E')
 					{
@@ -3640,7 +3640,7 @@ PQconnectPoll(PGconn *conn)
 						 * continue without GSS, we can proceed using this
 						 * connection.  Otherwise return with an error.
 						 */
-						ENCRYPTION_NEGOTIATION_FAILED("server doesn't support GSSAPI encryption, but it was required");
+						ENCRYPTION_NEGOTIATION_FAILED(libpq_gettext("server doesn't support GSSAPI encryption, but it was required"));
 					}
 					else if (gss_ok != 'G')
 					{

Original file line number	Diff line number	Diff line change
`@@ -3519,7 +3519,7 @@ PQconnectPoll(PGconn *conn)`
`3519`	`3519`	`* continue without SSL, we can proceed using this`
`3520`	`3520`	`* connection. Otherwise return with an error.`
`3521`	`3521`	`*/`
`3522`		`- ENCRYPTION_NEGOTIATION_FAILED("server does not support SSL, but SSL was required");`
	`3522`	`+ ENCRYPTION_NEGOTIATION_FAILED(libpq_gettext("server does not support SSL, but SSL was required"));`
`3523`	`3523`	`}`
`3524`	`3524`	`else if (SSLok == 'E')`
`3525`	`3525`	`{`
`@@ -3640,7 +3640,7 @@ PQconnectPoll(PGconn *conn)`
`3640`	`3640`	`* continue without GSS, we can proceed using this`
`3641`	`3641`	`* connection. Otherwise return with an error.`
`3642`	`3642`	`*/`
`3643`		`- ENCRYPTION_NEGOTIATION_FAILED("server doesn't support GSSAPI encryption, but it was required");`
	`3643`	`+ ENCRYPTION_NEGOTIATION_FAILED(libpq_gettext("server doesn't support GSSAPI encryption, but it was required"));`
`3644`	`3644`	`}`
`3645`	`3645`	`else if (gss_ok != 'G')`
`3646`	`3646`	`{`