* SessionNewModule_GETTEXT() was expecting a StrBuf but getting a OneHTTPHeader,...

[citadel.git] / webcit / gettext.c

diff --git a/webcit/gettext.c b/webcit/gettext.c
index 917ee4bd30508f8159482cde961798279c4bdda3..12a1bc99d5eada96ece2870d9bffd8ec2d4d67da 100644 (file)
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -47,7 +47,7 @@ typedef struct _lang_pref{
  * \param LocaleString the string from the browser http headers
  */
 
-void httplang_to_locale(StrBuf *LocaleString)
+void httplang_to_locale(StrBuf *LocaleString, wcsession *sess)
 {
        LangStruct wanted_locales[SEARCH_LANG];
        LangStruct *ls;
@@ -61,7 +61,7 @@ void httplang_to_locale(StrBuf *LocaleString)
        int nParts;
        StrBuf *Buf = NULL;
        StrBuf *SBuf = NULL;
-       
+
        nParts=StrBufNum_tokens(LocaleString,',');
        for (i=0; ((i<nParts)&&(i<SEARCH_LANG)); i++)
         {
@@ -152,7 +152,7 @@ void httplang_to_locale(StrBuf *LocaleString)
                /** fall back to C */
                nBest=0;
        }
-       WC->selected_language=nBest;
+       sess->selected_language=nBest;
        lprintf(9, "language found: %s\n", AvailLangLoaded[WC->selected_language]);
        FreeStrBuf(&Buf);
        FreeStrBuf(&SBuf);
@@ -173,6 +173,12 @@ void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP)
                Lang = "C";
 #endif
 
+
+       if (nLocalesLoaded == 1) {
+               wprintf("<p>%s</p>", AvailLangLoaded[0]);
+               return;
+       }
+
        wprintf("<select name=\"language\" id=\"lname\" size=\"1\">\n");
 
        for (i=0; i < nLocalesLoaded; ++i) {
@@ -194,9 +200,8 @@ void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP)
  * \param lang the locale to set.
  */
 void set_selected_language(const char *lang) {
-       int i;
-
 #ifdef HAVE_USELOCALE
+       int i;
        for (i=0; i<nLocalesLoaded; ++i) {
                if (!strcasecmp(lang, AvailLangLoaded[i])) {
                        WC->selected_language = i;
@@ -232,19 +237,6 @@ void stop_selected_language(void) {
 #endif
 }
 
-void preset_locale(void)
-{
-#ifdef HAVE_GETTEXT
-       char *language;
-       
-       language = getenv("WEBCIT_LANG");
-       if ((language) && (!IsEmptyStr(language)) && (strcmp(language, "UNLIMITED") != 0)) {
-               lprintf(9, "Nailing locale to %s\n", language);
-               setlocale(LC_MESSAGES, language);
-       }
-#endif
-}
-
 #ifdef HAVE_USELOCALE
        locale_t Empty_Locale;
 #endif
@@ -255,13 +247,25 @@ void preset_locale(void)
 void initialize_locales(void) {
        int i;
        char buf[32];
+       char *language = NULL;
+       
+       language = getenv("WEBCIT_LANG");
+       if ((language) && (!IsEmptyStr(language)) && (strcmp(language, "UNLIMITED") != 0)) {
+               lprintf(9, "Nailing locale to %s\n", language);
+       }
+       else language = NULL;
 
 #ifdef HAVE_USELOCALE
        /* create default locale */
        Empty_Locale = newlocale(LC_ALL_MASK, NULL, NULL);
 #endif
 
+
+
+
        for (i = 0; i < NUM_LANGS; ++i) {
+               if ((language != NULL) && (strcmp(AvailLang[i], language) != 0))
+                       continue;
                if (i == 0) {
                        sprintf(buf, "%s", AvailLang[i]);       /* locale 0 (C) is ascii, not utf-8 */
                }
@@ -285,15 +289,45 @@ void initialize_locales(void) {
                        AvailLangLoaded[nLocalesLoaded] = AvailLang[i];
                        nLocalesLoaded++;
                }
+#else
+               if (language != NULL) {
+                       setenv("LANG", buf, 1);
+                       AvailLangLoaded[nLocalesLoaded] = AvailLang[i];
+                       nLocalesLoaded++;
+               }
+               else if (nLocalesLoaded == 0) {
+                       setenv("LANG", buf, 1);
+                       AvailLangLoaded[nLocalesLoaded] = AvailLang[i];
+                       nLocalesLoaded++;
+               }
 #endif
        }
+       if ((language != NULL) && (nLocalesLoaded == 0)) {
+               lprintf(1, "Your selected locale [%s] isn't available on your system. falling back to C\n", language);
+#ifdef HAVE_USELOCALE
+               wc_locales[0] = newlocale(
+                       (LC_MESSAGES_MASK|LC_TIME_MASK),
+                       AvailLang[0],
+                       Empty_Locale);          
+#else
+               setlocale(LC_MESSAGES, AvailLang[0]);
+               setenv("LANG", AvailLang[0], 1);
+#endif
+               AvailLangLoaded[0] = AvailLang[0];
+               nLocalesLoaded = 1;
+       }
+#ifndef HAVE_USELOCALE
+
+
+#endif
+
 }
 
 
 void ShutdownLocale(void)
 {
-       int i;
 #ifdef HAVE_USELOCALE
+       int i;
        for (i = 0; i < nLocalesLoaded; ++i) {
                if (Empty_Locale != wc_locales[i])
                        freelocale(wc_locales[i]);
@@ -323,9 +357,6 @@ void go_selected_language(void) {
 void stop_selected_language(void) {
 }
 
-void preset_locale(void)
-{
-}
 #endif /* ENABLE_NLS */
 
 
@@ -344,10 +375,10 @@ const char *get_selected_language(void) {
 #ifdef HAVE_USELOCALE
        return AvailLang[WC->selected_language];
 #else
-       return "en"
+       return "en";
 #endif
 #else
-       return "en"
+       return "en";
 #endif
 }
 
@@ -357,3 +388,40 @@ InitModule_GETTEXT
 {
        RegisterNamespace("LANG:SELECT", 0, 0, tmplput_offer_languages, CTX_NONE);
 }
+
+
+void
+SessionNewModule_GETTEXT
+(wcsession *sess)
+{
+#ifdef ENABLE_NLS
+       OneHttpHeader *vLine = NULL;
+
+       if (    (sess->Hdr->HTTPHeaders != NULL)
+               && GetHash(sess->Hdr->HTTPHeaders, HKEY("ACCEPT-LANGUAGE"), (void *)&vLine)
+               && (vLine != NULL)
+               && (vLine->Val != NULL)
+       ) {
+               StrBuf *accept_language = vLine->Val;
+               httplang_to_locale(accept_language, sess);
+       }
+#endif
+}
+
+void
+SessionAttachModule_GETTEXT
+(wcsession *sess)
+{
+#ifdef ENABLE_NLS
+       go_selected_language();                                 /* set locale */
+#endif
+}
+
+void 
+SessionDestroyModule_GETTEXT
+(wcsession *sess)
+{
+#ifdef ENABLE_NLS
+       stop_selected_language();                               /* unset locale */
+#endif
+}