From ad8877cb513733d8bb98d24770a094b81c27e4c5 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Thu, 13 Jun 2024 10:17:36 +0200 Subject: [PATCH] Add missing source files to nls.mk Files in common/ and fe_utils/ that contain translatable strings need to be listed in the nls.mk files of the programs that use them. (Not great, but that's the way it works for now.) This usually requires some manual analysis which is done about once during each major release beta period. This time, I wrote a hackish script that figures some of this out more automatically, so this update is a bit larger as it also includes some files that were missed in the past. --- src/bin/initdb/nls.mk | 1 + src/bin/pg_amcheck/nls.mk | 7 ++++++- src/bin/pg_archivecleanup/nls.mk | 2 +- src/bin/pg_basebackup/nls.mk | 5 ++++- src/bin/pg_checksums/nls.mk | 3 +++ src/bin/pg_combinebackup/nls.mk | 7 ++++++- src/bin/pg_config/nls.mk | 5 ++++- src/bin/pg_controldata/nls.mk | 4 +++- src/bin/pg_ctl/nls.mk | 1 + src/bin/pg_dump/nls.mk | 4 +++- src/bin/pg_resetwal/nls.mk | 3 +++ src/bin/pg_rewind/nls.mk | 6 +++++- src/bin/pg_test_fsync/nls.mk | 2 +- src/bin/pg_test_timing/nls.mk | 2 +- src/bin/pg_upgrade/nls.mk | 8 +++++++- src/bin/pg_verifybackup/nls.mk | 3 +++ src/bin/pg_waldump/nls.mk | 4 +++- src/bin/pg_walsummary/nls.mk | 5 ++++- src/bin/psql/nls.mk | 1 + src/bin/scripts/nls.mk | 2 ++ 20 files changed, 62 insertions(+), 13 deletions(-) diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk index 2ff4359011..acbfdb3418 100644 --- a/src/bin/initdb/nls.mk +++ b/src/bin/initdb/nls.mk @@ -12,6 +12,7 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \ ../../common/username.c \ ../../common/wait_error.c \ ../../fe_utils/option_utils.c \ + ../../fe_utils/string_utils.c \ ../../port/dirmod.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) diff --git a/src/bin/pg_amcheck/nls.mk b/src/bin/pg_amcheck/nls.mk index 5e6171952c..941d224e18 100644 --- a/src/bin/pg_amcheck/nls.mk +++ b/src/bin/pg_amcheck/nls.mk @@ -2,10 +2,15 @@ CATALOG_NAME = pg_amcheck GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \ pg_amcheck.c \ + ../../common/fe_memutils.c \ + ../../common/file_utils.c \ + ../../common/username.c \ ../../fe_utils/cancel.c \ ../../fe_utils/connect_utils.c \ ../../fe_utils/option_utils.c \ - ../../fe_utils/query_utils.c + ../../fe_utils/parallel_slot.c \ + ../../fe_utils/query_utils.c \ + ../../fe_utils/string_utils.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \ log_no_match GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \ diff --git a/src/bin/pg_archivecleanup/nls.mk b/src/bin/pg_archivecleanup/nls.mk index 801cf1c51e..c23cdf6096 100644 --- a/src/bin/pg_archivecleanup/nls.mk +++ b/src/bin/pg_archivecleanup/nls.mk @@ -1,5 +1,5 @@ # src/bin/pg_archivecleanup/nls.mk CATALOG_NAME = pg_archivecleanup -GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) pg_archivecleanup.c +GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) pg_archivecleanup.c ../../common/fe_memutils.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) diff --git a/src/bin/pg_basebackup/nls.mk b/src/bin/pg_basebackup/nls.mk index 7870cea71c..384dbb021e 100644 --- a/src/bin/pg_basebackup/nls.mk +++ b/src/bin/pg_basebackup/nls.mk @@ -15,9 +15,12 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \ streamutil.c \ walmethods.c \ ../../common/compression.c \ + ../../common/controldata_utils.c \ ../../common/fe_memutils.c \ ../../common/file_utils.c \ + ../../common/restricted_token.c \ ../../fe_utils/option_utils.c \ - ../../fe_utils/recovery_gen.c + ../../fe_utils/recovery_gen.c \ + ../../fe_utils/string_utils.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) diff --git a/src/bin/pg_checksums/nls.mk b/src/bin/pg_checksums/nls.mk index f7cd2a5ee9..9f1b5a8b4a 100644 --- a/src/bin/pg_checksums/nls.mk +++ b/src/bin/pg_checksums/nls.mk @@ -2,6 +2,9 @@ CATALOG_NAME = pg_checksums GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \ pg_checksums.c \ + ../../common/controldata_utils.c \ + ../../common/fe_memutils.c \ + ../../common/file_utils.c \ ../../fe_utils/option_utils.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) diff --git a/src/bin/pg_combinebackup/nls.mk b/src/bin/pg_combinebackup/nls.mk index 05f12c682f..55dc173a17 100644 --- a/src/bin/pg_combinebackup/nls.mk +++ b/src/bin/pg_combinebackup/nls.mk @@ -7,9 +7,14 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \ pg_combinebackup.c \ reconstruct.c \ write_manifest.c \ + ../../common/controldata_utils.c \ + ../../common/cryptohash.c \ + ../../common/cryptohash_openssl.c \ ../../common/fe_memutils.c \ + ../../common/file_utils.c \ ../../common/jsonapi.c \ - ../../common/parse_manifest.c + ../../common/parse_manifest.c \ + ../../fe_utils/option_utils.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \ json_token_error:2 \ json_manifest_parse_failure:2 \ diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk index d86c28c404..faa4584842 100644 --- a/src/bin/pg_config/nls.mk +++ b/src/bin/pg_config/nls.mk @@ -1,3 +1,6 @@ # src/bin/pg_config/nls.mk CATALOG_NAME = pg_config -GETTEXT_FILES = pg_config.c ../../common/config_info.c ../../common/exec.c +GETTEXT_FILES = pg_config.c \ + ../../common/config_info.c \ + ../../common/exec.c \ + ../../common/fe_memutils.c diff --git a/src/bin/pg_controldata/nls.mk b/src/bin/pg_controldata/nls.mk index ab34205b96..3e7e018470 100644 --- a/src/bin/pg_controldata/nls.mk +++ b/src/bin/pg_controldata/nls.mk @@ -1,5 +1,7 @@ # src/bin/pg_controldata/nls.mk CATALOG_NAME = pg_controldata -GETTEXT_FILES = pg_controldata.c ../../common/controldata_utils.c +GETTEXT_FILES = pg_controldata.c \ + ../../common/controldata_utils.c \ + ../../common/fe_memutils.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk index fd6355483c..27694a249b 100644 --- a/src/bin/pg_ctl/nls.mk +++ b/src/bin/pg_ctl/nls.mk @@ -1,6 +1,7 @@ # src/bin/pg_ctl/nls.mk CATALOG_NAME = pg_ctl GETTEXT_FILES = pg_ctl.c \ + ../../common/controldata_utils.c \ ../../common/exec.c \ ../../common/fe_memutils.c \ ../../common/wait_error.c \ diff --git a/src/bin/pg_dump/nls.mk b/src/bin/pg_dump/nls.mk index 766ead89c7..b7b77394f0 100644 --- a/src/bin/pg_dump/nls.mk +++ b/src/bin/pg_dump/nls.mk @@ -26,8 +26,10 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \ ../../common/compression.c \ ../../common/exec.c \ ../../common/fe_memutils.c \ + ../../common/file_utils.c \ ../../common/wait_error.c \ - ../../fe_utils/option_utils.c + ../../fe_utils/option_utils.c \ + ../../fe_utils/string_utils.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \ simple_prompt \ ExecuteSqlCommand:3 \ diff --git a/src/bin/pg_resetwal/nls.mk b/src/bin/pg_resetwal/nls.mk index eb5da1c2fc..694d5420a2 100644 --- a/src/bin/pg_resetwal/nls.mk +++ b/src/bin/pg_resetwal/nls.mk @@ -2,6 +2,9 @@ CATALOG_NAME = pg_resetwal GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \ pg_resetwal.c \ + ../../common/controldata_utils.c \ + ../../common/fe_memutils.c \ + ../../common/file_utils.c \ ../../common/restricted_token.c \ ../../fe_utils/option_utils.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) diff --git a/src/bin/pg_rewind/nls.mk b/src/bin/pg_rewind/nls.mk index 36a3993f02..475ed2e416 100644 --- a/src/bin/pg_rewind/nls.mk +++ b/src/bin/pg_rewind/nls.mk @@ -10,11 +10,15 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \ pg_rewind.c \ timeline.c \ xlogreader.c \ + ../../common/controldata_utils.c \ ../../common/fe_memutils.c \ + ../../common/file_utils.c \ ../../common/percentrepl.c \ ../../common/restricted_token.c \ ../../fe_utils/archive.c \ - ../../fe_utils/recovery_gen.c + ../../fe_utils/option_utils.c \ + ../../fe_utils/recovery_gen.c \ + ../../fe_utils/string_utils.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \ report_invalid_record:2 GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \ diff --git a/src/bin/pg_test_fsync/nls.mk b/src/bin/pg_test_fsync/nls.mk index a50782036c..cfe4779071 100644 --- a/src/bin/pg_test_fsync/nls.mk +++ b/src/bin/pg_test_fsync/nls.mk @@ -1,5 +1,5 @@ # src/bin/pg_test_fsync/nls.mk CATALOG_NAME = pg_test_fsync -GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) pg_test_fsync.c +GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) pg_test_fsync.c ../../common/fe_memutils.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) die GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) diff --git a/src/bin/pg_test_timing/nls.mk b/src/bin/pg_test_timing/nls.mk index 331931c591..c1255db64c 100644 --- a/src/bin/pg_test_timing/nls.mk +++ b/src/bin/pg_test_timing/nls.mk @@ -1,3 +1,3 @@ # src/bin/pg_test_timing/nls.mk CATALOG_NAME = pg_test_timing -GETTEXT_FILES = pg_test_timing.c +GETTEXT_FILES = pg_test_timing.c ../../common/fe_memutils.c diff --git a/src/bin/pg_upgrade/nls.mk b/src/bin/pg_upgrade/nls.mk index 06fd40e421..db5aa18013 100644 --- a/src/bin/pg_upgrade/nls.mk +++ b/src/bin/pg_upgrade/nls.mk @@ -14,7 +14,13 @@ GETTEXT_FILES = check.c \ server.c \ tablespace.c \ util.c \ - version.c + version.c \ + ../../common/fe_memutils.c \ + ../../common/file_utils.c \ + ../../common/restricted_token.c \ + ../../common/username.c \ + ../../fe_utils/option_utils.c \ + ../../fe_utils/string_utils.c GETTEXT_TRIGGERS = pg_fatal \ pg_log:2 \ prep_status \ diff --git a/src/bin/pg_verifybackup/nls.mk b/src/bin/pg_verifybackup/nls.mk index 8b8a4ad5ec..6ad078350f 100644 --- a/src/bin/pg_verifybackup/nls.mk +++ b/src/bin/pg_verifybackup/nls.mk @@ -2,6 +2,9 @@ CATALOG_NAME = pg_verifybackup GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \ pg_verifybackup.c \ + ../../common/controldata_utils.c \ + ../../common/cryptohash.c \ + ../../common/cryptohash_openssl.c \ ../../common/fe_memutils.c \ ../../common/jsonapi.c \ ../../common/parse_manifest.c diff --git a/src/bin/pg_waldump/nls.mk b/src/bin/pg_waldump/nls.mk index f2336ddfdf..5932bab2c5 100644 --- a/src/bin/pg_waldump/nls.mk +++ b/src/bin/pg_waldump/nls.mk @@ -3,7 +3,9 @@ CATALOG_NAME = pg_waldump GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \ pg_waldump.c \ xlogreader.c \ - xlogstats.c + xlogstats.c \ + ../../common/fe_memutils.c \ + ../../common/file_utils.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \ report_invalid_record:2 GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \ diff --git a/src/bin/pg_walsummary/nls.mk b/src/bin/pg_walsummary/nls.mk index f411dcfe9e..b22905e447 100644 --- a/src/bin/pg_walsummary/nls.mk +++ b/src/bin/pg_walsummary/nls.mk @@ -1,6 +1,9 @@ # src/bin/pg_combinebackup/nls.mk CATALOG_NAME = pg_walsummary GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \ - pg_walsummary.c + pg_walsummary.c \ + ../../common/fe_memutils.c \ + ../../common/file_utils.c \ + ../../fe_utils/option_utils.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) diff --git a/src/bin/psql/nls.mk b/src/bin/psql/nls.mk index 8624612969..7fd8fedead 100644 --- a/src/bin/psql/nls.mk +++ b/src/bin/psql/nls.mk @@ -19,6 +19,7 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \ ../../fe_utils/cancel.c \ ../../fe_utils/print.c \ ../../fe_utils/psqlscan.c \ + ../../fe_utils/string_utils.c \ ../../common/exec.c \ ../../common/fe_memutils.c \ ../../common/username.c \ diff --git a/src/bin/scripts/nls.mk b/src/bin/scripts/nls.mk index 5fe63fa710..4b358da018 100644 --- a/src/bin/scripts/nls.mk +++ b/src/bin/scripts/nls.mk @@ -16,7 +16,9 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \ ../../fe_utils/connect_utils.c \ ../../fe_utils/option_utils.c \ ../../fe_utils/query_utils.c \ + ../../fe_utils/string_utils.c \ ../../common/fe_memutils.c \ + ../../common/file_utils.c \ ../../common/username.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt yesno_prompt GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)