Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1a17447

Browse files
committed
NLS for libpq. Clean up the message formats and change the documentation
accordingly.
1 parent 9e5ec3b commit 1a17447

File tree

12 files changed

+686
-210
lines changed

12 files changed

+686
-210
lines changed

doc/src/sgml/ref/psql-ref.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.56 2001/06/10 03:46:31 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.57 2001/07/15 13:45:03 petere Exp $
33
Postgres documentation
44
-->
55

@@ -2349,7 +2349,7 @@ Field separator is "oo",
23492349
<para>
23502350
Pressing Control-C during a <quote>copy in</quote> (data sent to the
23512351
server) doesn't show the most ideal of behaviors. If you get a message
2352-
such as <quote>PQexec: you gotta get out of a COPY state yourself</quote>,
2352+
such as <quote>COPY state must be terminated first</quote>,
23532353
simply reset the connection by entering <literal>\c - -</literal>.
23542354
</para>
23552355
</listitem>

doc/src/sgml/runtime.sgml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.72 2001/06/30 22:03:25 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.73 2001/07/15 13:45:03 petere Exp $
33
-->
44

55
<Chapter Id="runtime">
@@ -392,9 +392,9 @@ IpcSemaphoreCreate: semget(key=5440026, num=16, 01600) failed: No space left on
392392

393393
<para>
394394
<screen>
395-
PQconnectPoll() -- connect() failed: Connection refused
396-
Is the postmaster running (with -i) at 'server.joe.com'
397-
and accepting connections on TCP/IP port 5432?
395+
psql: could not connect to server: Connection refused
396+
Is the server running on host server.joe.com and accepting
397+
TCP/IP connections on port 5432?
398398
</screen>
399399
This is the generic <quote>I couldn't find a server to talk
400400
to</quote> failure. It looks like the above when TCP/IP
@@ -407,9 +407,9 @@ PQconnectPoll() -- connect() failed: Connection refused
407407
Alternatively, you'll get this when attempting
408408
Unix-socket communication to a local postmaster:
409409
<screen>
410-
connectDBstart() -- connect() failed: No such file or directory
411-
Is the postmaster running locally
412-
and accepting connections on Unix socket '/tmp/.s.PGSQL.5432'?
410+
psql: could not connect to server: Connection refused
411+
Is the server running locally and accepting
412+
connections on Unix domain socket "/tmp/.s.PGSQL.5432"?
413413
</screen>
414414
</para>
415415

doc/src/sgml/start.sgml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/start.sgml,v 1.15 2000/11/30 23:20:50 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/start.sgml,v 1.16 2001/07/15 13:45:03 petere Exp $
33
-->
44

55
<chapter id="start">
@@ -154,18 +154,18 @@ $Header: /cvsroot/pgsql/doc/src/sgml/start.sgml,v 1.15 2000/11/30 23:20:50 tgl E
154154

155155
<programlisting>
156156
% psql template1
157-
psql: connectDBStart() -- connect() failed: No such file or directory
158-
Is the postmaster running locally
159-
and accepting connections on Unix socket '/tmp/.s.PGSQL.5432'?
157+
psql: could not connect to server: Connection refused
158+
Is the server running locally and accepting
159+
connections on Unix domain socket "/tmp/.s.PGSQL.5432"?
160160
</programlisting>
161161

162162
or
163163

164164
<programlisting>
165165
% psql -h localhost template1
166-
psql: PQconnectPoll() -- connect() failed: Connection refused
167-
Is the postmaster running (with -i) at 'localhost'
168-
and accepting connections on TCP/IP port 5432?
166+
psql: could not connect to server: Connection refused
167+
Is the server running on host localhost and accepting
168+
TCP/IP connections on port 5432?
169169
</programlisting>
170170

171171
it is usually because

src/interfaces/libpq/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.52 2001/05/11 01:46:33 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.53 2001/07/15 13:45:04 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -30,7 +30,7 @@ endif
3030
# Add libraries that libpq depends (or might depend) on into the
3131
# shared library link. (The order in which you list them here doesn't
3232
# matter.)
33-
SHLIB_LINK += $(filter -L%, $(LDFLAGS)) $(filter -lcrypt -ldes -lkrb -lcom_err -lcrypto -lk5crypto -lkrb5 -lssl -lsocket -lnsl -lresolv, $(LIBS))
33+
SHLIB_LINK += $(filter -L%, $(LDFLAGS)) $(filter -lcrypt -ldes -lkrb -lcom_err -lcrypto -lk5crypto -lkrb5 -lssl -lsocket -lnsl -lresolv -lintl, $(LIBS))
3434

3535

3636
all: all-lib

0 commit comments

Comments
 (0)