Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 628)
+++ trunk/CHANGELOG	(revision 629)
@@ -12,7 +12,8 @@
 
 ------------------------------------- 2.7.0 -------------------------------------
 28-Jan-2008 Christian Sommer
-+	Re-introduced Changeset 593 (filename in pages/ from page_title instead of menu_title)
+!	added possibility to select the default backend language during installation process
+!	Re-introduced Changeset 593 (filename in pages/ from page_title instead of menu_title)
 #	Fixed some bugs in the Javascript Admin modul
 28-Jan-2008 Thomas Hornik
 +	Added Text-CAPTCHA on request. The captcha-text will be stored in temp/.captcha_text.txt
Index: trunk/wb/install/save.php
===================================================================
--- trunk/wb/install/save.php	(revision 628)
+++ trunk/wb/install/save.php	(revision 629)
@@ -163,6 +163,19 @@
 }
 // End path and timezone details code
 
+// Get the default language
+$allowed_languages = array('CA', 'DA', 'DE', 'EN', 'ES', 'ET', 'FI', 'FR', 'HR', 'HU', 'IT', 'LV', 'NL', 'PT','SE', 'TR');
+if(!isset($_POST['default_language']) OR !in_array($_POST['default_language'], $allowed_languages)) {
+	set_error('Please select a valid default backend language');
+} else {
+	$default_language = $_POST['default_language'];
+	// make sure the selected language file exists in the language folder
+	if(!file_exists('../languages/' .$default_language .'.php')) {
+		set_error('The language file: \'' .$default_language .'.php\' is missing. Upload file to language folder or choose another language');
+	}
+}
+// End default language details code
+
 // Begin operating system specific code
 // Get operating system
 if(!isset($_POST['operating_system']) OR $_POST['operating_system'] != 'linux' AND $_POST['operating_system'] != 'windows') {
@@ -422,7 +435,7 @@
 	." ('wysiwyg_style', 'font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px;'),"
 	." ('rename_files_on_upload', 'php,asp,phpx,aspx'),"
 	." ('er_level', ''),"
-	." ('default_language', 'EN'),"
+	." ('default_language', '$default_language'),"
 	." ('app_name', 'wb_$session_rand'),"
 	." ('default_timezone', '$default_timezone'),"
 	." ('default_date_format', 'M d Y'),"
@@ -473,7 +486,7 @@
 	       . ' `timezone` INT NOT NULL DEFAULT \'0\','
 	       . ' `date_format` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
 	       . ' `time_format` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
-	       . ' `language` VARCHAR( 5 ) NOT NULL DEFAULT \'EN\' ,'
+	       . ' `language` VARCHAR( 5 ) NOT NULL DEFAULT \'' .$default_language .'\' ,'
 	       . ' `home_folder` TEXT NOT NULL ,'
 	       . ' `login_when` INT NOT NULL  DEFAULT \'0\','
 	       . ' `login_ip` VARCHAR( 15 ) NOT NULL DEFAULT \'\' ,'
Index: trunk/wb/install/index.php
===================================================================
--- trunk/wb/install/index.php	(revision 628)
+++ trunk/wb/install/index.php	(revision 629)
@@ -167,7 +167,7 @@
 		</table>
 		<table cellpadding="3" cellspacing="0" width="100%" align="center">
 		<tr>
-			<td colspan="2"><h1>Step 3</h1>Please check your path settings, and select your default timezone...</td>
+			<td colspan="2"><h1>Step 3</h1>Please check your path settings, and select a default timezone and a default backend language...</td>
 		</tr>
 		<tr>
 			<td width="125" style="color: #666666;">
@@ -230,6 +230,28 @@
 				</select>
 			</td>
 		</tr>
+		<tr>
+			<td style="color: #666666;">
+				Default Language:
+			</td>
+			<td>
+				<select tabindex="3" name="default_language" style="width: 100%;">
+					<?php
+					$DEFAULT_LANGUAGE = array(
+						'CA'=>'Catalan', 'DA'=>'Danish', 'DE'=>'Deutsch', 'EN'=>'English',
+						'ES'=>'Spanish', 'ET'=>'Eesti', 'FI'=>'Suomi', 'FR'=>'Fran&ccedil;ais',
+						'HR'=>'Hrvatski', 'HU'=>'Magyar','IT'=>'Italiano', 'LV'=>'Latviesu',
+						'NL'=>'Nederlands','PT'=>'Portuguese (Brazil)','SE'=>'Svenska', 'TR'=>'Turkish'
+					);
+					foreach($DEFAULT_LANGUAGE as $lang_id => $lang_title) {
+						?>
+							<option value="<?php echo $lang_id; ?>"<?php if(isset($_SESSION['default_language']) AND $_SESSION['default_language'] == $lang_id) { echo ' selected'; } elseif(!isset($_SESSION['default_language']) AND $lang_id == 'EN') { echo 'selected'; } ?>><?php echo $lang_title; ?></option>
+						<?php
+					}
+					?>
+				</select>
+			</td>
+		</tr>
 		</table>
 		<table cellpadding="5" cellspacing="0" width="100%" align="center">
 		<tr>