From: Peter Eisentraut <peter@eisentraut.org>
Date: Mon, 23 May 2022 08:54:39 +0000 (+0200)
Subject: pg_upgrade: Tweak translatable strings
X-Git-Tag: REL_15_BETA2~104
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=da1c0acd0a61eb8c1d62725ded9c219e783cc6a2;p=postgresql.git

pg_upgrade: Tweak translatable strings

"\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.
---

diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index dd3972bb6cf..6114303b527 100644
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -289,7 +289,8 @@ check_cluster_versions(void)
 	 */
 
 	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 */
 	if (GET_MAJOR_VERSION(new_cluster.major_version) != GET_MAJOR_VERSION(PG_VERSION_NUM))
diff --git a/src/bin/pg_upgrade/util.c b/src/bin/pg_upgrade/util.c
index 9edfe7c3605..1a328b42700 100644
--- a/src/bin/pg_upgrade/util.c
+++ b/src/bin/pg_upgrade/util.c
@@ -47,7 +47,10 @@ end_progress_output(void)
 	 * nicely.
 	 */
 	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)
 		pg_log(PG_REPORT, "%-*s", MESSAGE_WIDTH, "");
 }