X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fgettext.c;h=96c7206c55833c97cb10389f1fc8b5b3abc84476;hb=52a531af019b657444bd5c96bc882fbd8c18ca8b;hp=58a0edd8d78bb48437893ecab62f4a47ccf37ab4;hpb=5923ce18408d0b8f0c40b296c6f266323f077116;p=citadel.git

diff --git a/webcit/gettext.c b/webcit/gettext.c
index 58a0edd8d..96c7206c5 100644
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -296,7 +296,7 @@ void initialize_locales(void) {
 #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, "Message catalog directory: %s", bindtextdomain(textdomain(NULL), LOCALEDIR));
 	syslog(9, "Text domain Charset: %s", bind_textdomain_codeset("webcit","UTF8"));
 #endif
 
@@ -332,7 +332,7 @@ void initialize_locales(void) {
 		wc_locales[nLocalesLoaded] = newlocale(
 			(LC_MESSAGES_MASK|LC_TIME_MASK),
 			buf,
-			Empty_Locale
+			(((i > 0) && (wc_locales[0] != NULL)) ? wc_locales[0] : Empty_Locale)
 		);
 		if (wc_locales[nLocalesLoaded] == NULL) {
 			syslog(1, "locale for %s disabled: %s (domain: %s, path: %s)",