rename wprintf to wc_printf; wchar.h also has a wprintf

[citadel.git] / webcit / gettext.c

diff --git a/webcit/gettext.c b/webcit/gettext.c
index de7edb80143bebccf49a166280238766fe5e87c0..ced6c7ed3e4aa4289f298957e510642bccca8939 100644 (file)
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -180,24 +180,24 @@ void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP)
 
 
        if (nLocalesLoaded == 1) {
-               wprintf("<p>%s</p>", AvailLangLoaded[0]);
+               wc_printf("<p>%s</p>", AvailLangLoaded[0]);
                return;
        }
 
-       wprintf("<select name=\"language\" id=\"lname\" size=\"1\">\n");
+       wc_printf("<select name=\"language\" id=\"lname\" size=\"1\">\n");
 
        for (i=0; i < nLocalesLoaded; ++i) {
 #ifndef HAVE_USELOCALE
                if (strcmp(AvailLangLoaded[i], Lang) == 0)
 #endif
-               wprintf("<option %s value=%s>%s</option>\n",
+               wc_printf("<option %s value=%s>%s</option>\n",
                        ((WC->selected_language == i) ? "selected" : ""),
                        AvailLangLoaded[i],
                        AvailLangLoaded[i]
                );
        }
 
-       wprintf("</select>\n");
+       wc_printf("</select>\n");
 }
 
 /**
@@ -360,8 +360,8 @@ ServerShutdownModule_GETTEXT
                        freelocale(wc_locales[i]);
        }
        free(wc_locales);
-       free(AvailLangLoaded);
 #endif
+       free(AvailLangLoaded);
 }
 
 #else  /* ENABLE_NLS */
@@ -371,7 +371,7 @@ const char *AvailLang[] = {
 /** \brief dummy for non NLS enabled systems */
 void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP)
 {
-       wprintf("English (US)");
+       wc_printf("English (US)");
 }
 
 /** \brief dummy for non NLS enabled systems */
@@ -416,7 +416,7 @@ InitModule_GETTEXT
 (void)
 {
        initialize_locales();
-       RegisterNamespace("LANG:SELECT", 0, 0, tmplput_offer_languages, CTX_NONE);
+       RegisterNamespace("LANG:SELECT", 0, 0, tmplput_offer_languages, NULL, CTX_NONE);
 }