webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-11 19:55:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

installer: Fix language selection

Browse Source 
The selected language was not written to the system
configuration file and therefore the system was reset
to English again.
This commit is contained in:
Michael Tremer
2014-08-30 11:02:28 +02:00
parent 38a1596273
commit 165295ab28
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/installer/main.c
View File

@@ -238,7 +238,7 @@ int main(int argc, char *argv[]) {
int rc = 0;
char commandstring[STRING_SIZE];
int choice;
char shortlangname[10];
char language[STRING_SIZE];
char message[STRING_SIZE];
char title[STRING_SIZE];
int allok = 0;
@@ -320,9 +320,10 @@ int main(int argc, char *argv[]) {
assert(choice <= NUM_LANGS);
fprintf(flog, "Selected language: %s (%s)\n", languages[choice].name, languages[choice].code);
snprintf(language, sizeof(language), languages[choice].code);
setenv("LANGUAGE", languages[choice].code, 1);
setlocale(LC_ALL, languages[choice].code);
setenv("LANGUAGE", language, 1);
setlocale(LC_ALL, language);
}
char* helpline = center_string(_("<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"), screen_cols);
@@ -598,7 +599,7 @@ int main(int argc, char *argv[]) {
}
/* Save language und local settings */
write_lang_configs(shortlangname);
write_lang_configs(language);
/* Build cache lang file */
snprintf(commandstring, STRING_SIZE, "/usr/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\"");