From a0fe90efef91fcd578a85a0f0c5bcab55285b1d7 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Wed, 12 Jun 2024 15:31:31 +0200 Subject: [PATCH] libpq: Add missing gettext markers Follow-up to 87d2801d4b: 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. --- src/interfaces/libpq/fe-connect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index df99643246..995621b626 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -3519,7 +3519,7 @@ keep_going: /* We will come back to here until there is * 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 @@ keep_going: /* We will come back to here until there is * 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') {