Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
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

+1
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

+6-1
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

+1-1
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

+4-1
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

+3
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

+6-1
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

+4-1
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

+3-1
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

+1
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

+3-1
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 \

src/bin/pg_resetwal/nls.mk

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
CATALOG_NAME = pg_resetwal
33
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
44
pg_resetwal.c \
5+
../../common/controldata_utils.c \
6+
../../common/fe_memutils.c \
7+
../../common/file_utils.c \
58
../../common/restricted_token.c \
69
../../fe_utils/option_utils.c
710
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)

src/bin/pg_rewind/nls.mk

+5-1
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
1010
pg_rewind.c \
1111
timeline.c \
1212
xlogreader.c \
13+
../../common/controldata_utils.c \
1314
../../common/fe_memutils.c \
15+
../../common/file_utils.c \
1416
../../common/percentrepl.c \
1517
../../common/restricted_token.c \
1618
../../fe_utils/archive.c \
17-
../../fe_utils/recovery_gen.c
19+
../../fe_utils/option_utils.c \
20+
../../fe_utils/recovery_gen.c \
21+
../../fe_utils/string_utils.c
1822
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
1923
report_invalid_record:2
2024
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \

src/bin/pg_test_fsync/nls.mk

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

src/bin/pg_test_timing/nls.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# src/bin/pg_test_timing/nls.mk
22
CATALOG_NAME = pg_test_timing
3-
GETTEXT_FILES = pg_test_timing.c
3+
GETTEXT_FILES = pg_test_timing.c ../../common/fe_memutils.c

src/bin/pg_upgrade/nls.mk

+7-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,13 @@ GETTEXT_FILES = check.c \
1414
server.c \
1515
tablespace.c \
1616
util.c \
17-
version.c
17+
version.c \
18+
../../common/fe_memutils.c \
19+
../../common/file_utils.c \
20+
../../common/restricted_token.c \
21+
../../common/username.c \
22+
../../fe_utils/option_utils.c \
23+
../../fe_utils/string_utils.c
1824
GETTEXT_TRIGGERS = pg_fatal \
1925
pg_log:2 \
2026
prep_status \

src/bin/pg_verifybackup/nls.mk

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
CATALOG_NAME = pg_verifybackup
33
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
44
pg_verifybackup.c \
5+
../../common/controldata_utils.c \
6+
../../common/cryptohash.c \
7+
../../common/cryptohash_openssl.c \
58
../../common/fe_memutils.c \
69
../../common/jsonapi.c \
710
../../common/parse_manifest.c

src/bin/pg_waldump/nls.mk

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ CATALOG_NAME = pg_waldump
33
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
44
pg_waldump.c \
55
xlogreader.c \
6-
xlogstats.c
6+
xlogstats.c \
7+
../../common/fe_memutils.c \
8+
../../common/file_utils.c
79
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
810
report_invalid_record:2
911
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \

src/bin/pg_walsummary/nls.mk

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# src/bin/pg_combinebackup/nls.mk
22
CATALOG_NAME = pg_walsummary
33
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
4-
pg_walsummary.c
4+
pg_walsummary.c \
5+
../../common/fe_memutils.c \
6+
../../common/file_utils.c \
7+
../../fe_utils/option_utils.c
58
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
69
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

src/bin/psql/nls.mk

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
1919
../../fe_utils/cancel.c \
2020
../../fe_utils/print.c \
2121
../../fe_utils/psqlscan.c \
22+
../../fe_utils/string_utils.c \
2223
../../common/exec.c \
2324
../../common/fe_memutils.c \
2425
../../common/username.c \

src/bin/scripts/nls.mk

+2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
1616
../../fe_utils/connect_utils.c \
1717
../../fe_utils/option_utils.c \
1818
../../fe_utils/query_utils.c \
19+
../../fe_utils/string_utils.c \
1920
../../common/fe_memutils.c \
21+
../../common/file_utils.c \
2022
../../common/username.c
2123
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt yesno_prompt
2224
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

0 commit comments

Comments
 (0)