Make formatting in nls.mk files more consistent

Some of the nls.mk files used different indentation or line breaks
than the majority, which makes editing these files unnecessarily
confusing.
pull/163/head
Peter Eisentraut 2 years ago
parent e87e732455
commit 2e810bdb7f
  1. 36
      src/backend/nls.mk
  2. 12
      src/bin/pg_combinebackup/nls.mk
  3. 5
      src/bin/pg_dump/nls.mk
  4. 5
      src/bin/pg_rewind/nls.mk
  5. 17
      src/bin/pg_upgrade/nls.mk
  6. 5
      src/bin/pg_waldump/nls.mk
  7. 13
      src/pl/plpython/nls.mk

@ -2,25 +2,25 @@
CATALOG_NAME = postgres
GETTEXT_FILES = + gettext-files
GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) \
GUC_check_errmsg \
GUC_check_errdetail \
GUC_check_errhint \
write_stderr \
yyerror \
jsonpath_yyerror:3 \
parser_yyerror \
replication_yyerror \
scanner_yyerror \
syncrep_yyerror \
report_invalid_record:2 \
ereport_startup_progress
GUC_check_errmsg \
GUC_check_errdetail \
GUC_check_errhint \
write_stderr \
yyerror \
jsonpath_yyerror:3 \
parser_yyerror \
replication_yyerror \
scanner_yyerror \
syncrep_yyerror \
report_invalid_record:2 \
ereport_startup_progress
GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS) \
GUC_check_errmsg:1:c-format \
GUC_check_errdetail:1:c-format \
GUC_check_errhint:1:c-format \
write_stderr:1:c-format \
report_invalid_record:2:c-format \
ereport_startup_progress:1:c-format
GUC_check_errmsg:1:c-format \
GUC_check_errdetail:1:c-format \
GUC_check_errhint:1:c-format \
write_stderr:1:c-format \
report_invalid_record:2:c-format \
ereport_startup_progress:1:c-format
gettext-files: generated-parser-sources generated-headers
find $(srcdir) $(srcdir)/../common $(srcdir)/../port -name '*.c' -print | LC_ALL=C sort >$@

@ -1,11 +1,11 @@
# src/bin/pg_combinebackup/nls.mk
CATALOG_NAME = pg_combinebackup
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
backup_label.c \
copy_file.c \
load_manifest.c \
pg_combinebackup.c \
reconstruct.c \
write_manifest.c
backup_label.c \
copy_file.c \
load_manifest.c \
pg_combinebackup.c \
reconstruct.c \
write_manifest.c
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

@ -30,6 +30,7 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
../../fe_utils/option_utils.c
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
simple_prompt \
ExecuteSqlCommand:3 warn_or_exit_horribly:2
ExecuteSqlCommand:3 \
warn_or_exit_horribly:2
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
warn_or_exit_horribly:2:c-format
warn_or_exit_horribly:2:c-format

@ -15,6 +15,7 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
../../common/restricted_token.c \
../../fe_utils/archive.c \
../../fe_utils/recovery_gen.c
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) report_invalid_record:2
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
report_invalid_record:2
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
report_invalid_record:2:c-format
report_invalid_record:2:c-format

@ -15,10 +15,13 @@ GETTEXT_FILES = check.c \
tablespace.c \
util.c \
version.c
GETTEXT_TRIGGERS = pg_fatal pg_log:2 prep_status prep_status_progress report_status:2
GETTEXT_FLAGS = \
pg_fatal:1:c-format \
pg_log:2:c-format \
prep_status:1:c-format \
prep_status_progress:1:c-format \
report_status:2:c-format
GETTEXT_TRIGGERS = pg_fatal \
pg_log:2 \
prep_status \
prep_status_progress \
report_status:2
GETTEXT_FLAGS = pg_fatal:1:c-format \
pg_log:2:c-format \
prep_status:1:c-format \
prep_status_progress:1:c-format \
report_status:2:c-format

@ -4,6 +4,7 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
pg_waldump.c \
xlogreader.c \
xlogstats.c
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) report_invalid_record:2
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
report_invalid_record:2
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
report_invalid_record:2:c-format
report_invalid_record:2:c-format

@ -12,9 +12,12 @@ GETTEXT_FILES = plpy_cursorobject.c \
plpy_subxactobject.c \
plpy_typeio.c \
plpy_util.c
GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) PLy_elog:2 PLy_exception_set:2 PLy_exception_set_plural:2,3
GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) \
PLy_elog:2 \
PLy_exception_set:2 \
PLy_exception_set_plural:2,3
GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS) \
PLy_elog:2:c-format \
PLy_exception_set:2:c-format \
PLy_exception_set_plural:2:c-format \
PLy_exception_set_plural:3:c-format
PLy_elog:2:c-format \
PLy_exception_set:2:c-format \
PLy_exception_set_plural:2:c-format \
PLy_exception_set_plural:3:c-format

Loading…
Cancel
Save