Merge branch 'optim' of https://github.com/thelia/thelia into optim

Conflicts:
	core/lib/Thelia/Action/Order.php
	core/lib/Thelia/Core/Template/Element/BaseLoop.php

web/install/config.php

@@ -92,6 +92,10 @@ $website_url = preg_replace("#/install/[a-z](.*)#" ,'', $url);
             <label for="admin_password_verif"><?php echo $trans->trans('Administrator password verification :'); ?></label>
             <input id="admin_password_verif" class="form-control" type="password" name="admin_password_verif" value="" required>
         </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>
+        </div>
         <div class="form-group">
             <label for="email_contact"><?php echo $trans->trans('Contact email :'); ?></label>
             <input id="email_contact" class="form-control" type="text" name="store_email" placeholder="foo@bar.com" value="" required>

web/install/end.php

@@ -33,6 +33,7 @@ if($_SESSION['install']['step'] == 5) {
         ->setPassword($_POST['admin_password'])
         ->setFirstname('admin')
         ->setLastname('admin')
+        ->setLocale(empty($_POST['admin_locale']) ? 'en_US' : $_POST['admin_locale'])
         ->save();