X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fgettext.c;h=1bc40c8f40a5dbe18f08331d85dd8a8ccf46578f;hb=7951b4c0cec7352cf233588e21ce68915c199830;hp=da7890239e527fcd0f05640b14f536cf2f574a99;hpb=f7eb6f849a4d996f2847e672e81f7d08468ab35a;p=citadel.git

diff --git a/webcit/gettext.c b/webcit/gettext.c
index da7890239..1bc40c8f4 100644
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -17,8 +17,8 @@
 #ifdef ENABLE_NLS
 /* actual supported locales */
 const char *AvailLang[] = {
-	"C",
-	"ar_AR",
+	"en_US",
+	"ar_AE",
 	"bg_BG",
 	"cs_CZ",
 	"en_US",
@@ -32,7 +32,9 @@ const char *AvailLang[] = {
 	"fr_FR",
 	"hu_HU",
 	"it_IT",
+	"ko_KO",
 	"nl_NL",
+	"pl_PL",
 	"pt_BR",
 	"ru_RU",
 	"zh_CN",
@@ -76,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); */
@@ -124,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';
 		}
 
@@ -151,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;
@@ -197,7 +201,7 @@ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess)
 		nBest=0;
 	}
 	sess->selected_language = nBest;
-	syslog(LOG_DEBUG, "language found: %s", AvailLangLoaded[WC->selected_language]);
+	syslog(LOG_DEBUG, "language found: %s", AvailLangLoaded[sess->selected_language]);
 	FreeStrBuf(&Buf);
 	FreeStrBuf(&SBuf);
 }
@@ -260,7 +264,12 @@ void set_selected_language(const char *lang) {
 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
@@ -317,7 +326,8 @@ void initialize_locales(void) {
 		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, "C");	/* locale 0 (C) is ascii, not utf-8 */
+			
 		}
 		else {
 			sprintf(buf, "%s.UTF8", AvailLang[i]);
@@ -332,7 +342,7 @@ void initialize_locales(void) {
 			syslog(LOG_NOTICE, "locale for %s disabled: %s", buf, strerror(errno));
 		}
 		else {
-			syslog(LOG_INFO, "Found locale: %s", buf);
+			syslog(LOG_INFO, "Found locale: %s - %s", buf, AvailLang[i]);
 			AvailLangLoaded[nLocalesLoaded] = AvailLang[i];
 			nLocalesLoaded++;
 		}
@@ -427,10 +437,11 @@ void initialize_locales(void) {
 
 #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);
 }
 
 
@@ -441,7 +452,7 @@ void TmplGettext(StrBuf *Target, WCTemplputParams *TP)
 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