Modify some new and pre-existing messages for translatability.

This commit is contained in:
Simon Riggs 2010-03-25 20:40:17 +00:00
parent 5ceb13c8a1
commit 65cd829232
2 changed files with 26 additions and 12 deletions

View File

@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.603 2010/02/26 02:00:56 momjian Exp $ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.604 2010/03/25 20:40:17 sriggs Exp $
* *
* NOTES * NOTES
* *
@ -3340,10 +3340,17 @@ BackendInitialize(Port *port)
remote_host, remote_port); remote_host, remote_port);
if (Log_connections) if (Log_connections)
ereport(LOG, {
(errmsg("connection received: host=%s%s%s", if (remote_port[0])
remote_host, remote_port[0] ? " port=" : "", ereport(LOG,
remote_port))); (errmsg("connection received: host=%s port=%s",
remote_host,
remote_port)));
else
ereport(LOG,
(errmsg("connection received: host=%s",
remote_host)));
}
/* /*
* save remote_host and remote_port in port structure * save remote_host and remote_port in port structure

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.207 2010/03/24 21:25:50 sriggs Exp $ * $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.208 2010/03/25 20:40:17 sriggs Exp $
* *
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
@ -221,12 +221,19 @@ PerformAuthentication(Port *port)
* Log connection for streaming replication even if Log_connections disabled. * Log connection for streaming replication even if Log_connections disabled.
*/ */
if (am_walsender) if (am_walsender)
ereport(LOG, {
(errmsg("replication connection authorized: user=%s host=%s%s%s", if (port->remote_port[0])
port->user_name, ereport(LOG,
port->remote_host, port->remote_port[0] ? " port=" : "", (errmsg("replication connection authorized: user=%s host=%s port=%s",
port->remote_port))); port->user_name,
port->remote_host,
port->remote_port)));
else
ereport(LOG,
(errmsg("replication connection authorized: user=%s host=%s",
port->user_name,
port->remote_host)));
}
else if (Log_connections) else if (Log_connections)
ereport(LOG, ereport(LOG,
(errmsg("connection authorized: user=%s database=%s", (errmsg("connection authorized: user=%s database=%s",