diff options
| author | Fujii Masao <fujii@postgresql.org> | 2025-04-18 18:35:40 +0900 |
|---|---|---|
| committer | Fujii Masao <fujii@postgresql.org> | 2025-04-18 18:35:40 +0900 |
| commit | 3aad76a0a970faf22ea38dd61b5668d480b5a92f (patch) | |
| tree | 141a02316d1fc9a72bffbb99a8f6c9215e5ec072 | |
| parent | 05883bd6e556bb4d86c7ece4c37080d00cdb0d34 (diff) | |
| download | postgresql-3aad76a0a970faf22ea38dd61b5668d480b5a92f.tar.gz postgresql-3aad76a0a970faf22ea38dd61b5668d480b5a92f.zip | |
Make pg_upgrade log message with control file path translatable.
Commit 173c97812ff replaced the hardcoded "global/pg_control" in pg_upgrade
log message with a string literal concatenation of XLOG_CONTROL_FILE macro.
However, this change made the message untranslatable.
This commit fixes the issue by using %s with XLOG_CONTROL_FILE instead of
that literal concatenation, allowing the message to be translated properly.
It also wraps the file path in double quotes for consistency with similar
log messages.
Author: Kyotaro Horiguchi <horikyota.ntt@gmail.com>
Reviewed-by: Masao Fujii <masao.fujii@gmail.com>
Discussion: https://postgr.es/m/20250407.155546.2129693791769531891.horikyota.ntt@gmail.com
| -rw-r--r-- | src/bin/pg_upgrade/controldata.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c index 8b7c349a875..90cef0864de 100644 --- a/src/bin/pg_upgrade/controldata.c +++ b/src/bin/pg_upgrade/controldata.c @@ -758,7 +758,8 @@ disable_old_cluster(transferMode transfer_mode) new_path[MAXPGPATH]; /* rename pg_control so old server cannot be accidentally started */ - prep_status("Adding \".old\" suffix to old " XLOG_CONTROL_FILE); + /* translator: %s is the file path of the control file */ + prep_status("Adding \".old\" suffix to old \"%s\"", XLOG_CONTROL_FILE); snprintf(old_path, sizeof(old_path), "%s/%s", old_cluster.pgdata, XLOG_CONTROL_FILE); snprintf(new_path, sizeof(new_path), "%s/%s.old", old_cluster.pgdata, XLOG_CONTROL_FILE); @@ -768,9 +769,10 @@ disable_old_cluster(transferMode transfer_mode) check_ok(); if (transfer_mode == TRANSFER_MODE_LINK) + /* translator: %s/%s is the file path of the control file */ pg_log(PG_REPORT, "\n" "If you want to start the old cluster, you will need to remove\n" - "the \".old\" suffix from %s/%s.old.\n" + "the \".old\" suffix from \"%s/%s.old\".\n" "Because \"link\" mode was used, the old cluster cannot be safely\n" "started once the new cluster has been started.", old_cluster.pgdata, XLOG_CONTROL_FILE); |