Refactor common gettext triggers

Put gettext trigger words that are common to the backend and backend
modules into a makefile variable to include everywhere, to avoid
error-prone repetitions.

diff --git a/src/backend/nls.mk b/src/backend/nls.mk
index 8d83c41..7672d67 100644 (file)
--- a/src/backend/nls.mk
+++ b/src/backend/nls.mk
@@ -2,8 +2,7 @@
 CATALOG_NAME     = postgres
 AVAIL_LANGUAGES  = de es fr ja pt_BR tr zh_CN zh_TW
 GETTEXT_FILES    = + gettext-files
-GETTEXT_TRIGGERS = errmsg errmsg_plural:1,2 errdetail errdetail_log \
-    errdetail_plural:1,2 errhint errcontext \
+GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) \
     GUC_check_errmsg GUC_check_errdetail GUC_check_errhint \
     write_stderr yyerror parser_yyerror
 

diff --git a/src/nls-global.mk b/src/nls-global.mk
index 784e69a..dda3e29 100644 (file)
--- a/src/nls-global.mk
+++ b/src/nls-global.mk
@@ -43,6 +43,14 @@ endif
 GETTEXT_TRIGGERS += _
 
 
+# common settings that apply to backend and all backend modules
+BACKEND_COMMON_GETTEXT_TRIGGERS = \
+    errmsg errmsg_plural:1,2 \
+    errdetail errdetail_log errdetail_plural:1,2 \
+    errhint \
+    errcontext
+
+
 all-po: $(MO_FILES)
 
 %.mo: %.po

diff --git a/src/pl/plperl/nls.mk b/src/pl/plperl/nls.mk
index 589795c..57846d1 100644 (file)
--- a/src/pl/plperl/nls.mk
+++ b/src/pl/plperl/nls.mk
@@ -2,4 +2,4 @@
 CATALOG_NAME     = plperl
 AVAIL_LANGUAGES  = de es fr it ja pt_BR ro tr zh_CN zh_TW
 GETTEXT_FILES    = plperl.c SPI.c
-GETTEXT_TRIGGERS = errmsg errmsg_plural:1,2 errdetail errdetail_log errdetail_plural:1,2 errhint errcontext
+GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS)

diff --git a/src/pl/plpgsql/src/nls.mk b/src/pl/plpgsql/src/nls.mk
index c21dbe0..98f25ea 100644 (file)
--- a/src/pl/plpgsql/src/nls.mk
+++ b/src/pl/plpgsql/src/nls.mk
@@ -2,4 +2,4 @@
 CATALOG_NAME     = plpgsql
 AVAIL_LANGUAGES  = de es fr it ja ko pt_BR ro zh_CN zh_TW
 GETTEXT_FILES    = pl_comp.c pl_exec.c pl_gram.c pl_funcs.c pl_handler.c pl_scanner.c
-GETTEXT_TRIGGERS = errmsg errmsg_plural:1,2 errdetail errdetail_log errdetail_plural:1,2 errhint errcontext yyerror plpgsql_yyerror
+GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) yyerror plpgsql_yyerror

diff --git a/src/pl/plpython/nls.mk b/src/pl/plpython/nls.mk
index dcdf619..0fdd234 100644 (file)
--- a/src/pl/plpython/nls.mk
+++ b/src/pl/plpython/nls.mk
@@ -2,4 +2,4 @@
 CATALOG_NAME     = plpython
 AVAIL_LANGUAGES  = de es fr it ja pt_BR ro tr zh_CN zh_TW
 GETTEXT_FILES    = plpython.c
-GETTEXT_TRIGGERS = errmsg errmsg_plural:1,2 errdetail errdetail_log errdetail_plural:1,2 errhint errcontext 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

diff --git a/src/pl/tcl/nls.mk b/src/pl/tcl/nls.mk
index 941a758..be95c15 100644 (file)
--- a/src/pl/tcl/nls.mk
+++ b/src/pl/tcl/nls.mk
@@ -2,4 +2,4 @@
 CATALOG_NAME     = pltcl
 AVAIL_LANGUAGES  = de es fr it ja pt_BR ro tr zh_CN zh_TW
 GETTEXT_FILES    = pltcl.c
-GETTEXT_TRIGGERS = errmsg errmsg_plural:1,2 errdetail errdetail_log errdetail_plural:1,2 errhint errcontext
+GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS)