From 7a5a843a2a63636458397823f090d5e28a02b6a4 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sun, 26 Jun 2011 23:50:21 +0300 Subject: [PATCH] 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. --- src/backend/nls.mk | 3 +-- src/nls-global.mk | 8 ++++++++ src/pl/plperl/nls.mk | 2 +- src/pl/plpgsql/src/nls.mk | 2 +- src/pl/plpython/nls.mk | 2 +- src/pl/tcl/nls.mk | 2 +- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/backend/nls.mk b/src/backend/nls.mk index 8d83c41daf..7672d67090 100644 --- 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 784e69a8ed..dda3e29a7a 100644 --- 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 589795cb2b..57846d159f 100644 --- 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 c21dbe0014..98f25ea7e5 100644 --- 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 dcdf619ab6..0fdd234ad2 100644 --- 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 941a75857c..be95c15a04 100644 --- 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) -- 2.11.0