GETTEXT: optionaly allow to escape translated tokens.

[citadel.git] / webcit / gettext.c

diff --git a/webcit/gettext.c b/webcit/gettext.c
index da7890239e527fcd0f05640b14f536cf2f574a99..ba4b5f37feb3f74912242b16fc503ca93ce9f7e0 100644 (file)
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -18,7 +18,7 @@
 /* actual supported locales */
 const char *AvailLang[] = {
        "C",
-       "ar_AR",
+       "ar_AE",
        "bg_BG",
        "cs_CZ",
        "en_US",
@@ -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);
 }
 
 
@@ -441,7 +442,7 @@ void TmplGettext(StrBuf *Target, WCTemplputParams *TP)
 const char *get_selected_language(void) {
 #ifdef ENABLE_NLS
 #ifdef HAVE_USELOCALE
-       return AvailLang[WC->selected_language];
+       return AvailLangLoaded[WC->selected_language];
 #else
        return "en";
 #endif