From: Wilfried Göesgens <willi@citadel.org>
Date: Mon, 25 Feb 2008 21:51:07 +0000 (+0000)
Subject: * if we're in single-lang gettext mode, just show the locale root gave us in the... 
X-Git-Tag: v7.86~2464
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=087422ab2cef75de1d22d723a070cace71fd3973

* if we're in single-lang gettext mode, just show the locale root gave us in the select dialog.
---

diff --git a/webcit/gettext.c b/webcit/gettext.c
index 9c2484540..42cfc7bd2 100644
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -200,6 +200,9 @@ void offer_languages(void) {
 	wprintf("<select name=\"language\" id=\"lname\" size=\"1\">\n");
 
 	for (i=0; i < NUM_LANGS; ++i) {
+#ifndef HAVE_USELOCALE
+		if (strcmp(AvailLang[i], getenv("LANG")) == 0)
+#endif
 		wprintf("<option %s value=%s>%s</option>\n",
 			((WC->selected_language == i) ? "selected" : ""),
 			AvailLang[i],
@@ -216,12 +219,13 @@ void offer_languages(void) {
  */
 void set_selected_language(char *lang) {
 	int i;
-
+#ifdef HAVE_USELOCALE
 	for (i=0; i<NUM_LANGS; ++i) {
 		if (!strcasecmp(lang, AvailLang[i])) {
 			WC->selected_language = i;
 		}
 	}
+#endif
 }
 
 /**
@@ -232,6 +236,11 @@ void go_selected_language(void) {
 	if (WC->selected_language < 0) return;
 	uselocale(wc_locales[WC->selected_language]);	/** switch locales */
 	textdomain(textdomain(NULL));			/** clear the cache */
+#else
+	char *language;
+	
+	language = getenv("LANG");
+	setlocale(LC_MESSAGES, language);
 #endif
 }
 
@@ -251,6 +260,7 @@ void preset_locale(void)
 #ifdef HAVE_GETTEXT
 	char *language;
 	
+	lprintf(9, "Nailing locale to %s\n", getenv("LANG"));
 	language = getenv("LANG");
 	setlocale(LC_MESSAGES, language);
 #endif
diff --git a/webcit/webserver.c b/webcit/webserver.c
index 46c809769..c54755209 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -802,7 +802,9 @@ int main(int argc, char **argv)
 	/* initialize the International Bright Young Thing */
 #ifdef ENABLE_NLS
 	initialize_locales();
+
 	locale = setlocale(LC_ALL, "");
+
 	mo = malloc(strlen(webcitdir) + 20);
 	lprintf(9, "Message catalog directory: %s\n", bindtextdomain("webcit", LOCALEDIR"/locale"));
 	free(mo);