1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pg_upgrade: Tweak translatable strings

Browse Source 
"\r" (for progress output) must not be inside a translatable string
(gettext gets upset).

In passing, move the minimum supported version number to a separate
argument, so that we don't have to retranslate this string every year
now.
This commit is contained in:
Peter Eisentraut 2022-05-23 10:54:39 +02:00
parent 09ed73f1a4
commit da1c0acd0a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/pg_upgrade/check.c
View File

@ -289,7 +289,8 @@ check_cluster_versions(void)
*/ */
if (GET_MAJOR_VERSION(old_cluster.major_version) < 902) if (GET_MAJOR_VERSION(old_cluster.major_version) < 902)
pg_fatal("This utility can only upgrade from PostgreSQL version 9.2 and later.\n"); pg_fatal("This utility can only upgrade from PostgreSQL version %s and later.\n",
"9.2");
/* Only current PG version is supported as a target */ /* Only current PG version is supported as a target */
if (GET_MAJOR_VERSION(new_cluster.major_version) != GET_MAJOR_VERSION(PG_VERSION_NUM)) if (GET_MAJOR_VERSION(new_cluster.major_version) != GET_MAJOR_VERSION(PG_VERSION_NUM))

5
src/bin/pg_upgrade/util.c
View File

@ -47,7 +47,10 @@ end_progress_output(void)
* nicely. * nicely.
*/ */
if (log_opts.isatty) if (log_opts.isatty)
pg_log(PG_REPORT, "\r%-*s", MESSAGE_WIDTH, ""); {
printf("\r");
pg_log(PG_REPORT, "%-*s", MESSAGE_WIDTH, "");
}
else if (log_opts.verbose) else if (log_opts.verbose)
pg_log(PG_REPORT, "%-*s", MESSAGE_WIDTH, ""); pg_log(PG_REPORT, "%-*s", MESSAGE_WIDTH, "");
} }