* add gettext tokens to the tabbed api

[citadel.git] / webcit / subst.c

diff --git a/webcit/subst.c b/webcit/subst.c
index f932e10ba8e43a06d03b8298abf9bf7725a26004..a43cdcffdd96bd70a00c9ae5af07ee8c36264048 100644 (file)
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -1795,10 +1795,20 @@ void tmpl_do_tabbed(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Co
        TabNames = (StrBuf **) malloc(ntabs * sizeof(StrBuf*));
 
        for (i = 0; i < ntabs; i++) {
-               TabNames[i] = NewStrBuf();
-               if (Tokens->Params[i * 2]->len > 0) {
+               if ((Tokens->Params[i * 2]->Type == TYPE_STR) &&
+                   (Tokens->Params[i * 2]->len > 0)) {
+                       TabNames[i] = NewStrBuf();
                        DoTemplate(TKEY(i * 2), TabNames[i], Context, ContextType);
                }
+               else if (Tokens->Params[i * 2]->Type == TYPE_GETTEXT) {
+                       const char *Ch;
+                       long len;
+                       GetTemplateTokenString(Tokens, 
+                                              i * 2,
+                                              &Ch,
+                                              &len);
+                       TabNames[i] = NewStrBufPlain(Ch, -1);
+               }
                else { 
                        /** A Tab without subject? we can't count that, add it as silent */
                        nTabs --;
@@ -1808,7 +1818,6 @@ void tmpl_do_tabbed(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Co
        StrTabbedDialog(Target, nTabs, TabNames);
        for (i = 0; i < ntabs; i++) {
                StrBeginTab(Target, i, nTabs);
-
                DoTemplate(TKEY(i * 2 + 1), Target, Context, ContextType);
                StrEndTab(Target, i, nTabs);
        }