Changeset 874

Timestamp:

03/15/06 13:34:20 (7 years ago)

Author:

benjamin

Message:

Adding source flags + correcting ticket #546 about fr_CA and other locales problems

Location:

trunk/bureau

Files:

• admin/index.php (modified) (1 diff)
• class/lang_env.php (modified) (4 diffs)

trunk/bureau/admin/index.php

@@ -68 +68 @@
 <?php 
 foreach($locales as $l) {
+if (file_exists("../".$l.".png")) {
 ?>
  <a href="?setlang=<?php echo $l; ?>"><img src="../<?php echo $l; ?>.png" alt="<?php __($l); ?>" title="<?php __($l); ?>" /></a>
 &nbsp;&nbsp;
-     <?php } ?>
+     <?php } } ?>
 </td>
 <td style="text-align: right">

trunk/bureau/class/lang_env.php

@@ -20 +20 @@
   $lang=$_REQUEST["setlang"];
 }
-// default language (can be changed here)
-$language="fr_FR";
 
 $locales=array("fr_FR"=>"fr_FR","en_US"=>"en_US");
@@ -31 +29 @@
 }
 
+
 if (!$locales[$lang]) { // Requested language not found in locales
   // treat special cases such as en_AU or fr_BF : use the language only, not the country.
@@ -36 +35 @@
   foreach($locales as $l) {
     if (substr($l,0,2)==$ll) {
-      $language=$l;
+      $lang=$l;
       break;
     }
@@ -42 +41 @@
 }
 
-if ($setlang && $language) {
+if (!$locales[$lang]) $lang=$locales[0]; 
+
+if ($setlang && $lang) {
   setcookie("lang",$lang);
 }
 
 // User chose a non existent language, select the first available one 
-if (!$locales[$lang]) $lang=$locales[0]; 
+
 
 /* Language ok, set the locale environment */
-putenv("LC_MESSAGES=$language");
-putenv("LANG=$language");
-putenv("LANGUAGE=$language");
+putenv("LC_MESSAGES=$lang");
+putenv("LANG=$lang");
+putenv("LANGUAGE=$lang");
 // this locale MUST be selected in "dpkg-reconfigure locales"
-setlocale(LC_ALL,$language); 
+setlocale(LC_ALL,$lang); 
 textdomain("alternc");