From 5c965330c3ec64f40ceb875c593ae55eb3e987d6 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 25 May 2010 04:58:00 +0000
Subject: [PATCH] ENHANCEMENT you can now choose your site locale at install
 time (from r100769)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105645 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/i18n.php                |  1 +
 dev/install/config-form.html | 26 +++++++++++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/core/i18n.php b/core/i18n.php
index 78693a1da..22f16458f 100755
--- a/core/i18n.php
+++ b/core/i18n.php
@@ -694,6 +694,7 @@ class i18n extends Object {
 		'cy_GB' => array('Welsh', 'Welsh/Cymraeg'),
 		'da_DK' => array('Danish', 'dansk'),
 		'nl_NL' => array('Dutch', 'Nederlands'),
+		'en_NZ' => array('English (NZ)', 'English (NZ)'),
 		'en_US' => array('English (US)', 'English (US)'),
 		'en_GB' => array('English (UK)', 'English (UK)'),
 		'eo_XX' => array('Esperanto', 'Esperanto'),
diff --git a/dev/install/config-form.html b/dev/install/config-form.html
index 335b4b4e8..7ba8c8c10 100644
--- a/dev/install/config-form.html
+++ b/dev/install/config-form.html
@@ -266,15 +266,31 @@
 								rather log-in with a username instead of an email address, enter that instead.
 							</p>
 							
-							<h4 class="sectionHeading">Development Servers</h4>
+							<h4 class="sectionHeading">Server configuration</h4>
 							<div class="section">
-								<label for="devsites">Development servers:</label>
-								<span class="middleColumn">
-									<textarea name="devsites" id="devsites" rows="5" cols="10">
+								<div class="field">
+									<label for="devsites">Development servers:</label>
+									<span class="middleColumn">
+										<textarea name="devsites" id="devsites" rows="5" cols="10">
 <?php if(@$_POST['devsites']) echo $_POST['devsites'];
 else echo 'localhost
 127.0.0.1'; ?></textarea>
-								</span>
+									</span>
+								</div>
+								<div class="field">
+									<label for="locale">Locale:</label>
+									<span class="middleColumn">
+										<select name="locale" id="locale">
+<?php
+$selectedLocale = isset($_POST['locale']) ? $_POST['locale'] : $defaultLocale;
+foreach($locales as $code => $details) {
+	$selected = $code == $selectedLocale ? ' selected="true"' : '';
+	echo "<option$selected value=\"$code\">{$details[0]} - {$details[1]}</option>\n";
+}
+?>
+										</select> 
+									</span>
+								</div>
 							</div>
 							
 							<p id="devHelp" class="helpText">