GETTEXT: optionaly allow to escape translated tokens.

diff --git a/webcit/gettext.c b/webcit/gettext.c
index d687588336935dc355171d037356f96cbaa7830f..ba4b5f37feb3f74912242b16fc503ca93ce9f7e0 100644 (file)
--- 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 cfb215eb73f8a275349fdf5dfa229d380174d105..ebac8d2ca193ba5dae5a07c0cd99456a0a397fbe 100644 (file)
--- 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 6c80802c220f47fbd70a494d8e693b9e0ff002bf..2ab6e6b407c04dd3ba83924a4cfd2a31297b13e5 100644 (file)
--- 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));