Changeset 9265

Timestamp:

Feb 17, 2011, 5:50:37 PM (14 years ago)

Author:

mistic100

Message:

[extensions] PHP Optimisateur

• change language management
• correct english and letton language file

Location:

extensions/PHP_Optimisateur

Files:

• include/functions.php (modified) (3 diffs)
• include/header.php (modified) (1 diff)
• language/en (deleted)
• language/en_UK (added)
• language/en_UK/en_UK.php (added)
• language/en_UK/en_UK.png (added)
• language/en_UK/en_UK.txt (added)
• language/fr (deleted)
• language/fr_FR (added)
• language/fr_FR/fr_FR.php (added)
• language/fr_FR/fr_FR.png (added)
• language/fr_FR/fr_FR.txt (added)
• language/lv (deleted)
• language/lv_LV (added)
• language/lv_LV/lv_LV.php (added)
• language/lv_LV/lv_LV.png (added)
• language/lv_LV/lv_LV.txt (added)
• plugins/convert_pan/lang/en.php (deleted)
• plugins/convert_pan/lang/en_UK.php (added)
• plugins/convert_pan/lang/fr.php (deleted)
• plugins/convert_pan/lang/fr_FR.php (added)
• plugins/create_custom_thumbs/lang/en.php (deleted)
• plugins/create_custom_thumbs/lang/en_UK.php (added)
• plugins/create_custom_thumbs/lang/fr.php (deleted)
• plugins/create_custom_thumbs/lang/fr_FR.php (added)
• plugins/front2back_support/lang/en.php (deleted)
• plugins/front2back_support/lang/en_UK.php (added)
• plugins/front2back_support/lang/fr.php (deleted)
• plugins/front2back_support/lang/fr_FR.php (added)
• plugins/watermark/lang/en.php (deleted)
• plugins/watermark/lang/en_UK.php (added)
• plugins/watermark/lang/fr.php (deleted)
• plugins/watermark/lang/fr_FR.php (added)

extensions/PHP_Optimisateur/include/functions.php

@@ -22 +22 @@
         while ($file = readdir($dh)) {
                 if ($file !== '.' && $file !== '..' && is_dir('language/'.$file)) {
-                        $languages[] = $file;
+                        $name = (file_exists('language/'.$file.'/'.$file.'.txt')) ? file_get_contents('language/'.$file.'/'.$file.'.txt') : $file;
+                        $languages[$file] = $name;
                 }
         }
@@ -29 +30 @@
         // recherche du paramètre get ou session, ou langue du navigateur
         if (isset($_GET['Lang'])) {
-                $_SESSION['Lang'] = $_GET['Lang'];
-        } else if (!isset($_SESSION['Lang']) OR $_SESSION['Lang'] == NULL) {
-                $_SESSION['Lang'] = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'],0,2);
-        }
-        if (!in_array($_SESSION['Lang'], $languages)) {
-                $_SESSION['Lang'] = 'en';
-        }
-
+                $user_lang = $_GET['Lang'];
+        } else if (isset($_SESSION['Lang']) AND $_SESSION['Lang'] != NULL) {
+                $user_lang = $_SESSION['Lang'];
+        } else {
+                $user_lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'],0,2);
+        }
+        
+        // si langue navigateur cherche une correspondance dans la tableau
+        if (strlen($user_lang) == 2) {
+                foreach (array_keys($languages) as $lang) {
+                        if ($user_lang == substr($lang,0,2)) {
+                                $user_lang = $lang;
+                                break;
+                        }
+                }
+        }
+        
+        // si pas de correspondance OU get faux, langue par défaut
+        if (!in_array($user_lang, array_keys($languages))) {
+                $user_lang = 'en_UK';
+        }
+        
+        $_SESSION['Lang'] = $user_lang;
         return array('user_lang' => $_SESSION['Lang'], 'languages' => $languages);
 }
@@ -244 +260 @@
                 include('plugins/'.$plugin_id.'/lang/'.$CONF['user_lang'].'.php');
         } else {
-                include('plugins/'.$plugin_id.'/lang/en.php');
+                include('plugins/'.$plugin_id.'/lang/en_UK.php');
         }
 }

extensions/PHP_Optimisateur/include/header.php

@@ -34 +34 @@
         
         <span class="lang">';
-        foreach ($CONF['languages'] as $key) {
-                echo '<a class="lang" href="index.php?Lang='.$key.'" title="'.$key.'"><img src="language/'.$key.'/'.$key.'.png" alt="'.$key.'"/></a>';
+        foreach ($CONF['languages'] as $key => $name) {
+                echo '<a class="lang" href="index.php?Lang='.$key.'" title="'.$name.'"><img src="language/'.$key.'/'.$key.'.png" alt="'.$name.'"/></a>';
         }
         echo '</span>