X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fgettext.c;h=f3472b3617779f02e2826fb35dd62b38985b05a0;hb=27e6a22f021cffe2cee1a41accbf9d2f78b20dab;hp=1402983c01865e0e15c9b80eec1cf7403df65de6;hpb=47bcaaabae789a2f20de958b84714ff2e23dc5bb;p=citadel.git

diff --git a/webcit/gettext.c b/webcit/gettext.c
index 1402983c0..f3472b361 100644
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -6,10 +6,6 @@
 #include "webserver.h"
 
 #ifdef ENABLE_NLS
-
-#define NUM_LANGS 10		/* how many different locales do we know? */
-#define SEARCH_LANG 20		/* how many langs should we parse? */
-
 /* actual supported locales */
 const char *AvailLang[NUM_LANGS] = {
 	"C",
@@ -64,7 +60,7 @@ void httplang_to_locale(StrBuf *LocaleString)
 	int nBest;
 	int nParts;
 	StrBuf *Buf = NULL;
-	StrBuf *SBuf;
+	StrBuf *SBuf = NULL;
 	
 	nParts=StrBufNum_tokens(LocaleString,',');
 	for (i=0; ((i<nParts)&&(i<SEARCH_LANG)); i++)
@@ -162,50 +158,13 @@ void httplang_to_locale(StrBuf *LocaleString)
 	FreeStrBuf(&SBuf);
 }
 
-/* TODO: we skip the language weighting so far. */
-/* 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 */
-//void httplang_to_locale(char *LocaleString)
-//{
-//	char selected_locale[16];
-//	int i, j;
-//	char lang[64];
-//	int num_accept = 0;
-//
-//	lprintf(9, "languageAccept: %s\n", LocaleString);
-//
-//	strcpy(selected_locale, "C");
-//	num_accept = num_tokens(LocaleString, ',');
-//
-//	for (i=num_accept-1; i>=0; --i) {
-//		extract_token(lang, LocaleString, i, ',', sizeof lang);
-//
-//		/* Strip out the weights; we don't use them.  Also convert
-//		 * hyphens to underscores.
-//		 */
-//		for (j=0; j<strlen(lang); ++j) {
-//			if (lang[j] == '-') lang[j] = '_';
-//			if (lang[j] == ';') lang[j] = 0;
-//		}
-//
-//		for (j=0; j<NUM_LANGS; ++j) {
-//			if (!strncasecmp(lang, AvailLang[j], strlen(lang))) {
-//				strcpy(selected_locale, AvailLang[j]);
-//			}
-//		}
-//	}
-//
-//	lprintf(9, "language found: %s\n", selected_locale);
-//	set_selected_language(selected_locale);
-//}
-
-
 /**
  * \brief show the language chooser on the login dialog
  * depending on the browser locale change the sequence of the 
  * language chooser.
  */
-void offer_languages(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) {
+void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP)
+{
 	int i;
 #ifndef HAVE_USELOCALE
 	char *Lang = getenv("LANG");
@@ -214,6 +173,12 @@ void offer_languages(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *C
 		Lang = "C";
 #endif
 
+
+	if (nLocalesLoaded == 1) {
+		wprintf("<p>%s</p>", AvailLangLoaded[0]);
+		return;
+	}
+
 	wprintf("<select name=\"language\" id=\"lname\" size=\"1\">\n");
 
 	for (i=0; i < nLocalesLoaded; ++i) {
@@ -235,9 +200,8 @@ void offer_languages(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *C
  * \param lang the locale to set.
  */
 void set_selected_language(const char *lang) {
-	int i;
-
 #ifdef HAVE_USELOCALE
+	int i;
 	for (i=0; i<nLocalesLoaded; ++i) {
 		if (!strcasecmp(lang, AvailLangLoaded[i])) {
 			WC->selected_language = i;
@@ -251,7 +215,7 @@ void set_selected_language(const char *lang) {
  */
 void go_selected_language(void) {
 #ifdef HAVE_USELOCALE
-	struct wcsession *WCC = WC;
+	wcsession *WCC = WC;
 	if (WCC->selected_language < 0) return;
 	uselocale(wc_locales[WCC->selected_language]);	/** switch locales */
 	textdomain(textdomain(NULL));			/** clear the cache */
@@ -273,19 +237,6 @@ void stop_selected_language(void) {
 #endif
 }
 
-void preset_locale(void)
-{
-#ifndef HAVE_USELOCALE
-#ifdef HAVE_GETTEXT
-	char *language;
-	
-	lprintf(9, "Nailing locale to %s\n", getenv("LANG"));
-	language = getenv("LANG");
-	setlocale(LC_MESSAGES, language);
-#endif
-#endif
-}
-
 #ifdef HAVE_USELOCALE
 	locale_t Empty_Locale;
 #endif
@@ -296,15 +247,27 @@ void preset_locale(void)
 void initialize_locales(void) {
 	int i;
 	char buf[32];
+	char *language = NULL;
+	
+	language = getenv("WEBCIT_LANG");
+	if ((language) && (!IsEmptyStr(language)) && (strcmp(language, "UNLIMITED") != 0)) {
+		lprintf(9, "Nailing locale to %s\n", language);
+ 	}
+	else language = NULL;
 
 #ifdef HAVE_USELOCALE
 	/* create default locale */
 	Empty_Locale = newlocale(LC_ALL_MASK, NULL, NULL);
 #endif
 
+
+
+
 	for (i = 0; i < NUM_LANGS; ++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
+			sprintf(buf, "%s", AvailLang[i]);	/* locale 0 (C) is ascii, not utf-8 */
 		}
 		else {
 			sprintf(buf, "%s.UTF8", AvailLang[i]);
@@ -326,15 +289,45 @@ void initialize_locales(void) {
 			AvailLangLoaded[nLocalesLoaded] = AvailLang[i];
 			nLocalesLoaded++;
 		}
+#else
+		if (language != NULL) {
+			setenv("LANG", buf, 1);
+			AvailLangLoaded[nLocalesLoaded] = AvailLang[i];
+			nLocalesLoaded++;
+		}
+		else if (nLocalesLoaded == 0) {
+			setenv("LANG", buf, 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
+		setlocale(LC_MESSAGES, AvailLang[0]);
+		setenv("LANG", AvailLang[0], 1);
 #endif
+		AvailLangLoaded[0] = AvailLang[0];
+		nLocalesLoaded = 1;
 	}
+#ifndef HAVE_USELOCALE
+
+
+#endif
+
 }
 
 
 void ShutdownLocale(void)
 {
-	int i;
 #ifdef HAVE_USELOCALE
+	int i;
 	for (i = 0; i < nLocalesLoaded; ++i) {
 		if (Empty_Locale != wc_locales[i])
 			freelocale(wc_locales[i]);
@@ -343,8 +336,12 @@ void ShutdownLocale(void)
 }
 
 #else	/* ENABLE_NLS */
+const char *AvailLang[NUM_LANGS] = {
+	"C"};
+
 /** \brief dummy for non NLS enabled systems */
-void offer_languages(void) {
+void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP)
+{
 	wprintf("English (US)");
 }
 
@@ -360,15 +357,12 @@ void go_selected_language(void) {
 void stop_selected_language(void) {
 }
 
-void preset_locale(void)
-{
-}
 #endif	/* ENABLE_NLS */
 
 
-void TmplGettext(StrBuf *Target, int nTokens, WCTemplateToken *Tokens)
+void TmplGettext(StrBuf *Target, WCTemplputParams *TP)
 {
-	StrBufAppendBufPlain(Target, _(Tokens->Params[0]->Start), -1, 0);
+	StrBufAppendBufPlain(Target, _(TP->Tokens->Params[0]->Start), -1, 0);
 }
 
 
@@ -381,11 +375,50 @@ const char *get_selected_language(void) {
 #ifdef HAVE_USELOCALE
 	return AvailLang[WC->selected_language];
 #else
-	return "en"
+	return "en";
 #endif
 #else
-	return "en"
+	return "en";
+#endif
+}
+
+void 
+InitModule_GETTEXT
+(void)
+{
+	RegisterNamespace("LANG:SELECT", 0, 0, tmplput_offer_languages, CTX_NONE);
+}
+
+
+void
+SessionNewModule_GETTEXT
+(wcsession *sess)
+{
+#ifdef ENABLE_NLS
+	void *vLine;
+	
+	if (GetHash(WC->headers, HKEY("ACCEPT-LANGUAGE"), &vLine) && 
+	    (vLine != NULL)) {
+		StrBuf *accept_language = (StrBuf*) vLine;
+		httplang_to_locale(accept_language);
+	}
 #endif
 }
 
+void
+SessionAttachModule_GETTEXT
+(wcsession *sess)
+{
+#ifdef ENABLE_NLS
+	go_selected_language();					/* set locale */
+#endif
+}
 
+void 
+SessionDestroyModule_GETTEXT
+(wcsession *sess)
+{
+#ifdef ENABLE_NLS
+	stop_selected_language();				/* unset locale */
+#endif
+}