Added french support to installation process

diff --git a/install.php b/install.php
index 9d55b3b919b173f125990a0aa6a59a1d502cae1c..ff4f1e2e48493713a41a86a57355e701cfb55ac2 100755 (executable)
--- a/install.php
+++ b/install.php
@@ -82,12 +82,12 @@ jirafeau_is_writable ($path)
 function
 jirafeau_check_var_dir ($path)
 {
 function
 jirafeau_check_var_dir ($path)
 {

-    $mkdir_str1 = _('The following directory could not be created:');
+    $mkdir_str1 = _('The following directory could not be created') . ':';

     $mkdir_str2 = _('You should create this directory by hand.');
     $mkdir_str2 = _('You should create this directory by hand.');

-    $write_str1 = _('The following directory is not writable:');
+    $write_str1 = _('The following directory is not writable') . ':';

     $write_str2 = _('You should give the write right to the web server on ' .
                     'this directory.');
     $write_str2 = _('You should give the write right to the web server on ' .
                     'this directory.');

-    $solution_str = _('Here is a solution:');
+    $solution_str = _('Here is a solution') . ':';

 
     if (!jirafeau_mkdir ($path) || !jirafeau_is_writable ($path))
         return array ('has_error' => true,
 
     if (!jirafeau_mkdir ($path) || !jirafeau_is_writable ($path))
         return array ('has_error' => true,


@@ -179,8 +179,8 @@ else if (isset ($_POST['retry']))
 switch ($current)
 {
 case 3:
 switch ($current)
 {
 case 3:

-    ?><h2><?php printf (_('Installation of Jirafeau - step %d out of %d'),
-                         3, 3);
+    ?><h2><?php printf (_('Installation of Jirafeau') . ' - ' . _('step') .
+    ' %d ' . _('out of') . ' %d', 3, 3);

     ?></h2> <div id = "install"> <form action =
         "<?php echo basename(__FILE__); ?>" method = "post"> <input type =
         "hidden" name = "jirafeau" value =
     ?></h2> <div id = "install"> <form action =
         "<?php echo basename(__FILE__); ?>" method = "post"> <input type =
         "hidden" name = "jirafeau" value =


@@ -189,8 +189,8 @@ case 3:
         "3" /><fieldset> <legend><?php echo _('Finalisation');
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo
         "3" /><fieldset> <legend><?php echo _('Finalisation');
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo

-        _
-        ('Jirafeau is setting the website according to the configuration you provided.');
+        _ ('Jirafeau is setting the website according to the configuration ' .
+           'you provided.');

     ?></td> </tr> <tr> <td class = "nav previous"><input type =
         "submit" name = "previous" value =
         "
     ?></td> </tr> <tr> <td class = "nav previous"><input type =
         "submit" name = "previous" value =
         "


@@ -214,15 +214,15 @@ case 3:
     else
     {
         echo '<div class="message"><p>' .
     else
     {
         echo '<div class="message"><p>' .

-             _('Your website is now fully operational:') .
+             _('Jirafeau is now fully operational') . ':' .

              '<br /><a href="' . $cfg['web_root'] . '">' .
              $cfg['web_root'].'</a></p></div>';
     }
     break;
 
 case 2:
              '<br /><a href="' . $cfg['web_root'] . '">' .
              $cfg['web_root'].'</a></p></div>';
     }
     break;
 
 case 2:

-    ?><h2><?php printf (_('Installation of Jirafeau - step %d out of %d'),
-                            2, 3);
+    ?><h2><?php printf (_('Installation of Jirafeau') . ' - ' . _('step') .
+    ' %d ' . _('out of') . ' %d', 2, 3);

     ?></h2> <div id = "install"> <form action =
         "<?php echo basename(__FILE__); ?>" method = "post"> <input type =
         "hidden" name = "jirafeau" value =
     ?></h2> <div id = "install"> <form action =
         "<?php echo basename(__FILE__); ?>" method = "post"> <input type =
         "hidden" name = "jirafeau" value =


@@ -234,7 +234,7 @@ case 2:
         _
         ('The base address of Jirafeau is the first part of the URL, until (and including) the last slash. For example: "http://www.example.com/". Do not forget the ending slash!');
     ?></td> </tr> <tr> <td class = "label"><label for = "input_web_root"
         _
         ('The base address of Jirafeau is the first part of the URL, until (and including) the last slash. For example: "http://www.example.com/". Do not forget the ending slash!');
     ?></td> </tr> <tr> <td class = "label"><label for = "input_web_root"

-       ><?php echo _('Base address:');
+       ><?php echo _('Base address') . ':';

     ?></label></td>
         <td class = "field"><input type = "text" name = "web_root" id = "input_web_root" value = "<?php
         echo (empty($cfg['web_root']) ?
     ?></label></td>
         <td class = "field"><input type = "text" name = "web_root" id = "input_web_root" value = "<?php
         echo (empty($cfg['web_root']) ?


@@ -243,7 +243,7 @@ case 2:
       ?>" size = "40" /></td>
         </tr> <tr> <td class = "info" colspan = "2"><?php echo _('The data directory is where your files and information about your files will be stored. You should put it outside your web site, or at least restrict the access of this directory. Do not forget the ending slash!');
     ?></td> </tr> <tr> <td class = "label"><label for = "input_var_root"
       ?>" size = "40" /></td>
         </tr> <tr> <td class = "info" colspan = "2"><?php echo _('The data directory is where your files and information about your files will be stored. You should put it outside your web site, or at least restrict the access of this directory. Do not forget the ending slash!');
     ?></td> </tr> <tr> <td class = "label"><label for = "input_var_root"

-       ><?php echo _('Data directory:');
+       ><?php echo _('Data directory') . ':';

     ?></label></td>
         <td class = "field"><input type = "text" name = "var_root" id = "input_var_root" value = "<?php
         if(empty($cfg['var_root'])) {
     ?></label></td>
         <td class = "field"><input type = "text" name = "var_root" id = "input_var_root" value = "<?php
         if(empty($cfg['var_root'])) {


@@ -262,8 +262,8 @@ case 2:
 
 case 1:
 default:
 
 case 1:
 default:

-    ?><h2><?php printf (_('Installation of Jirafeau - step %d out of %d'),
-                            1, 3);
+    ?><h2><?php printf (_('Installation of Jirafeau') . ' - ' . _('step') .
+    ' %d ' . _('out of') . ' %d', 1, 3);

     ?></h2> <div id = "install"> <form action =
         "<?php echo basename(__FILE__); ?>" method = "post"> <input type =
         "hidden" name = "jirafeau" value =
     ?></h2> <div id = "install"> <form action =
         "<?php echo basename(__FILE__); ?>" method = "post"> <input type =
         "hidden" name = "jirafeau" value =


@@ -272,9 +272,9 @@ default:
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo
         _
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo
         _

-        ('The installation of Jirafeau is internationalised, so you can have it in your own language if the translation is available.');
+        ('Jirafeau is internationalised. Choose a specific langage or choose Automatic (langage is provided by user\'s browser).');

     ?></td> </tr> <tr> <td class = "label"><label for = "select_lang"
     ?></td> </tr> <tr> <td class = "label"><label for = "select_lang"

-       ><?php echo _('Choose your language:');
+       ><?php echo _('Choose the default language') . ':';

     ?></label></td>
         <td class = "field">
         <select name = "lang" id = "select_lang">
     ?></label></td>
         <td class = "field">
         <select name = "lang" id = "select_lang">

diff --git a/lib/lang/fr.php b/lib/lang/fr.php
index 1dc2452ca7fb1b0a93dc21e0c219bdca96ba8b7d..e5dd12f2d9a64bfb74dbb1fe4f4574f844825066 100755 (executable)
--- a/lib/lang/fr.php
+++ b/lib/lang/fr.php
@@ -18,6 +18,7 @@
  */
 
 $tr = array (
  */
 
 $tr = array (

+            /* index.php */

              'Jirafeau, your web file repository' => 'Jirafeau, votre dépot de fichiers',
              'Upload a file' => 'Envoyer un fichier',
              'One time download' => 'Téléchargement unique',
              'Jirafeau, your web file repository' => 'Jirafeau, votre dépot de fichiers',
              'Upload a file' => 'Envoyer un fichier',
              'One time download' => 'Téléchargement unique',


@@ -40,6 +41,7 @@ $tr = array (
              'File uploaded! Copy the following URL to get it' => 'Fichier envoyé! Copiez le lien suivant pour le télécharger',
              'This file is valid until the following date' => 'Ce fichier est valable jusqu\'à la date suivante',
              'Keep the following URL to delete it at any moment' => 'Conservez le lien suivant pour le supprimer à n\'importe quel moment',
              'File uploaded! Copy the following URL to get it' => 'Fichier envoyé! Copiez le lien suivant pour le télécharger',
              'This file is valid until the following date' => 'Ce fichier est valable jusqu\'à la date suivante',
              'Keep the following URL to delete it at any moment' => 'Conservez le lien suivant pour le supprimer à n\'importe quel moment',

+             /* file.php */

              'Error 404: Not Found' => 'Erreur 404: La page que vous cherchez n\'existe pas ou n\'existe plus',
              'File not available.' => 'Fichier non disponible',
              'File has been deleted.' => 'Le fichier a été supprimé.',
              'Error 404: Not Found' => 'Erreur 404: La page que vous cherchez n\'existe pas ou n\'existe plus',
              'File not available.' => 'Fichier non disponible',
              'File has been deleted.' => 'Le fichier a été supprimé.',


@@ -48,6 +50,40 @@ $tr = array (
              'Give the password of this file:' => 'Donnez le mot de passe pour ce fichier',
              'I have the right to download this file' => 'J\'ai le droit de télécharger ce fichier',
              'Error 403: Forbidden' => 'Erreur 403: Accès interdit',
              'Give the password of this file:' => 'Donnez le mot de passe pour ce fichier',
              'I have the right to download this file' => 'J\'ai le droit de télécharger ce fichier',
              'Error 403: Forbidden' => 'Erreur 403: Accès interdit',

+             /* install.hpp */
+             'This file was generated by the install process. You can edit it. Please see config.php to understand the configuration items.' => 'Ce fichier a été généré par le processus d\'installation. Vous pouvez l\'éditer. Merci de se référer à config.php pour comprendre les éléments de configuration.',
+             'The following directory could not be created' => 'Le dossier suivant ne peut être créé',
+             'You should create this directory by hand.' => 'Vous devriez creer manuelement ce dossier',
+             'The following directory is not writable' => 'Le dossier suivant ne peut être créé',
+             'You should give the write right to the web server on this directory.' => 'Vous devriez donner le droits d\'écriture à ce repertoire pour le rendre accéssible par le serveur web.',
+             'Here is a solution' => 'Une solution possible',
+             'The local configuration file could not be created. Create a ' .
+                '<code>lib/config.local.php</code> file and give the write ' .
+                'right to the web server (preferred solution), or give the ' .
+                'write right to the web server on the <code>lib</code> ' .
+                'directory.' => 'Le fichier de configuration local ne peut être créé. Creez le fichier <code>lib/config.local.php</code> et donnez lui les droits d\'écriture par le serveur web (solution préférable) ou bien donnez les accès en écriture au dossier <code>lib</code>',
+            'The local configuration is not writable by the web server. ' .
+                'Give the write right to the web server on the ' .
+                '<code>lib/config.local.php</code> file.' => 'Le fichier de configuration local ne peut être écrit. Donnez les droits d\'écriture au fichier <code>lib/config.local.php</code> par le serveur web.',
+            'Installation of Jirafeau' => 'Installation de Jirafeau',
+            'step' => 'étape',
+            'out of' => 'sur',
+            'Finalisation' => 'Finalisation',
+            'Jirafeau is setting the website according to the configuration you provided.' => 'Jirafeau se configure selon les paramêtres donnés',
+            'Previous step' => 'Etape précedente',
+            'Retry this step' => 'Ressayer cette étape',
+            'Jirafeau is now fully operational' => 'Jirafeau est maintenant utilisable',
+            'Information' => 'Information',
+            'The base address of Jirafeau is the first part of the URL, until (and including) the last slash. For example: "http://www.example.com/". Do not forget the ending slash!'
+                => 'L\'adresse d\'origine de Jirafeau est la première partie de l\'URL (slash de fin inclue). Par exemple: "http://www.exemple.com/". N\'oubliez pas le slash de fin !',
+            'Base address' => 'Addresse d\'origine',
+            'The data directory is where your files and information about your files will be stored. You should put it outside your web site, or at least restrict the access of this directory. Do not forget the ending slash!'
+                => 'Le dossier "data" est là où seront stoqués les fichiers ainsi que leurs informations. Ce dossier ne devrait pas être accessible directement par l\'utilisateur. N\'oubliez pas le slash de fin !',
+            'Data directory' => 'Dossier de stockage des données',
+            'Jirafeau is internationalised. Choose a specific langage or choose Automatic (langage is provided by user\'s browser).'
+                => 'Jirafeau supporte plusieurs languages. Choisissez un langage spécific ou Automatic (la langue utilisée est alors fournie par le navigateur du visiteur).',
+            'Choose the default language' => 'Choissiez la langue par defaut',
+            'Next step' => 'Etape suivante',

             );
 
  ?>
\ No newline at end of file
             );
 
  ?>
\ No newline at end of file