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

diff --git a/src/install+setup/install/install2.c b/src/install+setup/install/install2.c
index b724c9e02884e2d3d5548dea1f8d2dc56be564e8..6ca61af721b9394f5a2de0548794f707f7ea075f 100644 (file)
--- a/src/install+setup/install/install2.c
+++ b/src/install+setup/install/install2.c
@@ -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];

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index fb0b66e6a4b1dbf30dbf45a35e8283614a43dde6..565ad1f047ed44064d033218a99e0c95dfff9432 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -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. */

diff --git a/src/install+setup/libsmooth/main.c b/src/install+setup/libsmooth/main.c
index 4d7eaab740e1a4fe51d9be2aa9bf52e7a3cbf3f2..e2d6d70a5df5b6563506784b760b0863c54e946b 100644 (file)
--- a/src/install+setup/libsmooth/main.c
+++ b/src/install+setup/libsmooth/main.c
@@ -284,7 +284,7 @@ int replace(char filename1[], char *from, char *to)
 /* Include enabled languages */\r
 #ifdef  LANG_EN_ONLY\r
         #include "lang_en.c"\r
-#else\r
+#elifdef       LANG_ALL\r
        #include "lang_bz.c"\r
        #include "lang_cs.c"\r
        #include "lang_da.c"\r
@@ -306,6 +306,9 @@ int replace(char filename1[], char *from, char *to)
        #include "lang_sv.c"\r
        #include "lang_tr.c"\r
        #include "lang_vi.c"\r
+#else\r
+       #include "lang_de.c"\r
+       #include "lang_en.c"\r
 \r
 #endif\r
 // returns a pointer to the actual running version number of IPCop.\r

diff --git a/src/install+setup/setup/keymap.c b/src/install+setup/setup/keymap.c
index ddfc7de46171ae7d825e86418cf6b78a832c4aa5..5fec1e28b9199477b3aee786d31ac517718585ae 100644 (file)
--- a/src/install+setup/setup/keymap.c
+++ b/src/install+setup/setup/keymap.c
@@ -69,7 +69,7 @@ int handlekeymap(void)
                return 0;\r
        }       \r
        \r
-       strcpy(keymap, "/usr/share/kbd/keymaps/i386/qwerty/us.map.gz");\r
+       strcpy(keymap, "/usr/share/kbd/keymaps/i386/qwertz/de.map.gz");\r
        findkey(kv, "KEYMAP", keymap);\r
        \r
        choice = 0;\r

diff --git a/src/install+setup/setup/main.c b/src/install+setup/setup/main.c
index 4da9659d3819af898b77b0c63342c9ca83580575..d40c9ac4329937ecfa9a0df874433a1bda9e2bf0 100644 (file)
--- a/src/install+setup/setup/main.c
+++ b/src/install+setup/setup/main.c
@@ -48,9 +48,12 @@ int main(int argc, char *argv[])
 #ifdef  LANG_EN_ONLY\r
        char *shortlangnames[] = { "en", NULL };\r
        char **langtrs[] = { en_tr, NULL };\r
-#else\r
+#elifdef LANG_ALL\r
        char *shortlangnames[] = { "bz", "cs", "da", "de", "en", "es", "fr", "el", "it", "la", "hu", "nl", "no", "pl", "pt", "sk", "so", "fi", "sv", "tr", "vi", NULL };\r
        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 };\r
+#else\r
+       char *shortlangnames[] = { "de", "en", NULL };\r
+       char **langtrs[] = { de_tr, en_tr, NULL };\r
 #endif\r
        int choice;\r
        char *sections[11]; /* need to fill this out AFTER knowning lang */\r

diff --git a/src/install+setup/setup/timezone.c b/src/install+setup/setup/timezone.c
index 05ce3abf92b7093ecd51b296d2e46567e9cc2e77..bdf890354b6c4e06f0728e233b65beed3428dcc8 100644 (file)
--- a/src/install+setup/setup/timezone.c
+++ b/src/install+setup/setup/timezone.c
@@ -62,7 +62,7 @@ int handletimezone(void)
                return 0;\r
        }       \r
        \r
-       strcpy(timezone, ZONEFILES "/CET");\r
+       strcpy(timezone, ZONEFILES "/Europe/Berlin");\r
        findkey(kv, "TIMEZONE", timezone);\r
        \r
        choice = 0;\r