* Added a null pointer check to the 'language' variable to prevent crash

[citadel.git] / webcit / gettext.c

diff --git a/webcit/gettext.c b/webcit/gettext.c
index e486fc4d94db9bed56fe12554abf75b86eb29f1a..917ee4bd30508f8159482cde961798279c4bdda3 100644 (file)
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -234,14 +234,14 @@ void stop_selected_language(void) {
 
 void preset_locale(void)
 {
-#ifndef HAVE_USELOCALE
 #ifdef HAVE_GETTEXT
        char *language;
        
-       lprintf(9, "Nailing locale to %s\n", getenv("LANG"));
-       language = getenv("LANG");
-       setlocale(LC_MESSAGES, language);
-#endif
+       language = getenv("WEBCIT_LANG");
+       if ((language) && (!IsEmptyStr(language)) && (strcmp(language, "UNLIMITED") != 0)) {
+               lprintf(9, "Nailing locale to %s\n", language);
+               setlocale(LC_MESSAGES, language);
+       }
 #endif
 }