* modify gettext parameter syntax to skip () so, its now <?SOME:TOKEN(12343, _("trans...

diff --git a/webcit/static/t/preferences.html b/webcit/static/t/preferences.html
index 3b30345c24fce58216f236546439380b2e33f020..222ed05dda4adc24c12ece228e576ab3782f676a 100644 (file)
--- a/webcit/static/t/preferences.html
+++ b/webcit/static/t/preferences.html
@@ -4,6 +4,6 @@
 <div id="banner">
 </div>
 <div id="content" class="service">
-<?DOBOXED("box_preferences", _"Preferences and settings")>
+<?DOBOXED("box_preferences", _("Preferences and settings"))>
 </div>
 <?=("trailing")>

diff --git a/webcit/subst.c b/webcit/subst.c
index e5adac22356bfa3108d74bbeda44ce8c55007ffd..f932e10ba8e43a06d03b8298abf9bf7725a26004 100644 (file)
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -743,6 +743,8 @@ TemplateParam *GetNextParameter(StrBuf *Buf, const char **pCh, const char *pe, W
        else if (*pch == '_') {
                Parm->Type = TYPE_GETTEXT;
                pch ++;
+               if (*pch == '(')
+                       pch ++;
        }
        else if (*pch == 'B') {
                Parm->Type = TYPE_BSTR;
@@ -784,6 +786,10 @@ TemplateParam *GetNextParameter(StrBuf *Buf, const char **pCh, const char *pe, W
                        Parm->Start = pchs;
                        Parm->len = pche - pchs;
                        pch ++; /* move after trailing quote */
+                       if ((Parm->Type = TYPE_GETTEXT) && (*pch == ')')) {
+                               pch ++;
+                       }
+
                }
        }
        else {