Thread: Make prep_status() message translatable

Hello,

The recent commit 173c97812ff made the following change:

-    prep_status("Adding \".old\" suffix to old global/pg_control");
+    prep_status("Adding \".old\" suffix to old " XLOG_CONTROL_FILE);

This change results in a message that is untranslatable, at least into
Japanese.  In addition, the file name should be quoted.

The attached patch modifies the message to use %s for XLOG_CONTROL_FILE,  
making it properly translatable.

regards.

-- 
Kyotaro Horiguchi
NTT Open Source Software Center

On 2025/04/07 15:55, Kyotaro Horiguchi wrote:
> Hello,
> 
> The recent commit 173c97812ff made the following change:
> 
> -    prep_status("Adding \".old\" suffix to old global/pg_control");
> +    prep_status("Adding \".old\" suffix to old " XLOG_CONTROL_FILE);
> 
> This change results in a message that is untranslatable, at least into
> Japanese.  In addition, the file name should be quoted.
> 
> The attached patch modifies the message to use %s for XLOG_CONTROL_FILE,
> making it properly translatable.

Thanks for the report and patch!

The fix looks good to me.

        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"
               "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);

Commit 173c97812ff also updated the above part of disable_old_cluster()
and replaced the hardcoded "global/pg_control" with %s using XLOG_CONTROL_FILE.
Maybe we should also add a translator: comment and wrap %s/%s.old in
double quotes there?

Regards,

-- 
Fujii Masao
Advanced Computing Technology Center
Research and Development Headquarters
NTT DATA CORPORATION

On 2025/04/07 16:26, Fujii Masao wrote:
> 
> 
> On 2025/04/07 15:55, Kyotaro Horiguchi wrote:
>> Hello,
>>
>> The recent commit 173c97812ff made the following change:
>>
>> -    prep_status("Adding \".old\" suffix to old global/pg_control");
>> +    prep_status("Adding \".old\" suffix to old " XLOG_CONTROL_FILE);
>>
>> This change results in a message that is untranslatable, at least into
>> Japanese.  In addition, the file name should be quoted.
>>
>> The attached patch modifies the message to use %s for XLOG_CONTROL_FILE,
>> making it properly translatable.
> 
> Thanks for the report and patch!
> 
> The fix looks good to me.
> 
>          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"
>                 "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);
> 
> Commit 173c97812ff also updated the above part of disable_old_cluster()
> and replaced the hardcoded "global/pg_control" with %s using XLOG_CONTROL_FILE.
> Maybe we should also add a translator: comment and wrap %s/%s.old in
> double quotes there?

I've updated the patch to reflect this comment.
Barring any objections, I'm thinking to commit this patch.

Regards,

-- 
Fujii Masao
Advanced Computing Technology Center
Research and Development Headquarters
NTT DATA CORPORATION

On 2025/04/17 13:12, Fujii Masao wrote:
> I've updated the patch to reflect this comment.
> Barring any objections, I'm thinking to commit this patch.

Pushed. Thanks!

Regards,

-- 
Fujii Masao
Advanced Computing Technology Center
Research and Development Headquarters
NTT DATA CORPORATION