From e530da685a0e8d6dd4a8511923924019e32e8915 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 7 Feb 2014 17:11:24 +0100
Subject: [PATCH] check fileinfo extension and change admin locale input in
 install process. Fix #205 ans #207

---
 core/lib/Thelia/Install/CheckPermission.php | 1 +
 web/install/config.php                      | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/lib/Thelia/Install/CheckPermission.php b/core/lib/Thelia/Install/CheckPermission.php
index 4ace03c8b..a0e1c3db8 100644
--- a/core/lib/Thelia/Install/CheckPermission.php
+++ b/core/lib/Thelia/Install/CheckPermission.php
@@ -64,6 +64,7 @@ class CheckPermission extends BaseInstall
 
     protected $extensions = array(
         'curl',
+        'fileinfo',
         'gd',
         'intl',
         'mcrypt',
diff --git a/web/install/config.php b/web/install/config.php
index 643e88f93..4a8aace4d 100644
--- a/web/install/config.php
+++ b/web/install/config.php
@@ -94,7 +94,10 @@ $website_url = preg_replace("#/install/[a-z](.*)#" ,'', $url);
         </div>
         <div class="form-group">
             <label for="admin_locale"><?php echo $trans->trans('Administrator preferred locale :'); ?></label>
-            <input id="admin_locale" class="form-control" type="password" name="admin_locale" value="" required>
+            <select id="admin_locale" name="admin_locale" class="form-control" required>
+                <option value="en_US">English</option>
+                <option value="fr_FR">Français</option>
+            </select>
         </div>
         <div class="form-group">
             <label for="email_contact"><?php echo $trans->trans('Contact email :'); ?></label>