From 1217aa018d5e1c43bb90b230d49f6d866a43da29 Mon Sep 17 00:00:00 2001
From: casemaster <casemaster@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Tue, 13 Jun 2006 19:46:57 +0000
Subject: [PATCH] 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
---
 src/install+setup/install/install2.c |  4 +++-
 src/install+setup/install/main.c     | 12 +++++-------
 src/install+setup/libsmooth/main.c   |  5 ++++-
 src/install+setup/setup/keymap.c     |  2 +-
 src/install+setup/setup/main.c       |  5 ++++-
 src/install+setup/setup/timezone.c   |  2 +-
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/install+setup/install/install2.c b/src/install+setup/install/install2.c
index b724c9e02..6ca61af72 100644
--- 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 fb0b66e6a..565ad1f04 100644
--- 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 4d7eaab74..e2d6d70a5 100644
--- 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 */
 #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.
diff --git a/src/install+setup/setup/keymap.c b/src/install+setup/setup/keymap.c
index ddfc7de46..5fec1e28b 100644
--- a/src/install+setup/setup/keymap.c
+++ b/src/install+setup/setup/keymap.c
@@ -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;
diff --git a/src/install+setup/setup/main.c b/src/install+setup/setup/main.c
index 4da9659d3..d40c9ac43 100644
--- 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
 	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 */
diff --git a/src/install+setup/setup/timezone.c b/src/install+setup/setup/timezone.c
index 05ce3abf9..bdf890354 100644
--- a/src/install+setup/setup/timezone.c
+++ b/src/install+setup/setup/timezone.c
@@ -62,7 +62,7 @@ int handletimezone(void)
 		return 0;
 	}	
 	
-	strcpy(timezone, ZONEFILES "/CET");
+	strcpy(timezone, ZONEFILES "/Europe/Berlin");
 	findkey(kv, "TIMEZONE", timezone);
 	
 	choice = 0;