Fix previous commit by adding forgotten files

[jirafeau_project.git] / install.php

diff --git a/install.php b/install.php
old mode 100644 (file)
new mode 100755 (executable)
index 8a34477..9d55b3b
--- a/install.php
+++ b/install.php
@@ -23,6 +23,7 @@ define ('QUOTE', "'");
 define ('JIRAFEAU_CFG', JIRAFEAU_ROOT.'lib/config.local.php');
 define ('JIRAFEAU_VAR_RAND_LENGTH', 15);
 
 define ('JIRAFEAU_CFG', JIRAFEAU_ROOT.'lib/config.local.php');
 define ('JIRAFEAU_VAR_RAND_LENGTH', 15);
 

+require (JIRAFEAU_ROOT . 'lib/lang.php');

 require (JIRAFEAU_ROOT . 'lib/config.php');
 
 function
 require (JIRAFEAU_ROOT . 'lib/config.php');
 
 function


@@ -261,7 +262,6 @@ case 2:
 
 case 1:
 default:
 
 case 1:
 default:

-    $languages = array ('' => 'English', 'fr_FR.UTF-8' => 'Français');

     ?><h2><?php printf (_('Installation of Jirafeau - step %d out of %d'),
                             1, 3);
     ?></h2> <div id = "install"> <form action =
     ?><h2><?php printf (_('Installation of Jirafeau - step %d out of %d'),
                             1, 3);
     ?></h2> <div id = "install"> <form action =


@@ -278,7 +278,7 @@ default:
     ?></label></td>
         <td class = "field">
         <select name = "lang" id = "select_lang">
     ?></label></td>
         <td class = "field">
         <select name = "lang" id = "select_lang">

-        <?php foreach ($languages as $key => $item)
+        <?php foreach ($languages_list as $key => $item)

     {
         echo '<option value="'.$key.'"'.($key ==
                                          $cfg['lang'] ? ' selected="selected"'
     {
         echo '<option value="'.$key.'"'.($key ==
                                          $cfg['lang'] ? ' selected="selected"'