Modify some new and pre-existing messages for translatability.

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index a672da0d4598c3dce58bd054096fc0df2612ce9f..43ecfac65b4ad6397b31a7d3e018967ead41f5dd 100644 (file)
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * 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
  *
@@ -3340,10 +3340,17 @@ BackendInitialize(Port *port)
             remote_host, remote_port);
 
    if (Log_connections)
-       ereport(LOG,
-               (errmsg("connection received: host=%s%s%s",
-                       remote_host, remote_port[0] ? " port=" : "",
-                       remote_port)));
+   {
+       if (remote_port[0])
+           ereport(LOG,
+               (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

diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 87895acdf66701e2adcdb3a417a26a9e689dc9de..afd4bc65b273b30264266fc38d040b785f1c7a45 100644 (file)
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -8,7 +8,7 @@
  *
  *
  * 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.
     */
    if (am_walsender)
-       ereport(LOG,
-               (errmsg("replication connection authorized: user=%s host=%s%s%s",
-                       port->user_name,
-                       port->remote_host, port->remote_port[0] ? " port=" : "",
-                       port->remote_port)));
-
+   {
+       if (port->remote_port[0])
+           ereport(LOG,
+               (errmsg("replication connection authorized: user=%s host=%s port=%s",
+                   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)
        ereport(LOG,
                (errmsg("connection authorized: user=%s database=%s",