X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fgettext.c;h=71ede4e0ad2083f58f66a6ae57307d78f6f34758;hb=898bab06ba7d6cf04a9b5e41bfcc6319ff3bb8de;hp=3639602e613aae2bc2ad1e95c3193bdca3fd77b4;hpb=307ff84a60b03889b9cd5ff84c29489177f9a39d;p=citadel.git

diff --git a/webcit/gettext.c b/webcit/gettext.c
index 3639602e6..71ede4e0a 100644
--- 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",
@@ -39,15 +39,14 @@ const char *AvailLang[] = {
 	"kk_KK",
 	"ro_RO",
 	"sl_SL",
+	"tr_TR",
 	""
 };
 
 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,24 +208,10 @@ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess)
 void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP)
 {
 	int i;
-#ifndef HAVE_USELOCALE
-	char *Lang = getenv("LANG");
-	
-	if (Lang == NULL)
-		Lang = "C";
-#endif
-
-	if (nLocalesLoaded == 1) {
-		wc_printf("<p>%s</p>", AvailLangLoaded[0]);
-		return;
-	}
 
 	wc_printf("<select name=\"language\" id=\"lname\" size=\"1\" onChange=\"switch_to_lang($('lname').value);\">\n");
 
 	for (i=0; i < nLocalesLoaded; ++i) {
-#ifndef HAVE_USELOCALE
-		if (strcmp(AvailLangLoaded[i], Lang) == 0)
-#endif
 		wc_printf("<option %s value=%s>%s</option>\n",
 			((WC->selected_language == i) ? "selected" : ""),
 			AvailLangLoaded[i],
@@ -241,7 +226,6 @@ void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP)
  * 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])) {
@@ -249,39 +233,26 @@ 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
 }
 
-#ifdef HAVE_USELOCALE
-	locale_t Empty_Locale;
-#endif
 
 /*
  * Create a locale_t for each available language
@@ -289,9 +260,13 @@ void stop_selected_language(void) {
 void initialize_locales(void) {
 	int nLocales;
 	int i;
-	char buf[32];
 	char *language = NULL;
 
+	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"));
+
 	nLocales = 0; 
 	while (!IsEmptyStr(AvailLang[nLocales]))
 		nLocales++;
@@ -304,72 +279,37 @@ 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);
-	/* create default locale */
-	Empty_Locale = newlocale(LC_ALL_MASK, NULL, NULL);
-#endif
+	wc_locales[0] = newlocale(LC_ALL_MASK, NULL, NULL);
 
-	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
+	for (i = 1; i < nLocales; ++i) {
 		wc_locales[nLocalesLoaded] = newlocale(
 			(LC_MESSAGES_MASK|LC_TIME_MASK),
-			buf,
-			(((i > 0) && (wc_locales[0] != NULL)) ? wc_locales[0] : Empty_Locale)
+			AvailLang[i],
+			wc_locales[0]
 		);
 		if (wc_locales[nLocalesLoaded] == NULL) {
-			syslog(1, "locale for %s disabled: %s", buf, strerror(errno));
+			syslog(1, "locale for %s disabled: %s (domain: %s, path: %s)",
+				AvailLang[i],
+				strerror(errno),
+				textdomain(NULL),
+				bindtextdomain(textdomain(NULL), NULL)
+			);
 		}
 		else {
-			syslog(3, "Found locale: %s", buf);
-			AvailLangLoaded[nLocalesLoaded] = AvailLang[i];
-			nLocalesLoaded++;
-		}
-#else
-		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) {
-			setenv("LANG", buf, 1);
+			syslog(3, "Found locale: %s", AvailLang[i]);
 			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);
-#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(9, "Message catalog directory: %s", bindtextdomain("webcit", LOCALEDIR"/locale"));
-	syslog(9, "Text domain: %s", textdomain("webcit"));
-	syslog(9, "Text domain Charset: %s", bind_textdomain_codeset("webcit","UTF8"));
-#endif
 }
 
 
@@ -377,19 +317,15 @@ void
 ServerShutdownModule_GETTEXT
 (void)
 {
-#ifdef HAVE_USELOCALE
 	int i;
 	for (i = 0; i < nLocalesLoaded; ++i) {
-		if (Empty_Locale != wc_locales[i]) {
-			freelocale(wc_locales[i]);
-		}
+		freelocale(wc_locales[i]);
 	}
 	free(wc_locales);
-#endif
 	free(AvailLangLoaded);
 }
 
-#else	/* ENABLE_NLS */
+#else	/* HAVE_USELOCALE */
 const char *AvailLang[] = {
 	"C",
 	""
@@ -413,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)
@@ -430,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
 }
 
 
@@ -466,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)
@@ -480,7 +426,7 @@ void
 SessionAttachModule_GETTEXT
 (wcsession *sess)
 {
-#ifdef ENABLE_NLS
+#ifdef HAVE_USELOCALE
 	go_selected_language();					/* set locale */
 #endif
 }
@@ -489,7 +435,7 @@ void
 SessionDestroyModule_GETTEXT
 (wcsession *sess)
 {
-#ifdef ENABLE_NLS
+#ifdef HAVE_USELOCALE
 	stop_selected_language();				/* unset locale */
 #endif
 }