From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 14 Aug 2014 12:22:39 +0000 (+0200)
Subject: installer: Use full locale strings for locale selection
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d04d4d586bc45de3bec4a72b778e2e5951a9ab5b;p=people%2Fms%2Fipfire-2.x.git

installer: Use full locale strings for locale selection
---

diff --git a/src/installer/main.c b/src/installer/main.c
index 0415d22e70..8ff5696851 100644
--- a/src/installer/main.c
+++ b/src/installer/main.c
@@ -209,14 +209,14 @@ static struct lang {
 	const char* code;
 	char* name;
 } languages[NUM_LANGS + 1] = {
-	{ "nl", "Dutch (Nederlands)" },
-	{ "en", "English" },
-	{ "fr", "French (Français)" },
-	{ "de", "German (Deutsch)" },
-	{ "pl", "Polish (Polski)" },
-	{ "ru", "Russian (Русский)" },
-	{ "es", "Spanish (Español)" },
-	{ "tr", "Turkish (Türkçe)" },
+	{ "nl_NL.utf8", "Dutch (Nederlands)" },
+	{ "en_US.utf8", "English" },
+	{ "fr_FR.utf8", "French (Français)" },
+	{ "de_DE.utf8", "German (Deutsch)" },
+	{ "pl_PL.utf8", "Polish (Polski)" },
+	{ "ru_RU.utf8", "Russian (Русский)" },
+	{ "es_ES.utf8", "Spanish (Español)" },
+	{ "tr_TR.utf8", "Turkish (Türkçe)" },
 	{ NULL, NULL },
 };
 
@@ -315,6 +315,8 @@ int main(int argc, char *argv[]) {
 		assert(choice <= NUM_LANGS);
 
 		fprintf(flog, "Selected language: %s (%s)\n", languages[choice].name, languages[choice].code);
+
+		setenv("LANGUAGE", languages[choice].code, 1);
 		setlocale(LC_ALL, languages[choice].code);
 	}