Changeset 2870

Timestamp:

Nov 14, 2008, 1:44:14 PM (15 years ago)

Author:

patdenice

Message:

Available languages are now defined in loader file.
Some corrections in french traductions.

Location:

extras/auto-install/trunk

Files:

• get_language.php (deleted)
• language/fr_FR/loader.lang.txt (modified) (2 diffs)
• piwigo-loader.php (modified) (3 diffs)

extras/auto-install/trunk/language/fr_FR/loader.lang.txt

@@ -24 +24 @@
 $lang['Welcome to NetInstall!'] = 'Bienvenue sur NetInstall!';
 $lang['Language'] = 'Langue';
-$lang['This tool is meant to retrieve the latest Piwigo archive and unzip it in your webspace.'] = 'Cet outil permet de récupérer la dernière version de Piwigo et à la décompresser sur votre espace web.';
-$lang['Right after then, you will be redirect to the Piwigo Setup Wizard.'] = 'Vous serez redirigés par la suite vers la page d\'installation de Piwigo.';
+$lang['This tool is meant to retrieve the latest Piwigo archive and unzip it in your webspace.'] = 'Cet outil permet de récupérer la dernière version de Piwigo et la décompresser sur votre espace web.';
+$lang['Right after then, you will be redirect to the Piwigo Setup Wizard.'] = 'Vous serez redirigés ensuite vers la page d\'installation de Piwigo.';
 
 $lang['Write access is needed'] = 'Les droits d\'accès en écriture sont nécessaires';
-$lang['It looks like NetInstall wont be able to write in the current directory, and this is required to follow on.'] = 'Apparemment, NetInstall n\'a pas le droit d\'écrire dans le dossier courant: ceci est indispensable.';
-$lang['Please try to change the permissions to allow write access, then reload this page by hitting the Refresh button.'] = 'Essayez de changer les permissions pour l\'accès en écriture, puis rechargez la page en appuyant sur le bouton actualiser.';
+$lang['It looks like NetInstall wont be able to write in the current directory, and this is required to follow on.'] = 'NetInstall n\'a pas le droit d\'écrire dans le dossier courant: ceci est indispensable.';
+$lang['Please try to change the permissions to allow write access, then reload this page by hitting the Refresh button.'] = 'Essayez de changer les permissions pour autoriser l\'accès en écriture, puis rechargez la page en appuyant sur le bouton "Actualiser".';
 $lang['Refresh'] = 'Actualiser';
 
 $lang['PHP 5 is required'] = 'PHP 5 est requis';
-$lang['It appears your webhost is currently running PHP %s.'] = 'Apparemment, la version de votre serveur est PHP %s.';
+$lang['It appears your webhost is currently running PHP %s.'] = 'Apparemment, la version PHP de votre hébergeur est PHP %s.';
 $lang['NetInstall may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'NetInstall va essayer de passer en PHP 5 en créant ou en modifiant le fichier .htaccess.';
-$lang['Note you can change your configuration by yourself and restart NetInstall after that.'] = 'Notez que vous pouvez changer vous-même la configuration et re-lancer NetInstall après.';
+$lang['Note you can change your configuration by yourself and restart NetInstall after that.'] = 'Notez que vous pouvez changer vous-même la configuration PHP et re-lancer NetInstall après.';
 $lang['Try to configure PHP 5'] = 'Essayer de configurer PHP 5';
 
@@ -50 +50 @@
 $lang['Needed files are not present.'] = 'Les fichiers nécessaires sont manquants.';
 $lang['Invalid zip file.'] = 'Archive zip invalide.';
-$lang['It seems that the zip file was not extracted.'] = 'Les fichiers n\'ont pas été extraits correctement..';
+$lang['It seems that the zip file was not extracted.'] = 'Les fichiers n\'ont pas été extraits correctement.';
 
 $lang['Congratulations!'] = 'Félicitation!';

extras/auto-install/trunk/piwigo-loader.php

@@ -12 +12 @@
 
 // +-----------------------------------------------------------------------+
-// |                                                                                                                     Configuration                                                                                                   |
+// |                              Configuration                            |
 // +-----------------------------------------------------------------------+
 
-define('DC_LOADER_SERVICE','http://piwigo.free.fr/loader/');
+define('DC_LOADER_SERVICE','http://svn.gna.org/viewcvs/*checkout*/phpwebgallery/extras/auto-install/trunk/');
 define('DC_LOADER_ARCHIVE','http://download.gna.org/phpwebgallery/release/2.0/candidate/phpwebgallery-2.0.0RC4.zip');
+
+$available_languages = array(
+  'en_UK' => 'English [UK]',
+  'fr_FR' => 'Français [FR]',
+//  'de_DE' => 'Deutch [DE]',    /* Not translated yet */
+//  'es_ES' => 'Español [ES]',   /* Not translated yet */
+//  'it_IT' => 'Italiano [IT]',  /* Not translated yet */
+//  'nl_NL' => 'Dutch [NL]'      /* Not translated yet */
+);
 
 // +-----------------------------------------------------------------------+
@@ -141 +150 @@
         global $can_fetch, $lang, $available_languages;
 
-        $language = 'en_UK';
-        $available_languages = array();
-
-        // Rertrieve available languages
-        if ($can_fetch and fetchRemote(DC_LOADER_SERVICE.'get_language.php', $str))
-        {
-                $available_languages = @unserialize($str);
-        }
-
-        if (isset($_GET['language']))
-        {
-                $language = strip_tags($_GET['language']);
+        if (isset($_GET['language']) and isset($available_languages[$_GET['language']]))
+        {
+                $language = $_GET['language'];
         }
         else
         {
+                $language = 'en_UK';
                 // Try to get browser language
                 foreach ($available_languages as $language_code => $language_name)
@@ -365 +366 @@
 
                 // Show available languages
-                if (!empty($available_languages))
-                {
-                        echo
-                        '<p class="language">'.l10n('Language').' &nbsp;'."\n".
-                        '<select name="language" onchange="document.location = \''.basename(__FILE__).'?language=\'+this.options[this.selectedIndex].value;">'."\n";
-
-                        foreach ($available_languages as $language_code => $language_name)
-                        {
-                                echo '<option label="'.$language_name.'" value="'.$language_code.'" '.($language_code == DC_LOADER_LANG ? 'selected="selected"' : '').'>'.$language_name.'</option>'."\n";
-                        }
-                        echo '</select>'."\n".
-                        '</p>'."\n";
-                }
+                asort($available_languages);
+                echo
+                '<p class="language">'.l10n('Language').' &nbsp;'."\n".
+                '<select name="language" onchange="document.location = \''.basename(__FILE__).'?language=\'+this.options[this.selectedIndex].value;">'."\n";
+                foreach ($available_languages as $language_code => $language_name)
+                {
+                        echo '<option label="'.$language_name.'" value="'.$language_code.'" '.($language_code == DC_LOADER_LANG ? 'selected="selected"' : '').'>'.$language_name.'</option>'."\n";
+                }
+                echo '</select>'."\n".'</p>'."\n";
 
                 echo