Date: Tue, 25 Feb 2025 14:09:53 +0900 (JST)
Message-Id: <20250225.140953.1271748916018759840.horikyota.ntt@gmail.com>
To: pgsql-hackers@lists.postgresql.org
Subject: Fix untranslatable split message
From: Kyotaro Horiguchi <horikyota.ntt@gmail.com>
User-Agent: Mew version 6.8 on Emacs 27.2
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
 boundary="--Next_Part(Tue_Feb_25_14_09_53_2025_913)--"
Content-Transfer-Encoding: 7bit
Archived-At: <https://www.postgresql.org/message-id/20250225.140953.1271748916018759840.horikyota.ntt%40gmail.com>
Precedence: bulk

----Next_Part(Tue_Feb_25_14_09_53_2025_913)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Hello,

The recent commit 1aab6805919 introduced a help description that was
split into two printf() commands, making it untranslatable.

The attached patch merges them into a single message.

regards.

-- 
Kyotaro Horiguchi
NTT Open Source Software Center

----Next_Part(Tue_Feb_25_14_09_53_2025_913)--
Content-Type: Text/X-Patch; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0001-Merge-split-string-literals-into-a-single-message.patch"

From f946b02bbb4e30bc250bf7386556c970ddb7dfbd Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horikyota.ntt@gmail.com>
Date: Tue, 25 Feb 2025 13:57:03 +0900
Subject: [PATCH] Merge split string literals into a single message

A recently added option description was split across two output
commands, making the message untranslatable. Merge them into a single
message.
---
 src/bin/pg_upgrade/option.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c
index fe716c4c805..188dd8d8a8b 100644
--- a/src/bin/pg_upgrade/option.c
+++ b/src/bin/pg_upgrade/option.c
@@ -323,8 +323,8 @@ usage(void)
 	printf(_("  --copy                        copy files to new cluster (default)\n"));
 	printf(_("  --copy-file-range             copy files to new cluster with copy_file_range\n"));
 	printf(_("  --no-statistics               do not import statistics from old cluster\n"));
-	printf(_("  --set-char-signedness=OPTION  set new cluster char signedness to \"signed\" or\n"));
-	printf(_("                                \"unsigned\"\n"));
+	printf(_("  --set-char-signedness=OPTION  set new cluster char signedness to \"signed\" or\n"
+			 "                                \"unsigned\"\n"));
 	printf(_("  --sync-method=METHOD          set method for syncing files to disk\n"));
 	printf(_("  -?, --help                    show this help, then exit\n"));
 	printf(_("\n"
-- 
2.43.5


----Next_Part(Tue_Feb_25_14_09_53_2025_913)----