opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Message wording and pluralization improvements

This commit is contained in:
Peter Eisentraut 2018-05-17 23:05:27 -04:00
parent 6b30d1386f
commit 9effb63e0d
10 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/access/transam/xlog.c
View File

@ -4652,8 +4652,10 @@ ReadControlFile(void)
if (!IsValidWalSegSize(wal_segment_size))
ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("WAL segment size must be a power of two between 1MB and 1GB, but the control file specifies %d bytes",
wal_segment_size)));
errmsg_plural("WAL segment size must be a power of two between 1 MB and 1 GB, but the control file specifies %d byte",
"WAL segment size must be a power of two between 1 MB and 1 GB, but the control file specifies %d bytes",
wal_segment_size,
wal_segment_size)));
snprintf(wal_segsz_str, sizeof(wal_segsz_str), "%d", wal_segment_size);
SetConfigOption("wal_segment_size", wal_segsz_str, PGC_INTERNAL,

2
src/backend/bootstrap/bootstrap.c
View File

@ -265,7 +265,7 @@ AuxiliaryProcessMain(int argc, char *argv[])
if (!IsValidWalSegSize(WalSegSz))
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("-X requires a power of 2 value between 1MB and 1GB")));
errmsg("-X requires a power of two value between 1 MB and 1 GB")));
SetConfigOption("wal_segment_size", optarg, PGC_INTERNAL,
PGC_S_OVERRIDE);
}

4
src/bin/pg_basebackup/pg_basebackup.c
View File

@ -2418,8 +2418,8 @@ main(int argc, char **argv)
if (!replication_slot)
{
fprintf(stderr,
_("%s: --create-slot needs a slot to be specified using --slot\n"),
progname);
_("%s: %s needs a slot to be specified using --slot\n"),
progname, "--create-slot");
fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
progname);
exit(1);

2
src/bin/pg_basebackup/pg_receivewal.c
View File

@ -120,7 +120,7 @@ stop_streaming(XLogRecPtr xlogpos, uint32 timeline, bool segment_finished)
if (!XLogRecPtrIsInvalid(endpos) && endpos < xlogpos)
{
if (verbose)
fprintf(stderr, _("%s: stopped streaming at %X/%X (timeline %u)\n"),
fprintf(stderr, _("%s: stopped log streaming at %X/%X (timeline %u)\n"),
progname, (uint32) (xlogpos >> 32), (uint32) xlogpos,
timeline);
time_to_stop = true;

4
src/bin/pg_basebackup/streamutil.c
View File

@ -336,7 +336,9 @@ RetrieveWalSegSize(PGconn *conn)
if (!IsValidWalSegSize(WalSegSz))
{
fprintf(stderr,
_("%s: WAL segment size must be a power of two between 1MB and 1GB, but the remote server reported a value of %d bytes\n"),
ngettext("%s: WAL segment size must be a power of two between 1 MB and 1 GB, but the remote server reported a value of %d byte\n",
"%s: WAL segment size must be a power of two between 1 MB and 1 GB, but the remote server reported a value of %d bytes\n",
WalSegSz),
progname, WalSegSz);
return false;
}

20
src/bin/pg_controldata/pg_controldata.c
View File

@ -35,9 +35,9 @@ usage(const char *progname)
printf(_("Usage:\n"));
printf(_(" %s [OPTION] [DATADIR]\n"), progname);
printf(_("\nOptions:\n"));
printf(_(" [-D,--pgdata=]DATADIR data directory\n"));
printf(_(" -V, --version output version information, then exit\n"));
printf(_(" -?, --help show this help, then exit\n"));
printf(_(" [-D, --pgdata=]DATADIR data directory\n"));
printf(_(" -V, --version output version information, then exit\n"));
printf(_(" -?, --help show this help, then exit\n"));
printf(_("\nIf no data directory (DATADIR) is specified, "
"the environment variable PGDATA\nis used.\n\n"));
printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));
@ -174,11 +174,17 @@ main(int argc, char *argv[])
WalSegSz = ControlFile->xlog_seg_size;
if (!IsValidWalSegSize(WalSegSz))
printf(_("WARNING: invalid WAL segment size\n"
"The WAL segment size stored in the file, %d bytes, is not a power of two\n"
"between 1 MB and 1 GB. The file is corrupt and the results below are\n"
"untrustworthy.\n\n"),
{
printf(_("WARNING: invalid WAL segment size\n"));
printf(ngettext("The WAL segment size stored in the file, %d byte, is not a power of two\n"
"between 1 MB and 1 GB. The file is corrupt and the results below are\n"
"untrustworthy.\n\n",
"The WAL segment size stored in the file, %d bytes, is not a power of two\n"
"between 1 MB and 1 GB. The file is corrupt and the results below are\n"
"untrustworthy.\n\n",
WalSegSz),
WalSegSz);
}
/*
* This slightly-chintzy coding will work as long as the control file

8
src/bin/pg_resetwal/pg_resetwal.c
View File

@ -366,8 +366,8 @@ main(int argc, char *argv[])
/* Set mask based on PGDATA permissions */
if (!GetDataDirectoryCreatePerm(DataDir))
{
fprintf(stderr, _("%s: unable to read permissions from \"%s\"\n"),
progname, DataDir);
fprintf(stderr, _("%s: could not read permissions of directory \"%s\": %s\n"),
progname, DataDir, strerror(errno));
exit(1);
}
@ -655,7 +655,9 @@ ReadControlFile(void)
if (!IsValidWalSegSize(ControlFile.xlog_seg_size))
{
fprintf(stderr,
_("%s: pg_control specifies invalid WAL segment size (%d bytes); proceed with caution \n"),
ngettext("%s: pg_control specifies invalid WAL segment size (%d byte); proceed with caution\n",
"%s: pg_control specifies invalid WAL segment size (%d bytes); proceed with caution\n",
ControlFile.xlog_seg_size),
progname, ControlFile.xlog_seg_size);
return false;
}

8
src/bin/pg_rewind/pg_rewind.c
View File

@ -189,8 +189,8 @@ main(int argc, char **argv)
/* Set mask based on PGDATA permissions */
if (!GetDataDirectoryCreatePerm(datadir_target))
{
fprintf(stderr, _("%s: unable to read permissions from \"%s\"\n"),
progname, datadir_target);
fprintf(stderr, _("%s: could not read permissions of directory \"%s\": %s\n"),
progname, datadir_target, strerror(errno));
exit(1);
}
@ -648,7 +648,9 @@ digestControlFile(ControlFileData *ControlFile, char *src, size_t size)
WalSegSz = ControlFile->xlog_seg_size;
if (!IsValidWalSegSize(WalSegSz))
pg_fatal("WAL segment size must be a power of two between 1MB and 1GB, but the control file specifies %d bytes\n",
pg_fatal(ngettext("WAL segment size must be a power of two between 1 MB and 1 GB, but the control file specifies %d byte\n",
"WAL segment size must be a power of two between 1 MB and 1 GB, but the control file specifies %d bytes\n",
WalSegSz),
WalSegSz);
/* Additional checks on control file */

4
src/bin/pg_upgrade/pg_upgrade.c
View File

@ -103,8 +103,8 @@ main(int argc, char **argv)
/* Set mask based on PGDATA permissions */
if (!GetDataDirectoryCreatePerm(new_cluster.pgdata))
{
pg_log(PG_FATAL, "unable to read permissions from \"%s\"\n",
new_cluster.pgdata);
pg_log(PG_FATAL, "could not read permissions of directory \"%s\": %s\n",
new_cluster.pgdata, strerror(errno));
exit(1);
}

4
src/bin/pg_waldump/pg_waldump.c
View File

@ -218,7 +218,9 @@ search_directory(const char *directory, const char *fname)
WalSegSz = longhdr->xlp_seg_size;
if (!IsValidWalSegSize(WalSegSz))
fatal_error("WAL segment size must be a power of two between 1MB and 1GB, but the WAL file \"%s\" header specifies %d bytes",
fatal_error(ngettext("WAL segment size must be a power of two between 1 MB and 1 GB, but the WAL file \"%s\" header specifies %d byte",
"WAL segment size must be a power of two between 1 MB and 1 GB, but the WAL file \"%s\" header specifies %d bytes",
WalSegSz),
fname, WalSegSz);
}
else