From: Peter Eisentraut Date: Fri, 18 May 2018 03:05:27 +0000 (-0400) Subject: Message wording and pluralization improvements X-Git-Tag: REL_11_BETA1~28 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9effb63e0dd12b0704cd8e11106fe08ff5c9d685;p=postgresql Message wording and pluralization improvements --- diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index c633e11128..04bfac7485 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -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, diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index a148bdc9fd..7e34bee63e 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -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); } diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index 58f780c069..fb5b51d6be 100644 --- a/src/bin/pg_basebackup/pg_basebackup.c +++ b/src/bin/pg_basebackup/pg_basebackup.c @@ -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); diff --git a/src/bin/pg_basebackup/pg_receivewal.c b/src/bin/pg_basebackup/pg_receivewal.c index 535355ebda..071b32d19d 100644 --- a/src/bin/pg_basebackup/pg_receivewal.c +++ b/src/bin/pg_basebackup/pg_receivewal.c @@ -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; diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c index 820d1a61df..52f1e559b7 100644 --- a/src/bin/pg_basebackup/streamutil.c +++ b/src/bin/pg_basebackup/streamutil.c @@ -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; } diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c index 7d435ffa57..895a51f89d 100644 --- a/src/bin/pg_controldata/pg_controldata.c +++ b/src/bin/pg_controldata/pg_controldata.c @@ -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 .\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 diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c index 8a0a805f1e..ee28c338f8 100644 --- a/src/bin/pg_resetwal/pg_resetwal.c +++ b/src/bin/pg_resetwal/pg_resetwal.c @@ -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; } diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c index a1ab13963a..cabcff5c13 100644 --- a/src/bin/pg_rewind/pg_rewind.c +++ b/src/bin/pg_rewind/pg_rewind.c @@ -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 */ diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c index 9b2d37f917..9fc364bf5c 100644 --- a/src/bin/pg_upgrade/pg_upgrade.c +++ b/src/bin/pg_upgrade/pg_upgrade.c @@ -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); } diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c index 242aff2d68..5c4f38e597 100644 --- a/src/bin/pg_waldump/pg_waldump.c +++ b/src/bin/pg_waldump/pg_waldump.c @@ -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