Installer:

Tastatur "DE" als default
Timezone "Europe/Berlin" als default.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@174 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
casemaster
2006-06-13 19:46:57 +00:00
parent 894c6feb3e
commit 1217aa018d
6 changed files with 18 additions and 12 deletions

View File

@@ -202,8 +202,10 @@ int main(int argc, char *argv[]) {
#ifdef LANG_EN_ONLY
char **langtrs[] = { en_tr, NULL };
#else
#elifdef LANG_ALL
char **langtrs[] = { bz_tr, cs_tr, da_tr, de_tr, en_tr, es_tr, fr_tr, el_tr, it_tr, la_tr, hu_tr, nl_tr, no_tr, pl_tr, pt_tr, sk_tr, so_tr, fi_tr, sv_tr, tr_tr, vi_tr, NULL };
#else
char **langtrs[] = { de_tr, en_tr, NULL };
#endif
char message[1000];
char title[STRING_SIZE];

View File

@@ -14,7 +14,6 @@
#define CDROM_INSTALL 0
#define URL_INSTALL 1
#define LANG_DE_EN
int raid_disk = 0;
FILE *flog = NULL;
@@ -52,15 +51,14 @@ int main(int argc, char *argv[])
char *langnames[] = { "English", NULL };
char *shortlangnames[] = { "en", NULL };
char **langtrs[] = { en_tr, NULL };
#elifdef LANG_DE_EN
#elifdef LANG_ALL
char *langnames[] = { "Brasil", "Cestina", "Dansk", "Deutsch", "English", "Español", "Français", "Hellenic", "Italiano", "Spanish Latino", "Magyar", "Nederlands", "Norsk", "Polski", "Português", "Soomali", "Suomi", "Svenska", "Türkçe", "Tieng Viet", NULL };
char *shortlangnames[] = { "bz", "cs", "da", "de", "en", "es", "fr", "el", "it", "la", "hu", "nl", "no", "pl", "pt", "so", "fi", "sv", "tr", "vi", NULL };
char **langtrs[] = { bz_tr, cs_tr, da_tr, de_tr, en_tr, es_tr, fr_tr, el_tr, it_tr, la_tr, hu_tr, nl_tr, no_tr, pl_tr, pt_tr, so_tr, fi_tr, sv_tr, tr_tr, vi_tr, NULL };
#else
char *langnames[] = { "Deutsch", "English", NULL };
char *shortlangnames[] = { "de", "en", NULL };
char **langtrs[] = { de_tr, en_tr, NULL };
#else
char *langnames[] = { "Brasil", "Cestina", "Dansk", "Deutsch", "English", "Español", "Français", "Hellenic", "Italiano", "Spanish Latino", "Magyar", "Nederlands", "Norsk", "Polski", "Português", "Soomali", "Suomi", "Svenska", "Türkçe", "Tieng Viet", NULL };
char *shortlangnames[] = { "bz", "cs", "da", "de", "en", "es", "fr", "el", "it", "la", "hu", "nl", "no", "pl", "pt", "so", "fi", "sv", "tr", "vi", NULL };
char **langtrs[] = { bz_tr, cs_tr, da_tr, de_tr, en_tr, es_tr, fr_tr, el_tr, it_tr, la_tr, hu_tr, nl_tr, no_tr, pl_tr, pt_tr, so_tr, fi_tr, sv_tr, tr_tr, vi_tr, NULL };
#endif
char hdletter, cdletter;
char harddrive[5], cdromdrive[5]; /* Device holder. */

View File

@@ -284,7 +284,7 @@ int replace(char filename1[], char *from, char *to)
/* Include enabled languages */
#ifdef LANG_EN_ONLY
#include "lang_en.c"
#else
#elifdef LANG_ALL
#include "lang_bz.c"
#include "lang_cs.c"
#include "lang_da.c"
@@ -306,6 +306,9 @@ int replace(char filename1[], char *from, char *to)
#include "lang_sv.c"
#include "lang_tr.c"
#include "lang_vi.c"
#else
#include "lang_de.c"
#include "lang_en.c"
#endif
// returns a pointer to the actual running version number of IPCop.

View File

@@ -69,7 +69,7 @@ int handlekeymap(void)
return 0;
}
strcpy(keymap, "/usr/share/kbd/keymaps/i386/qwerty/us.map.gz");
strcpy(keymap, "/usr/share/kbd/keymaps/i386/qwertz/de.map.gz");
findkey(kv, "KEYMAP", keymap);
choice = 0;

View File

@@ -48,9 +48,12 @@ int main(int argc, char *argv[])
#ifdef LANG_EN_ONLY
char *shortlangnames[] = { "en", NULL };
char **langtrs[] = { en_tr, NULL };
#else
#elifdef LANG_ALL
char *shortlangnames[] = { "bz", "cs", "da", "de", "en", "es", "fr", "el", "it", "la", "hu", "nl", "no", "pl", "pt", "sk", "so", "fi", "sv", "tr", "vi", NULL };
char **langtrs[] = { bz_tr, cs_tr, da_tr, de_tr, en_tr, es_tr, fr_tr, el_tr, it_tr, la_tr, hu_tr, nl_tr, no_tr, pl_tr, pt_tr, sk_tr, so_tr, fi_tr, sv_tr, tr_tr, vi_tr, NULL };
#else
char *shortlangnames[] = { "de", "en", NULL };
char **langtrs[] = { de_tr, en_tr, NULL };
#endif
int choice;
char *sections[11]; /* need to fill this out AFTER knowning lang */

View File

@@ -62,7 +62,7 @@ int handletimezone(void)
return 0;
}
strcpy(timezone, ZONEFILES "/CET");
strcpy(timezone, ZONEFILES "/Europe/Berlin");
findkey(kv, "TIMEZONE", timezone);
choice = 0;