--- trunk/installer/ncurses-gui/locales.sh	2010/05/30 21:40:02	1044
+++ trunk/installer/ncurses-gui/locales.sh	2011/08/03 17:10:03	1480
@@ -38,19 +38,30 @@
 
 select_locale()
 {
-	local items=( $(localedef --list-archive | grep $(${INSTALLER_DIR}/include/timezone.sh --get-code ${TIMEZONE_LOCATION})) )
-	local count=${#items[*]}
+	local items
+	local count
 	local i
+	local retval
 
-	dialog \
-		--stdout \
-		--colors \
-		--backtitle "${TITLE}" \
-		--menu "Select a default locale" \
-		0 0 ${count} \
-		$(for (( i=0; i<count; i++ )); do echo "${items[$i]} ."; done)
+	if [[ -z $(localedef --list-archive) ]]
+	then
+		echo "Error: No locales found on this system!"
+		retval=255
+	else
+		items=( $(localedef --list-archive | grep $(${INSTALLER_DIR}/include/timezone.sh --get-code ${TIMEZONE_LOCATION})) )
+		count=${#items[*]}
 
-	return $?
+		dialog \
+			--stdout \
+			--colors \
+			--backtitle "${TITLE}" \
+			--menu "Select a default locale" \
+			0 0 ${count} \
+			$(for (( i=0; i<count; i++ )); do echo "${items[$i]} ."; done)
+		retval=$?
+	fi
+
+	return ${retval}
 }
 
 rundialog_select_timezone_region()