X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Futils%2Fsetup.c;h=311f1b28f52fff4b592c96414f0f91a5b018fc61;hb=d99c2e49a09228a173b8d26e3acf5a8fbef2094e;hp=d046f209068159194257b5fcbe42ede83d26a15b;hpb=9d18bf014a191540b64a0a14dc55a58a0047432f;p=citadel.git

diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c
index d046f2090..311f1b28f 100644
--- a/citadel/utils/setup.c
+++ b/citadel/utils/setup.c
@@ -109,11 +109,13 @@ void SetTitles(void)
 	have_run_dir = 0;
 #endif
 
+#ifdef ENABLE_NLS
 	setlocale(LC_MESSAGES, getenv("LANG"));
 
 	bindtextdomain("citadel-setup", LOCALEDIR"/locale");
 	textdomain("citadel-setup");
 	bind_textdomain_codeset("citadel-setup","UTF8");
+#endif
 
 	setup_titles[eCitadelHomeDir] = _("Citadel Home Directory");
 	if (have_run_dir)
@@ -917,7 +919,8 @@ void strprompt(const char *prompt_title, const char *prompt_text, char *Target,
 		}
 		break;
 	case UI_SILENT:
-		strcpy(Target, DefValue);
+		if (*DefValue != '\0')
+			strcpy(Target, DefValue);
 		break;
 	}
 }