"pt_BR",
"hu_HU",
"et_EE",
+ "ru_RU",
""
};
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");
}
/**
(((i > 0) && (wc_locales[0] != NULL)) ? wc_locales[0] : Empty_Locale)
);
if (wc_locales[nLocalesLoaded] == NULL) {
- lprintf(1, "Error configuring locale for "LOCALEDIR"locale/%s: %s\n",
+ lprintf(1, "locale for "LOCALEDIR"locale/%s: %s; disabled\n",
buf,
strerror(errno)
);
}
else {
- lprintf(3, "Configured available locale: %s\n", buf);
+ lprintf(3, "Found locale: %s\n", buf);
AvailLangLoaded[nLocalesLoaded] = AvailLang[i];
nLocalesLoaded++;
}
#else
- if (language != NULL) {
+ if ((language != NULL) && (strcmp(language, AvailLang[i]) == 0)) {
setenv("LANG", buf, 1);
AvailLangLoaded[nLocalesLoaded] = AvailLang[i];
+ setlocale(LC_MESSAGES, AvailLang[i]);
nLocalesLoaded++;
}
else if (nLocalesLoaded == 0) {
freelocale(wc_locales[i]);
}
free(wc_locales);
- free(AvailLangLoaded);
#endif
+ free(AvailLangLoaded);
}
#else /* ENABLE_NLS */
/** \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 */
#endif
}
+
+void Header_HandleAcceptLanguage(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+ hdr->HR.browser_language = Line;
+}
+
void
InitModule_GETTEXT
(void)
{
initialize_locales();
- RegisterNamespace("LANG:SELECT", 0, 0, tmplput_offer_languages, CTX_NONE);
+
+ RegisterHeaderHandler(HKEY("ACCEPT-LANGUAGE"),
+ Header_HandleAcceptLanguage);
+
+ RegisterNamespace("LANG:SELECT", 0, 0,
+ tmplput_offer_languages, NULL, CTX_NONE);
}
(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);
+ if (!sess->Hdr->HR.Static &&
+ (sess->Hdr->HR.browser_language != NULL)) {
+ httplang_to_locale(sess->Hdr->HR.browser_language, sess);
}
#endif
}