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

diff --git a/webcit/gettext.c b/webcit/gettext.c
index f044ab6ac..1402983c0 100644
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -11,7 +11,7 @@
 #define SEARCH_LANG 20		/* how many langs should we parse? */
 
 /* actual supported locales */
-char *AvailLang[NUM_LANGS] = {
+const char *AvailLang[NUM_LANGS] = {
 	"C",
 	"en_US",
 	"de_DE",
@@ -24,6 +24,9 @@ char *AvailLang[NUM_LANGS] = {
 	"pt_BR"
 };
 
+const char *AvailLangLoaded[NUM_LANGS];
+long nLocalesLoaded = 0;
+
 #ifdef HAVE_USELOCALE
 locale_t wc_locales[NUM_LANGS]; /**< here we keep the parsed stuff */
 #endif
@@ -48,7 +51,7 @@ typedef struct _lang_pref{
  * \param LocaleString the string from the browser http headers
  */
 
-void httplang_to_locale(char *LocaleString)
+void httplang_to_locale(StrBuf *LocaleString)
 {
 	LangStruct wanted_locales[SEARCH_LANG];
 	LangStruct *ls;
@@ -60,70 +63,79 @@ void httplang_to_locale(char *LocaleString)
 	int av;
 	int nBest;
 	int nParts;
-	char search[1024];
+	StrBuf *Buf = NULL;
+	StrBuf *SBuf;
 	
-	safestrncpy(search, LocaleString, sizeof search);
-	nParts=num_tokens(search,',');
+	nParts=StrBufNum_tokens(LocaleString,',');
 	for (i=0; ((i<nParts)&&(i<SEARCH_LANG)); i++)
         {
-			char buf[16];
-			char sbuf[16];
-			char lbuf[16];
-			int blen;
+		char lbuf[16];
+		int blen;
 			
-			ls=&wanted_locales[i];
-
-			extract_token(&buf[0],search, i,',',16);
-			/** we are searching, if this list item has something like ;q=n*/
-			if (num_tokens(&buf[0],'=')>1) {
-				int sbuflen, k;
-				extract_token(&sbuf[0],&buf[0], 1,'=',16);
-				sbuflen=strlen(&sbuf[0]);
-				for (k=0; k<sbuflen; k++) if (sbuf[k]=='.') sbuf[k]='0';
-				ls->priority=atol(&sbuf[0]);
-			}
-			else {
-				ls->priority=1000;
-			}
-			/** get the locale part */
-			extract_token(&sbuf[0],&buf[0],0,';',16);
-			/** get the lang part, which should be allways there */
-			extract_token(&ls->lang[0],&sbuf[0],0,'-',16);
-			/** get the area code if any. */
-			if (num_tokens(&sbuf[0],'-')>1) {
-				extract_token(&ls->region[0],&sbuf[0],1,'-',16);
-			}
-			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++)
-				{
-					int chars=toupper(ls->region[j]);
-					ls->region[j]=(char)chars;/** \todo ?! */
-				}
-			sprintf(&lbuf[0],"%s_%s",&ls->lang[0],&ls->region[0]);
+		if (Buf == NULL) {
+			Buf = NewStrBuf();
+			SBuf = NewStrBuf();
+		}
+		else {
+			FlushStrBuf(Buf);
+			FlushStrBuf(SBuf);
+		}
+
+		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) {
+			int sbuflen, 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);
+		}
+		else {
+			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);
+		}
+		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++)
+		{
+			int chars=toupper(ls->region[j]);
+			ls->region[j]=(char)chars;/** \todo ?! */
+		}
+		sprintf(&lbuf[0],"%s_%s",&ls->lang[0],&ls->region[0]);
 			
-			/** check if we have this lang */
-			ls->availability=1;
-			ls->selectedlang=-1;
-			for (j=0; j<NUM_LANGS; j++) {
-				int result;
-				/** match against the LANG part */
-				result=strcasecmp(&ls->lang[0], AvailLang[j]);
-				if ((result<0)&&(result<ls->availability)){
-					ls->availability=result;
-					ls->selectedlang=j;
-				}
-				/** match against lang and locale */
-				if (0==strcasecmp(&lbuf[0], AvailLang[j])){
-					ls->availability=0;
-					ls->selectedlang=j;
-					j=NUM_LANGS;
-				}
+		/** 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 lang and locale */
+			if (0==strcasecmp(&lbuf[0], AvailLangLoaded[j])){
+				ls->availability=0;
+				ls->selectedlang=j;
+				j=nLocalesLoaded;
+			}
+		}
         }
 	
 	prio=0;
@@ -145,7 +157,9 @@ void httplang_to_locale(char *LocaleString)
 		nBest=0;
 	}
 	WC->selected_language=nBest;
-	lprintf(9, "language found: %s\n", AvailLang[WC->selected_language]);
+	lprintf(9, "language found: %s\n", AvailLangLoaded[WC->selected_language]);
+	FreeStrBuf(&Buf);
+	FreeStrBuf(&SBuf);
 }
 
 /* TODO: we skip the language weighting so far. */
@@ -191,7 +205,7 @@ void httplang_to_locale(char *LocaleString)
  * depending on the browser locale change the sequence of the 
  * language chooser.
  */
-void offer_languages(void) {
+void offer_languages(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) {
 	int i;
 #ifndef HAVE_USELOCALE
 	char *Lang = getenv("LANG");
@@ -202,14 +216,14 @@ void offer_languages(void) {
 
 	wprintf("<select name=\"language\" id=\"lname\" size=\"1\">\n");
 
-	for (i=0; i < NUM_LANGS; ++i) {
+	for (i=0; i < nLocalesLoaded; ++i) {
 #ifndef HAVE_USELOCALE
-		if (strcmp(AvailLang[i], Lang) == 0)
+		if (strcmp(AvailLangLoaded[i], Lang) == 0)
 #endif
 		wprintf("<option %s value=%s>%s</option>\n",
 			((WC->selected_language == i) ? "selected" : ""),
-			AvailLang[i],
-			AvailLang[i]
+			AvailLangLoaded[i],
+			AvailLangLoaded[i]
 		);
 	}
 
@@ -224,8 +238,8 @@ void set_selected_language(const char *lang) {
 	int i;
 
 #ifdef HAVE_USELOCALE
-	for (i=0; i<NUM_LANGS; ++i) {
-		if (!strcasecmp(lang, AvailLang[i])) {
+	for (i=0; i<nLocalesLoaded; ++i) {
+		if (!strcasecmp(lang, AvailLangLoaded[i])) {
 			WC->selected_language = i;
 		}
 	}
@@ -237,8 +251,9 @@ void set_selected_language(const char *lang) {
  */
 void go_selected_language(void) {
 #ifdef HAVE_USELOCALE
-	if (WC->selected_language < 0) return;
-	uselocale(wc_locales[WC->selected_language]);	/** switch locales */
+	struct 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;
@@ -270,6 +285,11 @@ void preset_locale(void)
 #endif
 #endif
 }
+
+#ifdef HAVE_USELOCALE
+	locale_t Empty_Locale;
+#endif
+
 /**
  * \brief Create a locale_t for each available language
  */
@@ -278,8 +298,6 @@ void initialize_locales(void) {
 	char buf[32];
 
 #ifdef HAVE_USELOCALE
-	locale_t Empty_Locale;
-
 	/* create default locale */
 	Empty_Locale = newlocale(LC_ALL_MASK, NULL, NULL);
 #endif
@@ -292,12 +310,12 @@ void initialize_locales(void) {
 			sprintf(buf, "%s.UTF8", AvailLang[i]);
 		}
 #ifdef HAVE_USELOCALE
-		wc_locales[i] = newlocale(
+		wc_locales[nLocalesLoaded] = newlocale(
 			(LC_MESSAGES_MASK|LC_TIME_MASK),
 			buf,
 			(((i > 0) && (wc_locales[0] != NULL)) ? wc_locales[0] : Empty_Locale)
 		);
-		if (wc_locales[i] == NULL) {
+		if (wc_locales[nLocalesLoaded] == NULL) {
 			lprintf(1, "Error configuring locale for %s: %s\n",
 				buf,
 				strerror(errno)
@@ -305,12 +323,25 @@ void initialize_locales(void) {
 		}
 		else {
 			lprintf(3, "Configured available locale: %s\n", buf);
+			AvailLangLoaded[nLocalesLoaded] = AvailLang[i];
+			nLocalesLoaded++;
 		}
 #endif
 	}
 }
 
 
+void ShutdownLocale(void)
+{
+	int i;
+#ifdef HAVE_USELOCALE
+	for (i = 0; i < nLocalesLoaded; ++i) {
+		if (Empty_Locale != wc_locales[i])
+			freelocale(wc_locales[i]);
+	}
+#endif
+}
+
 #else	/* ENABLE_NLS */
 /** \brief dummy for non NLS enabled systems */
 void offer_languages(void) {
@@ -335,3 +366,26 @@ void preset_locale(void)
 #endif	/* ENABLE_NLS */
 
 
+void TmplGettext(StrBuf *Target, int nTokens, WCTemplateToken *Tokens)
+{
+	StrBufAppendBufPlain(Target, _(Tokens->Params[0]->Start), -1, 0);
+}
+
+
+/*
+ * Returns the language currently in use.
+ * 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
+}
+
+