From a4ec41fd6e5840659d79f265aca66669df3c341a Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 23 Jun 2013 16:41:24 +0200
Subject: [PATCH] GETTEXT: optionaly allow to escape translated tokens.

---
 webcit/gettext.c | 5 +++--
 webcit/setup.c   | 4 ++++
 webcit/subst.c   | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/webcit/gettext.c b/webcit/gettext.c
index d68758833..ba4b5f37f 100644
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -427,10 +427,11 @@ void initialize_locales(void) {
 
 #endif	/* ENABLE_NLS */
 
-
 void TmplGettext(StrBuf *Target, WCTemplputParams *TP)
 {
-	StrBufAppendBufPlain(Target, _(TP->Tokens->Params[0]->Start), -1, 0);
+	const char *Text = _(TP->Tokens->Params[0]->Start);
+
+	StrBufAppendTemplateStr(Target, TP, Text, 1);
 }
 
 
diff --git a/webcit/setup.c b/webcit/setup.c
index cfb215eb7..ebac8d2ca 100644
--- a/webcit/setup.c
+++ b/webcit/setup.c
@@ -28,6 +28,10 @@ void RegisterNS(const char *NSName, long len,
 		WCHandlerFunc HandlerFunc,
 		WCPreevalFunc PreEvalFunc,
 		int ContextRequired){}
+void StrBufAppendTemplateStr(StrBuf *Target, 
+			     WCTemplputParams *TP,
+			     const char *Source, 
+			     int FormatTypeIndex){}
 void RegisterHeaderHandler(const char *Name, long Len, Header_Evaluator F){}
 pthread_key_t MyConKey;
 
diff --git a/webcit/subst.c b/webcit/subst.c
index 6c80802c2..2ab6e6b40 100644
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -43,6 +43,7 @@ const char EmptyStr[]="";
 #define SV_PREEVALUATED 6
 
 
+
 /*
  * Dynamic content for variable substitution in templates
  */
@@ -1203,10 +1204,10 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
 		}
 		break;
 	case SV_GETTEXT:
-		if (NewToken->nParameters !=1) {
+		if ((NewToken->nParameters < 1) || (NewToken->nParameters > 2)) {
 			LogTemplateError(                               
 				NULL, "Gettext", ERR_NAME, &TP,
-				"requires exactly 1 parameter, you gave %d params", 
+				"requires 1 or 2 parameter, you gave %d params", 
 				NewToken->nParameters);
 			NewToken->Flags = 0;
 			break;
@@ -2534,7 +2535,6 @@ void tmpl_do_tabbed(StrBuf *Target, WCTemplputParams *TP)
 	{
 ////	TODO jetzt	memcpy (&SubTP, TP, sizeof(WCTemplputParams));
 //		SubTP.Filter.ControlContextType = ;
-
 		StrTabbedDialog(Target, nTabs, TabNames);
 		for (i = 0; i < ntabs; i++) {
 			memset(&TS, 0, sizeof(tab_struct));
-- 
2.30.2