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

diff --git a/webcit/gettext.c b/webcit/gettext.c
index 71ede4e0a..8c749cb27 100644
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -11,13 +11,14 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #define SEARCH_LANG 20		/* how many langs should we parse? */
 
-#ifdef HAVE_USELOCALE
+#ifdef ENABLE_NLS
 /* actual supported locales */
 const char *AvailLang[] = {
-	"C",
+	"en_US",
+	"ar_AE",
 	"bg_BG",
 	"cs_CZ",
 	"en_US",
@@ -31,7 +32,9 @@ const char *AvailLang[] = {
 	"fr_FR",
 	"hu_HU",
 	"it_IT",
+	"ko_KO",
 	"nl_NL",
+	"pl_PL",
 	"pt_BR",
 	"ru_RU",
 	"zh_CN",
@@ -46,10 +49,12 @@ 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{
+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 */
@@ -73,6 +78,7 @@ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess)
 	LangStruct wanted_locales[SEARCH_LANG];
 	LangStruct *ls;
 
+	long len;
 	int i = 0;
 	int j = 0;
 	/* size_t len = strlen(LocaleString); */
@@ -121,22 +127,22 @@ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess)
 		StrBufExtract_token(SBuf, Buf, 0, ';');
 
 		/* get the lang part, which should be allways there */
-		extract_token(&ls->lang[0], 
+		extract_token(ls->lang, 
 			      ChrPtr(SBuf), 
 			      0, '-', 
 			      sizeof(ls->lang));
 
 		/* get the area code if any. */
 		if (StrBufNum_tokens(SBuf, '-') > 1) {
-			extract_token(&ls->region[0], 
+			extract_token(ls->region, 
 				      ChrPtr(SBuf), 
 				      1, '-', 
 				      sizeof(ls->region)
 			);
 		}
 		else { /* no ara code? use lang code */
-			blen=strlen(&ls->lang[0]);
-			memcpy(&ls->region[0], ls->lang, blen);
+			blen = strlen(ls->lang);
+			memcpy(ls->region, ls->lang, blen);
 			ls->region[blen] = '\0';
 		}
 
@@ -148,25 +154,26 @@ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess)
 			chars = toupper(ls->region[j]);
 			ls->region[j] = (char)chars; /* todo ? */
 		}
-		snprintf(&lbuf[0], 
+		snprintf(lbuf,
 			 sizeof(lbuf), 
 			 "%s_%s", 
-			 &ls->lang[0], 
-			 &ls->region[0]);
+			 ls->lang, 
+			 ls->region);
 			
 		/* check if we have this lang */
 		ls->availability = 1;
 		ls->selectedlang = -1;
+		len = strlen(ls->lang);
 		for (j = 0; j < nLocalesLoaded; j++) {
 			int result;
 			/* match against the LANG part */
-			result = strcasecmp(&ls->lang[0], AvailLangLoaded[j]);
-			if ((result < 0) && (result < ls->availability)){
+			result = strncasecmp(ls->lang, AvailLangLoaded[j], len);
+			if ((result == 0) && (result < ls->availability)){
 				ls->availability = result;
 				ls->selectedlang = j;
 			}
 			/* match against lang and locale */
-			if (0 == strcasecmp(&lbuf[0], AvailLangLoaded[j])){
+			if (0 == strcasecmp(lbuf, AvailLangLoaded[j])){
 				ls->availability = 0;
 				ls->selectedlang = j;
 				j = nLocalesLoaded;
@@ -194,7 +201,7 @@ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess)
 		nBest=0;
 	}
 	sess->selected_language = nBest;
-	syslog(9, "language found: %s", AvailLangLoaded[WC->selected_language]);
+	syslog(LOG_DEBUG, "language found: %s", AvailLangLoaded[sess->selected_language]);
 	FreeStrBuf(&Buf);
 	FreeStrBuf(&SBuf);
 }
@@ -208,10 +215,24 @@ 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],
@@ -226,6 +247,7 @@ 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])) {
@@ -233,26 +255,44 @@ 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;
+	if (WCC->selected_language < 0)
+	{
+		httplang_to_locale(WCC->Hdr->HR.browser_language, WCC);
+		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
@@ -260,56 +300,88 @@ 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++;
 
 	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;
 
 	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);
+	/* 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, "C");	/* 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 - %s", buf, AvailLang[i]);
+			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);
+			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);
+		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
 }
 
 
@@ -317,21 +389,32 @@ void
 ServerShutdownModule_GETTEXT
 (void)
 {
+#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
 	free(AvailLangLoaded);
 }
 
-#else	/* HAVE_USELOCALE */
+#else	/* ENABLE_NLS */
 const char *AvailLang[] = {
 	"C",
 	""
 };
 
 /* dummy for non NLS enabled systems */
+void 
+ServerShutdownModule_GETTEXT
+(void)
+{
+}
+
+
 void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP)
 {
 	wc_printf("English (US)");
@@ -349,29 +432,16 @@ void go_selected_language(void) {
 void stop_selected_language(void) {
 }
 
-/* dummy for non NLS enabled systems */
 void initialize_locales(void) {
 }
 
-/* dummy for non NLS enabled systems */
-void 
-ServerShutdownModule_GETTEXT
-(void)
-{
-}
-
-
-#endif	/* HAVE_USELOCALE */
-
-
-
-
-
-
+#endif	/* ENABLE_NLS */
 
 void TmplGettext(StrBuf *Target, WCTemplputParams *TP)
 {
-	StrBufAppendBufPlain(Target, _(TP->Tokens->Params[0]->Start), -1, 0);
+	const char *Text = _(TP->Tokens->Params[0]->Start);
+
+	StrBufAppendTemplateStr(Target, TP, Text, 1);
 }
 
 
@@ -380,8 +450,12 @@ 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];
+	return AvailLangLoaded[WC->selected_language];
+#else
+	return "en";
+#endif
 #else
 	return "en";
 #endif
@@ -412,7 +486,7 @@ void
 SessionNewModule_GETTEXT
 (wcsession *sess)
 {
-#ifdef HAVE_USELOCALE
+#ifdef ENABLE_NLS
 	if (	(sess != NULL)
 		&& (!sess->Hdr->HR.Static)
 		&& (sess->Hdr->HR.browser_language != NULL)
@@ -426,7 +500,7 @@ void
 SessionAttachModule_GETTEXT
 (wcsession *sess)
 {
-#ifdef HAVE_USELOCALE
+#ifdef ENABLE_NLS
 	go_selected_language();					/* set locale */
 #endif
 }
@@ -435,7 +509,7 @@ void
 SessionDestroyModule_GETTEXT
 (wcsession *sess)
 {
-#ifdef HAVE_USELOCALE
+#ifdef ENABLE_NLS
 	stop_selected_language();				/* unset locale */
 #endif
 }