--- trunk/installer-simple/bin/installer.sh.in	2014/01/07 14:56:12	2446
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/08 10:22:46	2478
@@ -7,8 +7,10 @@
 # Niels Rogalla <niro@magellan-linux.de>
 #
 
-# ignore the environment
-LC_ALL=C
+# setup locales
+TEXTDOMAIN=installer
+LC_MESSAGES=C
+
 # include dir
 INSTALLER_LIBDIR="%LIBDIR%"
 
@@ -108,32 +110,12 @@
 	fi
 }
 
-dialog_setup_hdd_info()
-{
-	local SHDD="${HDD//\/dev\/}"
-
-	messagebox -h $"[ Harddrive partitioning ]" \
-		$"\nPlease create 1 partition.\n\n\[ \Z3${SHDD}1\Zn ] type: \Z3linux\Zn with the whole diskspace\n\Please mark ${SHDD}1 \Z3bootable\Zn."
-}
-
-dialog_setup_hdd_info_auto()
-{
-	local SHDD="${HDD//\/dev\/}"
-
-	messagebox -h $"[ Harddrive partitioning ]" \
-		$"\Z1Warning!\Zn\n\nAll data on disk [ \Z3${HDD}\Zn ] will be erased!"
-}
-
-dialog_setup_system_menu()
+task_setup_system_menu()
 {
 	local mode
 	local retval
 
-	mode=$(menubox -h $"[ Harddrive partitioning ]" $"\nSelect an installation mode" \
-		$"1:Automatic setup (recommended)" \
-		":" \
-		$":\Z1Expert modes:\Zn" \
-		$"2:Common IDE-disk (manual setup)")
+	mode="$(dialog_setup_system_menu)"
 	retval=$?
 	[[ ${retval} -eq 1 ]] && return 1
 	if [[ ${retval} -eq 0 ]]
@@ -141,7 +123,7 @@
 		case "${mode}" in
 			"1") run_install_auto ;;
 			"2") run_install_normal ;;
-			"") dialog_setup_system_menu;;
+			"") task_setup_system_menu;;
 		esac
 	fi
 }
@@ -180,17 +162,17 @@
 		zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
 		rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
 		maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
-		*) message+=$"\n \\ZnCommon device detected.\Zn" ;;
+		*) message+=$"\n\ZnCommon device detected.\Zn" ;;
 	esac
 	if [[ ${FORMFACTOR} = laptop ]]
 	then
-		message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving  mode.\Zn"
+		message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving mode.\Zn"
 	fi
 
-	messagebox -y 15 -h $"Detected hardware:" "${message}"
+	messagebox -y 12 -h $"Detected hardware:" "${message}"
 }
 
-dialog_setup_hdd_partitions_manual()
+task_setup_hdd_partitions_manual()
 {
 	local i
 	local retval
@@ -246,24 +228,20 @@
 	return 0
 }
 
-dialog_main()
+task_main()
 {
 	local method=0
 	local retval
 
 	while [[ ${method} -le 2 ]]
 	do
-		method=$(menubox $"Configuration:" \
-			$"1:Install system" \
-			$"2:Show detected harddrives" \
-			$"3:Exit and reboot" \
-			$"4:Exit and drop into a shell")
+		method=$(dialog_main)
 		retval=$?
 		[[ ${retval} -eq 1 ]] && exit 1
 		if [[ ${retval} -eq 0 ]]
 		then
 			case ${method} in
-				"1") dialog_setup_system_menu ;;
+				"1") task_setup_system_menu ;;
 				"2") dialog_hardware_detection ;;
 				"3") install_do_reboot ;;
 				"4") /bin/bash --login -i ;;
@@ -348,24 +326,6 @@
 	export ALL_CDROMS="$(get_hwinfo cdrom)"
 }
 
-hdd_size_below_256mb()
-{
-	local hdd="$1"
-	local size
-	local retval
-	[[ -z ${hdd} ]] && dialog_die "Error: get_hdd_size() no \$hdd given!"
-
-	size=$(fdisk -l ${hdd} | grep "Disk.*${hdd}" | sed 's:.*,\ \(.*\)\ byte.*:\1:')
-	if [[ ${size} -le 257000000 ]]
-	then
-		retval="0"
-	else
-		retval="1"
-	fi
-
-	return "${retval}"
-}
-
 setup_hdd_partitions_auto()
 {
 	ROOTHDD="${HDD}1"
@@ -679,7 +639,7 @@
 {
 	dialog_hardware_detection
 
-	dialog_setup_hdd_partitions_manual
+	task_setup_hdd_partitions_manual
 	dialog_setup_hdd_format
 	setup_hdd_format > /dev/null
 	install_mount_rootfs
@@ -734,6 +694,6 @@
 # set some proper traps
 trap "trap_exit" SIGINT SIGQUIT
 
-dialog_main
+task_main
 
 exit 0