Add missing gettext calls for some SSL errors.

petere · petere · commit c8041474ee1b · 2006-09-04T14:57:27.000Z
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.71 2006/07/14 14:52:19 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.72 2006/09/04 14:57:27 petere Exp $
  *
  *	  Since the server static private key ($DataDir/server.key)
  *	  will normally be stored unencrypted so that the database
@@ -986,11 +986,11 @@ SSLerrmessage(void)
 
 	errcode = ERR_get_error();
 	if (errcode == 0)
-		return "No SSL error reported";
+		return _("no SSL error reported");
 	errreason = ERR_reason_error_string(errcode);
 	if (errreason != NULL)
 		return errreason;
-	snprintf(errbuf, sizeof(errbuf), "SSL error code %lu", errcode);
+	snprintf(errbuf, sizeof(errbuf), _("SSL error code %lu"), errcode);
 	return errbuf;
 }
 
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.85 2006/07/14 16:59:19 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.86 2006/09/04 14:57:27 petere Exp $
  *
  * NOTES
  *	  [ Most of these notes are wrong/obsolete, but perhaps not all ]
@@ -1000,7 +1000,7 @@ close_SSL(PGconn *conn)
  * return NULL if it doesn't recognize the error code.  We don't
  * want to return NULL ever.
  */
-static char ssl_nomem[] = "Out of memory allocating error description";
+static char ssl_nomem[] = "out of memory allocating error description";
 
 #define SSL_ERR_LEN 128
 
@@ -1017,7 +1017,7 @@ SSLerrmessage(void)
 	errcode = ERR_get_error();
 	if (errcode == 0)
 	{
-		strcpy(errbuf, "No SSL error reported");
+		snprintf(errbuf, SSL_ERR_LEN, libpq_gettext("no SSL error reported"));
 		return errbuf;
 	}
 	errreason = ERR_reason_error_string(errcode);
@@ -1027,7 +1027,7 @@ SSLerrmessage(void)
 		errbuf[SSL_ERR_LEN - 1] = '\0';
 		return errbuf;
 	}
-	snprintf(errbuf, SSL_ERR_LEN, "SSL error code %lu", errcode);
+	snprintf(errbuf, SSL_ERR_LEN, libpq_gettext("SSL error code %lu"), errcode);
 	return errbuf;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.71 2006/07/14 14:52:19 momjian Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.72 2006/09/04 14:57:27 petere Exp $`
`15`	`15`	`*`
`16`	`16`	`* Since the server static private key ($DataDir/server.key)`
`17`	`17`	`* will normally be stored unencrypted so that the database`
`@@ -986,11 +986,11 @@ SSLerrmessage(void)`
`986`	`986`
`987`	`987`	`errcode = ERR_get_error();`
`988`	`988`	`if (errcode == 0)`
`989`		`- return "No SSL error reported";`
	`989`	`+ return _("no SSL error reported");`
`990`	`990`	`errreason = ERR_reason_error_string(errcode);`
`991`	`991`	`if (errreason != NULL)`
`992`	`992`	`return errreason;`
`993`		`- snprintf(errbuf, sizeof(errbuf), "SSL error code %lu", errcode);`
	`993`	`+ snprintf(errbuf, sizeof(errbuf), _("SSL error code %lu"), errcode);`
`994`	`994`	`return errbuf;`
`995`	`995`	`}`
`996`	`996`