From 45d58439704a99102c57e2e6324d262440fd57bc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Thu, 1 Jan 2009 19:16:37 +0000
Subject: [PATCH] * modify gettext parameter syntax to skip () so, its now
 <?SOME:TOKEN(12343, _("transateme"), "snaotuh")>

---
 webcit/static/t/preferences.html | 2 +-
 webcit/subst.c                   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/webcit/static/t/preferences.html b/webcit/static/t/preferences.html
index 3b30345c2..222ed05dd 100644
--- 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 e5adac223..f932e10ba 100644
--- 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 {
-- 
2.30.2