Skip to content

Commit ad8877c

Browse files
committed
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.
1 parent 6ac5600 commit ad8877c

File tree

20 files changed

+62
-13
lines changed

20 files changed

+62
-13
lines changed

src/bin/initdb/nls.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
1212
../../common/username.c \
1313
../../common/wait_error.c \
1414
../../fe_utils/option_utils.c \
15+
../../fe_utils/string_utils.c \
1516
../../port/dirmod.c
1617
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt
1718
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

src/bin/pg_amcheck/nls.mk

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@
22
CATALOG_NAME = pg_amcheck
33
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
44
pg_amcheck.c \
5+
../../common/fe_memutils.c \
6+
../../common/file_utils.c \
7+
../../common/username.c \
58
../../fe_utils/cancel.c \
69
../../fe_utils/connect_utils.c \
710
../../fe_utils/option_utils.c \
8-
../../fe_utils/query_utils.c
11+
../../fe_utils/parallel_slot.c \
12+
../../fe_utils/query_utils.c \
13+
../../fe_utils/string_utils.c
914
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
1015
log_no_match
1116
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \

src/bin/pg_archivecleanup/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# src/bin/pg_archivecleanup/nls.mk
22
CATALOG_NAME = pg_archivecleanup
3-
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) pg_archivecleanup.c
3+
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) pg_archivecleanup.c ../../common/fe_memutils.c
44
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
55
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

src/bin/pg_basebackup/nls.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
1515
streamutil.c \
1616
walmethods.c \
1717
../../common/compression.c \
18+
../../common/controldata_utils.c \
1819
../../common/fe_memutils.c \
1920
../../common/file_utils.c \
21+
../../common/restricted_token.c \
2022
../../fe_utils/option_utils.c \
21-
../../fe_utils/recovery_gen.c
23+
../../fe_utils/recovery_gen.c \
24+
../../fe_utils/string_utils.c
2225
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt
2326
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

src/bin/pg_checksums/nls.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
CATALOG_NAME = pg_checksums
33
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
44
pg_checksums.c \
5+
../../common/controldata_utils.c \
6+
../../common/fe_memutils.c \
7+
../../common/file_utils.c \
58
../../fe_utils/option_utils.c
69
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
710
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

src/bin/pg_combinebackup/nls.mk

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,14 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
77
pg_combinebackup.c \
88
reconstruct.c \
99
write_manifest.c \
10+
../../common/controldata_utils.c \
11+
../../common/cryptohash.c \
12+
../../common/cryptohash_openssl.c \
1013
../../common/fe_memutils.c \
14+
../../common/file_utils.c \
1115
../../common/jsonapi.c \
12-
../../common/parse_manifest.c
16+
../../common/parse_manifest.c \
17+
../../fe_utils/option_utils.c
1318
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
1419
json_token_error:2 \
1520
json_manifest_parse_failure:2 \

src/bin/pg_config/nls.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
# src/bin/pg_config/nls.mk
22
CATALOG_NAME = pg_config
3-
GETTEXT_FILES = pg_config.c ../../common/config_info.c ../../common/exec.c
3+
GETTEXT_FILES = pg_config.c \
4+
../../common/config_info.c \
5+
../../common/exec.c \
6+
../../common/fe_memutils.c

src/bin/pg_controldata/nls.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# src/bin/pg_controldata/nls.mk
22
CATALOG_NAME = pg_controldata
3-
GETTEXT_FILES = pg_controldata.c ../../common/controldata_utils.c
3+
GETTEXT_FILES = pg_controldata.c \
4+
../../common/controldata_utils.c \
5+
../../common/fe_memutils.c
46
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
57
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

src/bin/pg_ctl/nls.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# src/bin/pg_ctl/nls.mk
22
CATALOG_NAME = pg_ctl
33
GETTEXT_FILES = pg_ctl.c \
4+
../../common/controldata_utils.c \
45
../../common/exec.c \
56
../../common/fe_memutils.c \
67
../../common/wait_error.c \

src/bin/pg_dump/nls.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
2626
../../common/compression.c \
2727
../../common/exec.c \
2828
../../common/fe_memutils.c \
29+
../../common/file_utils.c \
2930
../../common/wait_error.c \
30-
../../fe_utils/option_utils.c
31+
../../fe_utils/option_utils.c \
32+
../../fe_utils/string_utils.c
3133
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
3234
simple_prompt \
3335
ExecuteSqlCommand:3 \

0 commit comments

Comments
 (0)