Revert "man page says that '/locale' will be appended to the path but strace says...

This reverts commit 2231ed4d99d9e8adc745c3b2959d885259931c12.

diff --git a/webcit/gettext.c b/webcit/gettext.c
index 58a0edd8d78bb48437893ecab62f4a47ccf37ab4..96c7206c55833c97cb10389f1fc8b5b3abc84476 100644 (file)
--- 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)",