X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fgettext.c;h=4df641a28e7ce01f4eb1a8fda82878ae59140fa1;hb=faa7bc4175fa88b5fd6548b2e92cdc5497dfe692;hp=1a2346378d172c34eae994594c8d1977b1c3b70d;hpb=89ef38f37fe8e06df66cec079512e88ff5821def;p=citadel.git

diff --git a/webcit/gettext.c b/webcit/gettext.c
index 1a2346378..4df641a28 100644
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -1,5 +1,13 @@
 /*
- * $Id$
+ * Copyright (c) 1996-2012 by the citadel.org team
+ *
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "webcit.h"
@@ -10,17 +18,28 @@
 /* actual supported locales */
 const char *AvailLang[] = {
 	"C",
+	"bg_BG",
+	"cs_CZ",
 	"en_US",
+	"da_DK",
 	"de_DE",
-	"it_IT",
-	"es_ES",
+	"el_GR",
 	"en_GB",
-	"da_DK",
+	"es_ES",
+	"et_EE",
+	"fi_FI",
 	"fr_FR",
+	"hu_HU",
+	"it_IT",
 	"nl_NL",
 	"pt_BR",
-	"hu_HU",
-	"et_EE",
+	"ru_RU",
+	"zh_CN",
+ 	"he_IL",
+	"kk_KK",
+	"ro_RO",
+	"sl_SL",
+	"tr_TR",
 	""
 };
 
@@ -28,27 +47,27 @@ const char **AvailLangLoaded;
 long nLocalesLoaded = 0;
 
 #ifdef HAVE_USELOCALE
-locale_t *wc_locales; /**< here we keep the parsed stuff */
+locale_t *wc_locales; /* here we keep the parsed stuff */
 #endif
 
-/** Keep information about one locale */
+/* Keep information about one locale */
 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 */
-	int availability;       /**< do we know it? */
-	int selectedlang;       /**< is this the selected language? */
+	char lang[16];          /* the language locale string */
+	char region[16];        /* the region locale string */
+	long priority;          /* which priority does it have */
+	int availability;       /* do we know it? */
+	int selectedlang;       /* is this the selected language? */
 } LangStruct;
 
-/* \brief parse browser locale header 
- * seems as most browsers just do a one after coma value even if more than 10 locales are available. Sample strings:
+/* parse browser locale header 
+ *
+ * seems as most browsers just do a one after comma value even if more than 10 locales are available. Sample strings:
  * opera: 
  * Accept-Language: sq;q=1.0,de;q=0.9,as;q=0.8,ar;q=0.7,bn;q=0.6,zh-cn;q=0.5,kn;q=0.4,ch;q=0.3,fo;q=0.2,gn;q=0.1,ce;q=0.1,ie;q=0.1 
  * Firefox 
  * Accept-Language: 'de-de,en-us;q=0.7,en;q=0.3' 
  * Accept-Language: de,en-ph;q=0.8,en-us;q=0.5,de-at;q=0.3 
  * Accept-Language: de,en-us;q=0.9,it;q=0.9,de-de;q=0.8,en-ph;q=0.7,de-at;q=0.7,zh-cn;q=0.6,cy;q=0.5,ar-om;q=0.5,en-tt;q=0.4,xh;q=0.3,nl-be;q=0.3,cs;q=0.2,sv;q=0.1,tk;q=0.1 
- * \param LocaleString the string from the browser http headers
  */
 
 void httplang_to_locale(StrBuf *LocaleString, wcsession *sess)
@@ -66,10 +85,10 @@ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess)
 	StrBuf *Buf = NULL;
 	StrBuf *SBuf = NULL;
 
-	nParts=StrBufNum_tokens(LocaleString,',');
-	for (i=0; ((i<nParts)&&(i<SEARCH_LANG)); i++)
+	nParts = StrBufNum_tokens(LocaleString, ',');
+	for (i=0; ((i<nParts) && (i < SEARCH_LANG)); i++)
         {
-		char lbuf[16];
+		char lbuf[32];
 		int blen;
 			
 		if (Buf == NULL) {
@@ -81,148 +100,158 @@ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess)
 			FlushStrBuf(SBuf);
 		}
 
-		ls=&wanted_locales[i];
+		ls = &wanted_locales[i];
 
-		StrBufExtract_token(Buf,LocaleString, i,',');
-		/** we are searching, if this list item has something like ;q=n*/
-		if (StrBufNum_tokens(Buf,'=')>1) {
+		StrBufExtract_token(Buf, LocaleString, i, ',');
+		/* we are searching, if this list item has something like ;q=n*/
+		if (StrBufNum_tokens(Buf, '=') > 1) {
 			int sbuflen, k;
-			StrBufExtract_token(SBuf,Buf, 1,'=');
-			sbuflen=StrLength(SBuf);
-			for (k=0; k<sbuflen; k++) 
-				if (ChrPtr(SBuf)[k]=='.') 
+			StrBufExtract_token(SBuf, Buf, 1, '=');
+			sbuflen = StrLength(SBuf);
+			for (k = 0; k < sbuflen; k++) {
+				if (ChrPtr(SBuf)[k] == '.') {
 					StrBufPeek(SBuf, NULL, k, '0');
-			ls->priority=StrTol(SBuf);
+				}
+			}
+			ls->priority = StrTol(SBuf);
 		}
 		else {
-			ls->priority=1000;
+			ls->priority = 1000;
 		}
-		/** get the locale part */
-		StrBufExtract_token(SBuf ,Buf, 0, ';');
-		/** get the lang part, which should be allways there */
-		extract_token(&ls->lang[0], ChrPtr(SBuf), 0, '-', 16);
-		/** get the area code if any. */
-		if (StrBufNum_tokens(SBuf,'-') > 1) {
-			extract_token(&ls->region[0],ChrPtr(SBuf),1,'-',16);
+
+		/* get the locale part */
+		StrBufExtract_token(SBuf, Buf, 0, ';');
+
+		/* get the lang part, which should be allways there */
+		extract_token(&ls->lang[0], 
+			      ChrPtr(SBuf), 
+			      0, '-', 
+			      sizeof(ls->lang));
+
+		/* get the area code if any. */
+		if (StrBufNum_tokens(SBuf, '-') > 1) {
+			extract_token(&ls->region[0], 
+				      ChrPtr(SBuf), 
+				      1, '-', 
+				      sizeof(ls->region)
+			);
 		}
-		else { /** no ara code? use lang code */
+		else { /* no ara code? use lang code */
 			blen=strlen(&ls->lang[0]);
-			memcpy(&ls->region[0], ls->lang,blen);
-			ls->region[blen]='\0';
-		} /** area codes are uppercase */
-		blen=strlen(&ls->region[0]);
-		for (j=0; j<blen; j++)
+			memcpy(&ls->region[0], ls->lang, blen);
+			ls->region[blen] = '\0';
+		}
+
+		/* area codes are uppercase */
+		blen = strlen(&ls->region[0]);
+		for (j = 0; j < blen; j++)
 		{
-			int chars=toupper(ls->region[j]);
-			ls->region[j]=(char)chars;/** \todo ?! */
+			int chars;
+			chars = toupper(ls->region[j]);
+			ls->region[j] = (char)chars; /* todo ? */
 		}
-		sprintf(&lbuf[0],"%s_%s",&ls->lang[0],&ls->region[0]);
+		snprintf(&lbuf[0], 
+			 sizeof(lbuf), 
+			 "%s_%s", 
+			 &ls->lang[0], 
+			 &ls->region[0]);
 			
-		/** check if we have this lang */
-		ls->availability=1;
-		ls->selectedlang=-1;
-		for (j=0; j<nLocalesLoaded; j++) {
+		/* check if we have this lang */
+		ls->availability = 1;
+		ls->selectedlang = -1;
+		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)){
-				ls->availability=result;
-				ls->selectedlang=j;
+			/* match against the LANG part */
+			result = strcasecmp(&ls->lang[0], AvailLangLoaded[j]);
+			if ((result < 0) && (result < ls->availability)){
+				ls->availability = result;
+				ls->selectedlang = j;
 			}
-			/** match against lang and locale */
-			if (0==strcasecmp(&lbuf[0], AvailLangLoaded[j])){
-				ls->availability=0;
-				ls->selectedlang=j;
-				j=nLocalesLoaded;
+			/* match against lang and locale */
+			if (0 == strcasecmp(&lbuf[0], AvailLangLoaded[j])){
+				ls->availability = 0;
+				ls->selectedlang = j;
+				j = nLocalesLoaded;
 			}
 		}
         }
 	
-	prio=0;
-	av=-1000;
-	nBest=-1;
-	for (i=0; ((i<nParts)&&(i<SEARCH_LANG)); i++) {
-		ls=&wanted_locales[i];
-		if ((ls->availability<=0)&& 
-		   (av<ls->availability)&&
-		   (prio<ls->priority)&&
-		   (ls->selectedlang!=-1)) {
-			nBest=ls->selectedlang;
-			av=ls->availability;
-			prio=ls->priority;
+	prio = 0;
+	av = -1000;
+	nBest = -1;
+	for (i = 0; ((i < nParts) && (i<SEARCH_LANG)); i++) {
+		ls = &wanted_locales[i];
+		if (	(ls->availability <= 0)
+			&& (av < ls->availability)
+			&& (prio < ls->priority)
+			&& (ls->selectedlang != -1)
+		) {
+			nBest = ls->selectedlang;
+			av = ls->availability;
+			prio = ls->priority;
 		}
 	}
 	if (nBest == -1) {
-		/** fall back to C */
+		/* fall back to C */
 		nBest=0;
 	}
-	sess->selected_language=nBest;
-	lprintf(9, "language found: %s\n", AvailLangLoaded[WC->selected_language]);
+	sess->selected_language = nBest;
+	syslog(9, "language found: %s", AvailLangLoaded[WC->selected_language]);
 	FreeStrBuf(&Buf);
 	FreeStrBuf(&SBuf);
 }
 
-/**
- * \brief show the language chooser on the login dialog
+
+/*
+ * show the language chooser on the login dialog
  * depending on the browser locale change the sequence of the 
  * language chooser.
  */
 void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP)
 {
+#ifdef HAVE_USELOCALE
 	int i;
-#ifndef HAVE_USELOCALE
-	char *Lang = getenv("LANG");
-	
-	if (Lang == NULL)
-		Lang = "C";
-#endif
 
-
-	if (nLocalesLoaded == 1) {
-		wprintf("<p>%s</p>", AvailLangLoaded[0]);
-		return;
-	}
-
-	wprintf("<select name=\"language\" id=\"lname\" size=\"1\">\n");
+	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
-		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");
+#else
+	wc_printf("%s", (getenv("LANG") ? getenv("LANG") : "C"));
+#endif
 }
 
-/**
- * \brief Set the selected language for this session.
- * \param lang the locale to set.
+/*
+ * 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) {
+	for (i = 0; i<nLocalesLoaded; ++i) {
 		if (!strcasecmp(lang, AvailLangLoaded[i])) {
 			WC->selected_language = i;
+			break;
 		}
 	}
 #endif
 }
 
-/**
- * \brief Activate the selected language for this session.
+/*
+ * 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 */
+	uselocale(wc_locales[WCC->selected_language]);	/* switch locales */
+	textdomain(textdomain(NULL));			/* clear the cache */
 #else
 	char *language;
 	
@@ -231,30 +260,31 @@ void go_selected_language(void) {
 #endif
 }
 
-/**
- * \brief Deactivate the selected language for this session.
+/*
+ * 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 */
+	uselocale(LC_GLOBAL_LOCALE);			/* switch locales */
+	textdomain(textdomain(NULL));			/* clear the cache */
 #endif
 }
 
-#ifdef HAVE_USELOCALE
-	locale_t Empty_Locale;
-#endif
 
-/**
- * \brief Create a locale_t for each available language
+/*
+ * Create a locale_t for each available language
  */
 void initialize_locales(void) {
 	int nLocales;
 	int i;
-	char buf[32];
 	char *language = NULL;
-	char *locale;
 
+#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]))
@@ -262,7 +292,7 @@ void initialize_locales(void) {
 
 	language = getenv("WEBCIT_LANG");
 	if ((language) && (!IsEmptyStr(language)) && (strcmp(language, "UNLIMITED") != 0)) {
-		lprintf(9, "Nailing locale to %s\n", language);
+		syslog(9, "Nailing locale to %s", language);
  	}
 	else language = NULL;
 
@@ -271,79 +301,52 @@ void initialize_locales(void) {
 #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);
+	wc_locales[0] = newlocale(LC_ALL_MASK, NULL, NULL);
 #endif
 
-
-
-
-	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]);
-		}
+	for (i = 1; i < nLocales; ++i) {
 #ifdef HAVE_USELOCALE
 		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) {
-			lprintf(1, "Error configuring locale for "LOCALEDIR"locale/%s: %s\n",
-				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 {
-			lprintf(3, "Configured available locale: %s\n", buf);
+			syslog(3, "Found locale: %s", AvailLang[i]);
 			AvailLangLoaded[nLocalesLoaded] = AvailLang[i];
 			nLocalesLoaded++;
 		}
 #else
-		if (language != NULL) {
-			setenv("LANG", buf, 1);
+		if ((language != NULL) && (strcmp(language, AvailLang[i]) == 0)) {
+			setenv("LANG", AvailLang[i], 1);
 			AvailLangLoaded[nLocalesLoaded] = AvailLang[i];
+			setlocale(LC_MESSAGES, AvailLang[i]);
 			nLocalesLoaded++;
 		}
 		else if (nLocalesLoaded == 0) {
-			setenv("LANG", buf, 1);
+			setenv("LANG", AvailLang[i], 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
+		syslog(1, "Your selected locale [%s] isn't available on your system. falling back to C", language);
+#ifndef HAVE_USELOCALE
 		setlocale(LC_MESSAGES, AvailLang[0]);
 		setenv("LANG", AvailLang[0], 1);
 #endif
 		AvailLangLoaded[0] = AvailLang[0];
 		nLocalesLoaded = 1;
 	}
-#ifndef HAVE_USELOCALE
-
-
-#endif
-
-#ifdef ENABLE_NLS
-	locale = setlocale(LC_ALL, "");
-
-	lprintf(9, "Message catalog directory: %s\n", bindtextdomain("webcit", LOCALEDIR"/locale"));
-	lprintf(9, "Text domain: %s\n", textdomain("webcit"));
-	lprintf(9, "Text domain Charset: %s\n", bind_textdomain_codeset("webcit","UTF8"));
-
-#endif
 }
 
 
@@ -354,36 +357,40 @@ ServerShutdownModule_GETTEXT
 #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);
-	free(AvailLangLoaded);
 #endif
+	free(AvailLangLoaded);
 }
 
 #else	/* ENABLE_NLS */
 const char *AvailLang[] = {
-	"C", ""};
+	"C",
+	""
+};
 
-/** \brief dummy for non NLS enabled systems */
+/* 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 */
-void set_selected_language(char *lang) {
+/* dummy for non NLS enabled systems */
+void set_selected_language(const char *lang) {
 }
 
-/** \brief dummy for non NLS enabled systems */
+/* dummy for non NLS enabled systems */
 void go_selected_language(void) {
 }
 
-/** \brief dummy for non NLS enabled systems */
+/* dummy for non NLS enabled systems */
 void stop_selected_language(void) {
 }
 
+void initialize_locales(void) {
+}
+
 #endif	/* ENABLE_NLS */
 
 
@@ -409,12 +416,24 @@ const char *get_selected_language(void) {
 #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);
 }
 
 
@@ -423,15 +442,11 @@ 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)
+	if (	(sess != NULL)
+		&& (!sess->Hdr->HR.Static)
+		&& (sess->Hdr->HR.browser_language != NULL)
 	) {
-		StrBuf *accept_language = vLine->Val;
-		httplang_to_locale(accept_language, sess);
+		httplang_to_locale(sess->Hdr->HR.browser_language, sess);
 	}
 #endif
 }