Remove ENABLE_NLS definition. Either we HAVE_USELOCALE or we don't translate at...

[citadel.git] / webcit / gettext.c

diff --git a/webcit/gettext.c b/webcit/gettext.c
index 4df641a28e7ce01f4eb1a8fda82878ae59140fa1..71ede4e0ad2083f58f66a6ae57307d78f6f34758 100644 (file)
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -14,7 +14,7 @@
 #include "webserver.h"
 #define SEARCH_LANG 20         /* how many langs should we parse? */
 
-#ifdef ENABLE_NLS
+#ifdef HAVE_USELOCALE
 /* actual supported locales */
 const char *AvailLang[] = {
        "C",
@@ -46,9 +46,7 @@ const char *AvailLang[] = {
 const char **AvailLangLoaded;
 long nLocalesLoaded = 0;
 
-#ifdef HAVE_USELOCALE
 locale_t *wc_locales; /* here we keep the parsed stuff */
-#endif
 
 /* Keep information about one locale */
 typedef struct _lang_pref{
@@ -209,7 +207,6 @@ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess)
  */
 void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP)
 {
-#ifdef HAVE_USELOCALE
        int i;
 
        wc_printf("<select name=\"language\" id=\"lname\" size=\"1\" onChange=\"switch_to_lang($('lname').value);\">\n");
@@ -223,16 +220,12 @@ void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP)
        }
 
        wc_printf("</select>\n");
-#else
-       wc_printf("%s", (getenv("LANG") ? getenv("LANG") : "C"));
-#endif
 }
 
 /*
  * Set the selected language for this session.
  */
 void set_selected_language(const char *lang) {
-#ifdef HAVE_USELOCALE
        int i;
        for (i = 0; i<nLocalesLoaded; ++i) {
                if (!strcasecmp(lang, AvailLangLoaded[i])) {
@@ -240,34 +233,24 @@ void set_selected_language(const char *lang) {
                        break;
                }
        }
-#endif
 }
 
 /*
  * Activate the selected language for this session.
  */
 void go_selected_language(void) {
-#ifdef HAVE_USELOCALE
        wcsession *WCC = WC;
        if (WCC->selected_language < 0) return;
        uselocale(wc_locales[WCC->selected_language]);  /* switch locales */
        textdomain(textdomain(NULL));                   /* clear the cache */
-#else
-       char *language;
-       
-       language = getenv("LANG");
-       setlocale(LC_MESSAGES, language);
-#endif
 }
 
 /*
  * Deactivate the selected language for this session.
  */
 void stop_selected_language(void) {
-#ifdef HAVE_USELOCALE
        uselocale(LC_GLOBAL_LOCALE);                    /* switch locales */
        textdomain(textdomain(NULL));                   /* clear the cache */
-#endif
 }
 
 
@@ -279,12 +262,10 @@ void initialize_locales(void) {
        int i;
        char *language = NULL;
 
-#ifdef ENABLE_NLS
        setlocale(LC_ALL, "");
        syslog(9, "Text domain: %s", textdomain("webcit"));
        syslog(9, "Message catalog directory: %s", bindtextdomain(textdomain(NULL), LOCALEDIR"/locale"));
        syslog(9, "Text domain Charset: %s", bind_textdomain_codeset("webcit","UTF8"));
-#endif
 
        nLocales = 0; 
        while (!IsEmptyStr(AvailLang[nLocales]))
@@ -298,14 +279,11 @@ void initialize_locales(void) {
 
        AvailLangLoaded = malloc (sizeof(char*) * nLocales);
        memset(AvailLangLoaded, 0, sizeof(char*) * nLocales);
-#ifdef HAVE_USELOCALE
        wc_locales = malloc (sizeof(locale_t) * nLocales);
        memset(wc_locales,0, sizeof(locale_t) * nLocales);
        wc_locales[0] = newlocale(LC_ALL_MASK, NULL, NULL);
-#endif
 
        for (i = 1; i < nLocales; ++i) {
-#ifdef HAVE_USELOCALE
                wc_locales[nLocalesLoaded] = newlocale(
                        (LC_MESSAGES_MASK|LC_TIME_MASK),
                        AvailLang[i],
@@ -324,26 +302,11 @@ void initialize_locales(void) {
                        AvailLangLoaded[nLocalesLoaded] = AvailLang[i];
                        nLocalesLoaded++;
                }
-#else
-               if ((language != NULL) && (strcmp(language, AvailLang[i]) == 0)) {
-                       setenv("LANG", AvailLang[i], 1);
-                       AvailLangLoaded[nLocalesLoaded] = AvailLang[i];
-                       setlocale(LC_MESSAGES, AvailLang[i]);
-                       nLocalesLoaded++;
-               }
-               else if (nLocalesLoaded == 0) {
-                       setenv("LANG", AvailLang[i], 1);
-                       AvailLangLoaded[nLocalesLoaded] = AvailLang[i];
-                       nLocalesLoaded++;
-               }
-#endif
        }
        if ((language != NULL) && (nLocalesLoaded == 0)) {
                syslog(1, "Your selected locale [%s] isn't available on your system. falling back to C", language);
-#ifndef HAVE_USELOCALE
                setlocale(LC_MESSAGES, AvailLang[0]);
                setenv("LANG", AvailLang[0], 1);
-#endif
                AvailLangLoaded[0] = AvailLang[0];
                nLocalesLoaded = 1;
        }
@@ -354,17 +317,15 @@ void
 ServerShutdownModule_GETTEXT
 (void)
 {
-#ifdef HAVE_USELOCALE
        int i;
        for (i = 0; i < nLocalesLoaded; ++i) {
                freelocale(wc_locales[i]);
        }
        free(wc_locales);
-#endif
        free(AvailLangLoaded);
 }
 
-#else  /* ENABLE_NLS */
+#else  /* HAVE_USELOCALE */
 const char *AvailLang[] = {
        "C",
        ""
@@ -388,10 +349,24 @@ void go_selected_language(void) {
 void stop_selected_language(void) {
 }
 
+/* dummy for non NLS enabled systems */
 void initialize_locales(void) {
 }
 
-#endif /* ENABLE_NLS */
+/* dummy for non NLS enabled systems */
+void 
+ServerShutdownModule_GETTEXT
+(void)
+{
+}
+
+
+#endif /* HAVE_USELOCALE */
+
+
+
+
+
 
 
 void TmplGettext(StrBuf *Target, WCTemplputParams *TP)
@@ -405,15 +380,11 @@ void TmplGettext(StrBuf *Target, WCTemplputParams *TP)
  * This function returns a static string, so don't do anything stupid please.
  */
 const char *get_selected_language(void) {
-#ifdef ENABLE_NLS
 #ifdef HAVE_USELOCALE
        return AvailLang[WC->selected_language];
 #else
        return "en";
 #endif
-#else
-       return "en";
-#endif
 }
 
 
@@ -441,7 +412,7 @@ void
 SessionNewModule_GETTEXT
 (wcsession *sess)
 {
-#ifdef ENABLE_NLS
+#ifdef HAVE_USELOCALE
        if (    (sess != NULL)
                && (!sess->Hdr->HR.Static)
                && (sess->Hdr->HR.browser_language != NULL)
@@ -455,7 +426,7 @@ void
 SessionAttachModule_GETTEXT
 (wcsession *sess)
 {
-#ifdef ENABLE_NLS
+#ifdef HAVE_USELOCALE
        go_selected_language();                                 /* set locale */
 #endif
 }
@@ -464,7 +435,7 @@ void
 SessionDestroyModule_GETTEXT
 (wcsession *sess)
 {
-#ifdef ENABLE_NLS
+#ifdef HAVE_USELOCALE
        stop_selected_language();                               /* unset locale */
 #endif
 }