"ro_RO",
"sl_SL",
"tr_TR",
+ "ar_AR",
""
};
#endif
/* Keep information about one locale */
-typedef struct _lang_pref{
+typedef struct _lang_pref {
char lang[16]; /* the language locale string */
char region[16]; /* the region locale string */
long priority; /* which priority does it have */
nBest=0;
}
sess->selected_language = nBest;
- syslog(9, "language found: %s", AvailLangLoaded[WC->selected_language]);
+ syslog(LOG_DEBUG, "language found: %s", AvailLangLoaded[WC->selected_language]);
FreeStrBuf(&Buf);
FreeStrBuf(&SBuf);
}
#endif
}
+#ifdef HAVE_USELOCALE
+ locale_t Empty_Locale;
+#endif
/*
* Create a locale_t for each available language
void initialize_locales(void) {
int nLocales;
int i;
+ char buf[32];
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]))
nLocales++;
language = getenv("WEBCIT_LANG");
if ((language) && (!IsEmptyStr(language)) && (strcmp(language, "UNLIMITED") != 0)) {
- syslog(9, "Nailing locale to %s", language);
+ syslog(LOG_INFO, "Nailing locale to %s", language);
}
else language = NULL;
#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);
+ /* create default locale */
+ Empty_Locale = newlocale(LC_ALL_MASK, NULL, NULL);
#endif
- for (i = 1; i < nLocales; ++i) {
+ for (i = 0; i < nLocales; ++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 */
+ }
+ else {
+ sprintf(buf, "%s.UTF8", AvailLang[i]);
+ }
#ifdef HAVE_USELOCALE
wc_locales[nLocalesLoaded] = newlocale(
(LC_MESSAGES_MASK|LC_TIME_MASK),
- AvailLang[i],
- wc_locales[0]
+ buf,
+ (((i > 0) && (wc_locales[0] != NULL)) ? wc_locales[0] : Empty_Locale)
);
if (wc_locales[nLocalesLoaded] == NULL) {
- syslog(1, "locale for %s disabled: %s (domain: %s, path: %s)",
- AvailLang[i],
- strerror(errno),
- textdomain(NULL),
- bindtextdomain(textdomain(NULL), NULL)
- );
+ syslog(LOG_NOTICE, "locale for %s disabled: %s", buf, strerror(errno));
}
else {
- syslog(3, "Found locale: %s", AvailLang[i]);
+ syslog(LOG_INFO, "Found locale: %s", buf);
AvailLangLoaded[nLocalesLoaded] = AvailLang[i];
nLocalesLoaded++;
}
#else
if ((language != NULL) && (strcmp(language, AvailLang[i]) == 0)) {
- setenv("LANG", AvailLang[i], 1);
+ setenv("LANG", buf, 1);
AvailLangLoaded[nLocalesLoaded] = AvailLang[i];
setlocale(LC_MESSAGES, AvailLang[i]);
nLocalesLoaded++;
}
else if (nLocalesLoaded == 0) {
- setenv("LANG", AvailLang[i], 1);
+ setenv("LANG", buf, 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
+ syslog(LOG_WARNING, "Your selected locale [%s] isn't available on your system. falling back to C", 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;
}
+
+#ifdef ENABLE_NLS
+ setlocale(LC_ALL, "");
+ syslog(LOG_DEBUG, "Text domain: %s", textdomain("webcit"));
+ syslog(LOG_DEBUG, "Text domain Charset: %s", bind_textdomain_codeset("webcit", "UTF8"));
+ syslog(LOG_DEBUG, "Message catalog directory: %s", bindtextdomain(textdomain(NULL), LOCALEDIR"/locale"));
+#endif
}
#ifdef HAVE_USELOCALE
int i;
for (i = 0; i < nLocalesLoaded; ++i) {
- freelocale(wc_locales[i]);
+ if (Empty_Locale != wc_locales[i]) {
+ freelocale(wc_locales[i]);
+ }
}
free(wc_locales);
#endif
};
/* dummy for non NLS enabled systems */
+void
+ServerShutdownModule_GETTEXT
+(void)
+{
+}
+
+
void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP)
{
wc_printf("English (US)");