big banana update

diff --git a/article.php b/article.php
index 58d9a60..f5564a2 100644 (file)
--- a/article.php
+++ b/article.php
@@ -18,9 +18,7 @@ require_once("include/profile.inc.php");
 require_once("include/password.inc.php");
 require_once("include/error.inc.php");
 
-$profile=getprofile();
-require_once($profile['locale']);
-
+$profile = getprofile();
 require_once("include/header.inc.php");
 
 if (isset($_REQUEST['group'])) {
@@ -52,22 +50,21 @@ $ndx = $spool->getndx($id);
 
 ?>
 <h1>
-  <?php echo $locale['article']['message'];?>
+  <?php echo _('Message'); ?>
 </h1>
 
 <?php
 if (isset($_GET['type']) && ($_GET['type']=='cancel') && (checkcancel($post->headers))) {
 ?>
 <p class="<?php echo $css['error']?>">
-  <?php echo $locale['article']['cancel'];?>
+  <?php echo _('Voulez-vous vraiment annuler ce message ?'); ?>
 </p>
 <form action="thread.php" method="post">
   <input type="hidden" name="group" value="<?php echo $group;?>" />
   <input type="hidden" name="id" value="<?php 
     echo $id;?>" />
   <input type="hidden" name="type" value="cancel" />
-  <input type="submit" name="action" value="<?php echo 
-    $locale['article']['okbtn'];?>" />
+  <input type="submit" name="action" value="<?php echo _('OK'); ?>" />
 </form>
 <?
 }
@@ -76,23 +73,23 @@ displayshortcuts();
 ?>
 
 <table class="<?php echo $css['bicol']?>" cellpadding="0" cellspacing="0" 
-summary="<?php echo $locale['article']['summary'];?>">
+summary="<?php echo _('Contenu du message'); ?>">
   <tr>
     <th colspan="2">
-      <?php echo $locale['article']['headers'];?>
+      <?php echo _('En-têtes'); ?>
     </th>
   </tr>
 <?php
 foreach ($news['headdisp'] as $nick) {
   if (isset($post->headers->$nick)) 
-    echo "<tr><td class=\"{$css['bicoltitre']}\">{$locale['headers'][$nick]}</td>"
+    echo "<tr><td class=\"{$css['bicoltitre']}\">".header_translate($nick)."</td>"
     ."<td>".formatdisplayheader($nick,$post->headers->$nick,$spool)
     ."</td></tr>\n";
 }
 ?>
   <tr>
     <th colspan="2">
-      <?php echo $locale['article']['body'];?>
+      <?php echo _('Corps'); ?>
     </th>
   </tr> 
   <tr>
@@ -102,7 +99,7 @@ foreach ($news['headdisp'] as $nick) {
   </tr>
   <tr>
     <th colspan="2">
-      <?php echo $locale['article']['overview'];?>
+      <?php echo _('Aperçu'); ?>
     </th>
   </tr> 
   <tr>

diff --git a/disconnect.php b/disconnect.php
index 4b30556..f3fe78c 100644 (file)
--- a/disconnect.php
+++ b/disconnect.php
@@ -12,18 +12,16 @@ require_once("include/profile.inc.php");
 require_once("include/error.inc.php");
 
 $profile=getprofile();
-require_once($profile['locale']);
-
 $_SESSION=array();
 session_destroy();
 
 require_once("include/header.inc.php");
 ?>
 <div class="title">
-  <?php echo $locale['disconnect']['title'];?>
+  <?php echo _('Déconnexion effectuée !'); ?>
 </div>
 <p class="normal">
-  <?php echo $locale['disconnect']['back'];?>
+  <?php echo _('Retour au <a href="index.php">profil</a>'); ?>
 </p>
 <?php
 require_once("include/footer.inc.php");

diff --git a/include/misc.inc.php b/include/misc.inc.php
index 1db84aa..8eb5af7 100644 (file)
--- a/include/misc.inc.php
+++ b/include/misc.inc.php
@@ -18,6 +18,41 @@ function headerDecode($value) {
     return preg_replace('/=\?([^?]*)\?([BQ])\?([^?]*)\?=/e', '_headerdecode("\1", "\2", "\3")', $val);
 }
 
+function header_translate($hdr) {
+    switch (strtolower($hdr)) {
+        case 'from':            return _('De');
+        case 'subject':         return _('Sujet');
+        case 'newsgroups':      return _('Forums');
+        case 'followup':        return _('Suivi-à');
+        case 'date':            return _('Date');
+        case 'organization':    return _('Organisation');
+        case 'references':      return _('Références');
+        case 'xface':           return _('Image');
+        default:
+            return $hdr;
+    }
+}
+
+function formatDate($_text) {
+    return strftime("%A %d %B %Y, %H:%M (fuseau serveur)", strtotime($_text));
+}
+
+function fancyDate($stamp) {
+    $today  = intval(time() / (24*3600));
+    $dday   = intval($stamp / (24*3600));
+
+    if ($today == $dday) {
+        $format = "%H:%M";
+    } elseif ($today == 1 + $dday) {
+        $format = _('hier')." %H:%M";
+    } elseif ($today < 7 + $dday) {
+        $format = '%A %H:%M';
+    } else {
+        $format = '%a %e %b';
+    }
+    return strftime($format, $stamp);
+}
+
 function formatFrom($text) {
 #     From: mark@cbosgd.ATT.COM
 #     From: mark@cbosgd.ATT.COM (Mark Horton)

diff --git a/include/spool.inc.php b/include/spool.inc.php
index 9166727..431fb96 100644 (file)
--- a/include/spool.inc.php
+++ b/include/spool.inc.php
@@ -303,7 +303,7 @@ class spool
             $hc = empty($this->overview[$_id]->children);
 
             echo '<tr class="'.($_index%2?$css["pair"]:$css["impair"]).($this->overview[$_id]->isread?'':' new')."\">\n";
-            echo "<td class=\"{$css['date']}\">".locale_header_date($this->overview[$_id]->date)." </td>\n";
+            echo "<td class=\"{$css['date']}\">".fancyDate($this->overview[$_id]->date)." </td>\n";
             echo "<td class=\"{$css['subject']}\">"
                 ."<div class=\"{$css['tree']}\">$_pfx_node".($hc?($_head?$spfx_f:($this->overview[$_id]->parent_direct?$spfx_s:$spfx_snd)):$spfx_n)
                 ."</div>";

diff --git a/index.php b/index.php
index 4c8d8a3..736cf27 100644 (file)
--- a/index.php
+++ b/index.php
@@ -17,8 +17,6 @@ require_once("include/profile.inc.php");
 require_once("include/error.inc.php");
 
 $profile=getprofile();
-require_once($profile['locale']);
-
 require_once("include/header.inc.php");
 
 $nntp = new nntp($news['server']);
@@ -34,7 +32,7 @@ $newgroups = new groups($nntp,1);
 ?>
 
 <h1>
-  <?php echo $locale['index']['title'];?>
+  <?php echo _('Les forums de Banana'); ?>
 </h1>
 
 <?php
@@ -43,20 +41,19 @@ if (!sizeof($groups->overview)) error("nntpgroups");
 displayshortcuts();
 ?>
 
-<table class="<?php echo $css["bicol"];?>" cellspacing="0" cellpadding="2" 
-  summary="<?php echo $locale['index']['summary'];?>">
+<table class="<?php echo $css["bicol"];?>" cellspacing="0" cellpadding="2">
   <tr>
     <th>
-      <?php echo $locale['index']['total'];?>
+      <?php echo _('Total'); ?>
     </th>
     <th>
-      <?php echo $locale['index']['unread'];?>
+      <?php echo _('Nouveaux'); ?>
     </th>
     <th>
-      <?php echo $locale['index']['name'];?>
+      <?php echo _('Nom'); ?>
     </th>
     <th>
-      <?php echo $locale['index']['description'];?>
+      <?php echo _('Description'); ?>
     </th>
   </tr>
 <?php
@@ -88,19 +85,18 @@ foreach ($groups->overview as $g => $d) {
 if (count($newgroups->overview) and count($profile['subscribe'])) {
 ?>
 <p class="normal">
-<?php echo $locale['index']['newgroupstext']; ?>
+<?php echo _('Les forums suivants ont été créés depuis ton dernier passage :'); ?>
 </p>
-<table class="<?php echo $css["bicol"];?>" cellspacing="0" cellpadding="2" 
-  summary="<?php echo $locale['index']['summary'];?>">
+<table class="<?php echo $css["bicol"];?>" cellspacing="0" cellpadding="2">
   <tr>
     <th>
-      <?php echo $locale['index']['total'];?>
+      <?php echo _('Total'); ?>
     </th>
     <th>
-      <?php echo $locale['index']['name'];?>
+      <?php echo _('Nom'); ?>
     </th>
     <th>
-      <?php echo $locale['index']['description'];?>
+      <?php echo _('Description'); ?>
     </th>
   </tr>
 <?php

diff --git a/install.d/error.inc.php b/install.d/error.inc.php
index 1507cc3..702295e 100644 (file)
--- a/install.d/error.inc.php
+++ b/install.d/error.inc.php
@@ -7,49 +7,45 @@
 * Copyright: See COPYING files that comes with this distribution
 ********************************************************************************/
 
- /** outputs HTML error page
-  * @param $_type STRING error type
-  */
-
+/** outputs HTML error page
+ * @param $_type STRING error type
+ */
 function error($_type) {
-  global $locale,$css,$group;
-  switch ($_type) {
-    case "nntpsock":
-      echo "<p class=\"error\">\n\t".$locale['error']['connect']."\n</p>";
-      require_once("include/footer.inc.php");
-      exit;
-      break;  
-    case "nntpauth":
-      echo "<p class=\"error\">\n\t".$locale['error']['credentials']
-        ."\n</p>";
-      require_once("include/footer.inc.php");
-      exit;
-      break;
-    case "nntpgroups":
-      echo "<p class=\"{$css['normal']}\">";
-      echo "\n".$locale['error']['nogroup']."\n";
-      echo "</p>\n";
-      require_once("include/footer.inc.php");
-      exit;
-      break;
-    case "nntpspool":
-      echo "<div class=\"{$css['bananashortcuts']}\">\n";
-      echo "[<a href=\"index.php\">Liste des forums</a>]\n";
-      echo "</div>\n";
-      echo "<p class=\"error\">\n\t".$locale['error']['group']."\n</p>";
-      require_once("footer.inc.php");
-      exit;
-      break;
-    case "nntpart":
-      echo "<div class=\"{$css['bananashortcuts']}\">\n";
-      echo "[<a href=\"index.php\">Liste des forums</a>] \n";
-      echo "[<a href=\"thread.php?group=$group\">$group</a>] \n";
-      echo "</div>\n";
-      echo "<p class=\"error\">\n\t".$locale['error']['post']."\n</p>";
-      require_once("footer.inc.php");
-      exit;
-      break;
-  }
+    global $css, $group;
+    switch ($_type) {
+        case "nntpsock":
+            echo '<p class="error">'._('Impossible de se connecter au serveur de forums').'</p>';
+            require_once("include/footer.inc.php");
+            exit;
+
+        case "nntpauth":
+            echo '<p class="error">'._('L\'authentification sur le serveur de forums a échoué').'</p>';
+            require_once("include/footer.inc.php");
+            exit;
+
+        case "nntpgroups":
+            echo "<p class=\"{$css['normal']}\">";
+            echo _('Il n\'y a pas de forum sur ce serveur').'</p>';
+            require_once("include/footer.inc.php");
+            exit;
+
+        case "nntpspool":
+            echo "<div class=\"{$css['bananashortcuts']}\">\n";
+            echo "[<a href=\"index.php\">Liste des forums</a>]\n";
+            echo "</div>\n";
+            echo '<p class="error">'._('Impossible d\'accéder au forum').'</p>';
+            require_once("footer.inc.php");
+            exit;
+
+        case "nntpart":
+            echo "<div class=\"{$css['bananashortcuts']}\">\n";
+            echo "[<a href=\"index.php\">Liste des forums</a>] \n";
+            echo "[<a href=\"thread.php?group=$group\">$group</a>] \n";
+            echo "</div>\n";
+            echo '<p class="error">'._('Impossible d\'accéder au message.  Le message a peut-être été annulé').'</p>';
+            require_once("footer.inc.php");
+            exit;
+    }
 }
 
 ?>

diff --git a/install.d/format.inc.php b/install.d/format.inc.php
index 00449b3..36b7be7 100644 (file)
--- a/install.d/format.inc.php
+++ b/install.d/format.inc.php
@@ -15,10 +15,9 @@
  */
 
 function formatDisplayHeader($_header,$_text,$_spool) {
-    global $locale;
     switch ($_header) {
         case "date": 
-            return locale_date($_text);
+            return formatDate($_text);
         
         case "followup":
             case "newsgroups":
@@ -61,17 +60,16 @@ function formatDisplayHeader($_header,$_text,$_spool) {
  * @return STRING HTML output
  */
 function displayshortcuts() {
-    global $news,$locale,$first,$spool,$group,$post,$id;
+    global $news,$first,$spool,$group,$post,$id;
     $sname = basename($_SERVER['SCRIPT_NAME']);
 
     echo '<div class="shortcuts">';
-    echo '[<a href="disconnect.php">'.$locale['format']['disconnection']
-        .'</a>] ';
+    echo '[<a href="disconnect.php">'._('Déconnexion').'</a>] ';
 
     switch ($sname) {
         case 'thread.php' :
-            echo '[<a href="index.php">'.$locale['format']['grouplist'].'</a>] ';
-            echo "[<a href=\"post.php?group=$group\">".$locale['format']['newpost']."</a>] ";
+            echo '[<a href="index.php">'._('Liste des forums').'</a>] ';
+            echo "[<a href=\"post.php?group=$group\">"._('Nouveau message')."</a>] ";
             if (sizeof($spool->overview)>$news['max']) {
                 for ($ndx=1; $ndx<=sizeof($spool->overview); $ndx += $news['max']) {
                     if ($first==$ndx) {
@@ -85,22 +83,16 @@ function displayshortcuts() {
             }
             break;
         case 'article.php' :
-            echo '[<a href="index.php">'.$locale['format']['grouplist'].'</a>] ';
-            echo "[<a href=\"thread.php?group=$group\">"
-                .$locale['format']['group_b'].$group
-                .$locale['format']['group_a']."</a>] ";
-            echo "[<a href=\"post.php?group=$group&amp;id=$id&amp;type=followup\">"
-                .$locale['format']['followup']."</a>] ";
+            echo '[<a href="index.php">'._('Liste des forums').'</a>] ';
+            echo "[<a href=\"thread.php?group=$group\">$group</a>] ";
+            echo "[<a href=\"post.php?group=$group&amp;id=$id&amp;type=followup\">"._('Répondre')."</a>] ";
             if (checkcancel($post->headers)) {
-                echo "[<a href=\"article.php?group=$group&amp;id=$id&amp;type=cancel\">"
-                    .$locale['format']['cancel']."</a>] ";
+                echo "[<a href=\"article.php?group=$group&amp;id=$id&amp;type=cancel\">"._('Annuler ce message')."</a>] ";
             }
             break;
         case 'post.php' :
-            echo '[<a href="index.php">'.$locale['format']['grouplist'].'</a>] ';
-            echo "[<a href=\"thread.php?group=$group\">"
-                .$locale['format']['group_b'].$group
-                .$locale['format']['group_a']."</a>] ";
+            echo '[<a href="index.php">'._('Liste des forums').'</a>] ';
+            echo "[<a href=\"thread.php?group=$group\">$group</a>]";
             break;
     }
     echo '</div>';

diff --git a/install.d/profile.inc.php b/install.d/profile.inc.php
index f04bf47..5d96652 100644 (file)
--- a/install.d/profile.inc.php
+++ b/install.d/profile.inc.php
@@ -28,9 +28,12 @@ function getprofile() {
     $array['customhdr'] = "";
     $array['display']   = $_SESSION['displaytype'];
     $array['lastnews']  = time()-86400;
-    $array['locale']    = "locales/fr.inc.php";
+    $array['locale']    = 'fr';
     $array['subscribe'] = array();
     $array['dropsig']   = true;
+
+    setlocale(LC_MESSAGE, $array['locale']);
+    setlocale(LC_TIME, $array['locale']);
     return $array;
 }
 ?>

diff --git a/install.d/profile_form.inc.php b/install.d/profile_form.inc.php
index 0c1aeca..cc3b18e 100644 (file)
--- a/install.d/profile_form.inc.php
+++ b/install.d/profile_form.inc.php
@@ -8,7 +8,7 @@
 ********************************************************************************/
 ?>
 <div class="title">
-  <?php echo $locale['profile']['title'];?>
+  <?php echo _('Bienvenue sur Banana !'); ?>
 </div>
 
 <form action="<?php echo $_SERVER['REQUEST_URI']?>" method="POST">
@@ -16,12 +16,12 @@
   summary="Profile">
     <tr class="pair">
       <th colspan="2">
-        <?php echo $locale['profile']['define'];?>
+        <?php echo _('Définis tes paramètres'); ?>
       </th>
     </tr>
     <tr class="impair">
       <td>
-        <?php echo $locale['profile']['name'];?>
+        <?php echo _('Nom (par exemple Jean Dupont)'; ?>
       </td>
       <td>
         <input type="text" name="profile_name" value="">
@@ -29,7 +29,7 @@
     </tr>
     <tr class="pair">
       <td>
-        <?php echo $locale['profile']['mail'];?>
+        <?php echo _('Adresse mail'); ?>
       </td>
       <td>
         <input type="text" name="profile_mail" value="">
@@ -37,7 +37,7 @@
     </tr>
     <tr class="impair">
       <td>
-        <?php echo $locale['profile']['organization'];?>
+        <?php echo _('Organisation'); ?>
       </td>
       <td>
         <input type="text" name="profile_org" value="">
@@ -45,7 +45,7 @@
     </tr>
     <tr class="pair">
       <td>
-        <?php echo $locale['profile']['signature'];?>
+        <?php echo _('Signature'); ?>
       </td>
       <td>
         <textarea name="profile_sig" rows="7" cols="50"></textarea>
@@ -53,29 +53,29 @@
     </tr>
     <tr class="pair">
       <th colspan="2">
-        <?php echo $locale['profile']['display'];?>
+        <?php echo _('Affichage'); ?>
       </th>
     </tr>
     <tr class="impair">
       <td colspan="2">
         <input type="radio" name="displaytype" value="0" checked> 
-          <?php echo $locale['profile']['all'];?>
+          <?php echo _('Tous les messages'); ?>
       </td>
     </tr>
     <tr class="pair">
       <td colspan="2">
         <input type="radio" name="displaytype" value="1"> 
-          <?php echo $locale['profile']['new'];?>
+          <?php echo _('Seulement les fils de discussion comportant des messages non lus'); ?>
       </td>
     </tr>
     <tr class="pair">
       <th colspan="2">
-        <?php echo $locale['profile']['auth'];?>
+        <?php echo _('Authentification sur le serveur NNTP'); ?>
       </th>
     </tr>
     <tr class="impair">
       <td>
-        <?php echo $locale['profile']['login'];?>
+        <?php echo _('Login (laisser anonyme pour un login en anonyme)'); ?>
       </td>
       <td>
         <input type="text" name="profile_login" value="anonymous">
@@ -83,7 +83,7 @@
     </tr>
     <tr class="pair">
       <td>
-        <?php echo $locale['profile']['passwd'];?>
+        <?php echo _('Mot de passe'); ?>
       </td>
       <td>
         <input type="password" name="profile_passwd" value="">

diff --git a/install.d/session.inc.php b/install.d/session.inc.php
index ff34711..e08b5ee 100644 (file)
--- a/install.d/session.inc.php
+++ b/install.d/session.inc.php
@@ -25,7 +25,6 @@ if (!isset($_SESSION['profile']) && isset($_POST['action']) && $_POST['action']=
 if (!isset($_SESSION['profile'])) {
     require_once("include/profile.inc.php");
     $profile=getprofile();
-    require_once($profile['locale']);
     require_once("header.inc.php");
     require_once("profile_form.inc.php");
     require_once("footer.inc.php");

diff --git a/locales/fr.inc.php b/locales/fr.inc.php
deleted file mode 100644 (file)
index 3b71209..0000000
--- a/locales/fr.inc.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-function locale_date($_text) {
-    return strftime("%A %d %B %Y, %H:%M (fuseau serveur)", strtotime($_text));
-}
-
-function locale_header_date($_text) {
-    $date   = getdate($_text);
-    $now    = time();
-    $dnow   = getdate($now);
-    $days   = array("dim","lun","mar","mer","jeu", "ven","sam");
-    $months = array("janv.","fév.","mars","avr.","mai","juin", "juil.","août","sept.","oct.","nov.","déc.");
-    if (($now-$_text < 39600) || ($dnow["yday"]==$date["yday"])) {
-        return date("H:i",$_text);
-    } elseif (($now-$_text < 2*86400) and ((($date["yday"]-$dnow["yday"])%365)==1)) {
-        return "hier ".date("H:i",$_text);
-    } elseif ($now-$_text < 604800) {
-        return $days[$date["wday"]]." ".date("H:i",$_text);
-    } else {
-        $day = $date["mday"] .($date["mday"]==1 ? "<sup>er</sup>" : '');
-        return "$day ".$months[$date["mon"]-1];
-    }
-}
-
-if (!isset($locale['error']))      $locale['error']      = array();
-if (!isset($locale['index']))      $locale['index']      = array();
-if (!isset($locale['subscribe']))  $locale['subscribe']  = array();
-if (!isset($locale['thread']))     $locale['thread']     = array();
-if (!isset($locale['format']))     $locale['format']     = array();
-if (!isset($locale['post']))       $locale['post']       = array();
-if (!isset($locale['article']))    $locale['article']    = array();
-if (!isset($locale['profile']))    $locale['profile']    = array();
-if (!isset($locale['headers']))    $locale['headers']    = array();
-if (!isset($locale['disconnect'])) $locale['disconnect'] = array();
-
-$locale['error'] = array_merge(array(
-            'title' => "Erreur !!!",
-            'connect' => "Impossible de se connecter au serveur de forums",
-            'credentials' => "L'authentification sur le serveur de forums a échoué",
-            'group' => "Impossible d'accéder au forum",
-            'post' => "Impossible d'accéder au message. Le message a peut-être été annulé",
-            'nogroup' => "Il n'y a pas de forum sur ce serveur"
-            ),
-        $locale['error']);
-
-$locale['index'] = array_merge(array(
-            'title' => "Les forums de Banana",
-            'summary' => "Liste des forums",
-            'total' => "Total",
-            'unread' => "Nouveaux",
-            'name' => "Nom",
-            'description' => "Description",
-            'newgroupstext' => "Les forums suivants ont été créés depuis ton dernier passage :"
-            ),
-        $locale['index']);
-
-$locale['subscribe'] = array_merge(array(
-            'title' => "Abonnements",
-            'summary' => "Liste des forums",
-            'total' => "Total",
-            'subscribed' => "Abonné",
-            'name' => "Nom",
-            'description' => "Description",
-            ),
-        $locale['subscribe']);
-
-$locale['article'] = array_merge(array(
-            'message' => "Message",
-            'cancel' => "Voulez-vous vraiment annuler ce message ?",
-            'okbtn' => "OK",
-            'summary' => "Contenu du message",
-            'headers' => "En-têtes",
-            'body' => "Corps",
-            'overview' => "Aperçu"
-            ),
-        $locale['article']);
-
-$locale['thread'] = array_merge(array(
-            'group_a' => "",
-            'group_b' => "Forum ",
-            'date' => "Date",
-            'subject' => "Sujet",
-            'author' => "Auteur",
-            'summary' => "Liste des messages"
-            ),
-        $locale['thread']);
-
-$locale['post'] = array_merge($locale['post'], array(
-            'badcancel' => "Impossible d'annuler le message",
-            'canceled' => "Message annulé",
-            'badpost' => "Impossible de poster le message",
-            'posted' => "Message posté",
-            'rghtcancel' => "Vous n'avez pas les permissions pour annuler ce message",
-            'title' => "Nouveau message",
-            'headers' => "En-têtes",
-            'name' => "Nom",
-            'subject' => "Sujet",
-            'newsgroups' => "Forums",
-            'fu2' => "Suivi-à",
-            'organization' => "Organisation",
-            'body' => "Corps"
-            )
-        );
-
-$locale['format'] = array_merge(array(
-            'disconnection' => "Déconnexion",
-            'grouplist' => "Liste des forums",
-            'group_a' => "",
-            'group_b' => "",
-            'followup' => "Répondre",
-            'newpost' => "Nouveau message",
-            'cancel' => "Annuler ce message"
-            ),
-        $locale['format']);
-
-$locale['profile'] = array_merge(array(
-            'title' => "Bienvenue sur Banana !",
-            'define' => "Définis tes paramètres",
-            'name' => "Nom (par exemple Jean Dupont)",
-            'mail' => "Adresse mail",
-            'organization' => "Organisation",
-            'signature' => "Signature",
-            'display' => "Affichage",
-            'all' => "Tous les messages",
-            'new' => "Seulement les fils de discussion comportant des messages non lus",
-            'auth' => "Authentification sur le serveur NNTP",
-            'login' => "Login (laisser anonyme pour un login en anonyme)",
-            'passwd' => "Mot de passe"
-            ),
-        $locale['profile']);
-
-$locale['disconnect'] = array_merge(array(
-            'title' => "Déconnexion effectuée !",
-            'back' => 'Retour au <a href="index.php">profil</a>'
-            ),
-        $locale['disconnect']);
-
-$locale['headers'] = array_merge(array(
-            'from' => 'De',
-            'subject' => 'Sujet',
-            'newsgroups' => 'Forums',
-            'followup' => 'Suivi-A',
-            'date' => 'Date',
-            'organization' => 'Organisation',
-            'references' => 'Références',
-            'xface' => 'Image'
-            ),
-        $locale['headers']);
-
-?>

diff --git a/post.php b/post.php
index ff1084c..a3273ce 100644 (file)
--- a/post.php
+++ b/post.php
@@ -19,8 +19,6 @@ require_once("include/profile.inc.php");
 require_once("include/error.inc.php");
 
 $profile = getprofile();
-require_once($profile['locale']);
-
 require_once("include/header.inc.php");
 if (isset($_REQUEST['group'])) {
   $group=htmlentities(strtolower($_REQUEST['group']));
@@ -68,7 +66,7 @@ if (isset($group) && isset($id) && isset($_REQUEST['type']) &&
 $nntp->quit();
 ?>
 <h1>
-  <?php echo $locale['post']['title'];?>
+  <?php echo _('Nouveau message'); ?>
 </h1>
 <?php
 
@@ -80,12 +78,12 @@ displayshortcuts();
 <table class="<?php echo $css['bicol']?>" cellpadding="0" cellspacing="0" border="0">
   <tr>
     <th colspan="2">
-      <?php echo $locale['post']['headers'];?>
+      <?php echo _('En-têtes'); ?>
     </th>
   </tr>
   <tr>
     <td class="<?php echo $css['bicoltitre'];?>">
-      <?php echo $locale['post']['name'];?>
+      <?php echo _('Nom'); ?>
     </td>
     <td>
       <?php echo htmlentities($profile['name']); ?>
@@ -93,7 +91,7 @@ displayshortcuts();
   </tr>
   <tr>
     <td class="<?php echo $css['bicoltitre'];?>">
-      <?php echo $locale['post']['subject'];?>
+      <?php echo _('Sujet'); ?>
     </td>
     <td>
       <input type="text" name="subject" value="<?php echo 
@@ -102,7 +100,7 @@ displayshortcuts();
   </tr>
   <tr>
     <td class="<?php echo $css['bicoltitre'];?>">
-      <?php echo $locale['post']['newsgroups'];?>
+      <?php echo _('Forums'); ?>
     </td>
     <td>
       <input type="text" name="newsgroups" value="<?php echo
@@ -111,7 +109,7 @@ displayshortcuts();
   </tr>
   <tr>
     <td class="<?php echo $css['bicoltitre'];?>">
-      <?php echo $locale['post']['fu2'];?>
+      <?php echo _('Suivi-à'); ?>
     </td>
     <td>
       <input type="text" name="followup" value="" />
@@ -119,7 +117,7 @@ displayshortcuts();
   </tr>
   <tr>
     <td class="<?php echo $css['bicoltitre'];?>">
-      <?php echo $locale['post']['organization'];?>
+      <?php echo _('Organisation'); ?>
     </td>
     <td>
       <?php echo $profile['org']; ?>
@@ -127,7 +125,7 @@ displayshortcuts();
   </tr>
   <tr>
     <th colspan="2">
-      <?php echo $locale['post']['body'];?>
+      <?php echo _('Corps'); ?>
     </th>
   </tr>
   <tr>

diff --git a/subscribe.php b/subscribe.php
index a7bf18e..95f1fb2 100644 (file)
--- a/subscribe.php
+++ b/subscribe.php
@@ -18,8 +18,6 @@ require_once("include/subscribe.inc.php");
 require_once("include/error.inc.php");
 
 $profile=getprofile();
-require_once($profile['locale']);
-
 require_once("include/header.inc.php");
 
 $nntp = new nntp($news['server']);
@@ -32,7 +30,7 @@ $groups = new groups($nntp,2);
 ?>
 
 <h1>
-  <?php echo $locale['subscribe']['title'];?>
+  <?php echo _('Abonnements'); ?>
 </h1>
 
 <?php
@@ -49,20 +47,19 @@ displayshortcuts();
 ?>
 
 <form method="post" action="<?php echo $_SERVER['PHP_SELF'];?>">
-<table class="<?php echo $css["bicol"];?>" cellspacing="0" cellpadding="2" 
-  summary="<?php echo $locale['subscribe']['summary'];?>">
+<table class="<?php echo $css["bicol"];?>" cellspacing="0" cellpadding="2">
   <tr>
     <th>
-      <?php echo $locale['subscribe']['total'];?>
+      <?php echo _('Total'); ?>
     </th>
     <th>
-      <?php echo $locale['subscribe']['subscribed'];?>
+      <?php echo _('Abonné'); ?>
     </th>
     <th>
-      <?php echo $locale['subscribe']['name'];?>
+      <?php echo _('Nom'); ?>
     </th>
     <th>
-      <?php echo $locale['subscribe']['description'];?>
+      <?php echo _('Description'); ?>
     </th>
   </tr>
 <?php

diff --git a/thread.php b/thread.php
index b649083..82dc241 100644 (file)
--- a/thread.php
+++ b/thread.php
@@ -19,8 +19,6 @@ require_once("include/profile.inc.php");
 require_once("include/error.inc.php");
 
 $profile=getprofile();
-require_once($profile['locale']);
-
 require_once("include/header.inc.php");
 
 if (isset($_REQUEST['group'])) {
@@ -70,15 +68,12 @@ if (isset($_REQUEST['action']) && (isset($_REQUEST['type'])) &&
         $result = $nntp->post($message);
         if ($result) {
           $spool->delid($id);
-          $text="<p class=\"normal\">".$locale['post']['canceled']
-            ."</p>";
+          $text = "<p class=\"normal\">"._('Message annulé')."</p>";
         } else {
-          $text="<p class=\"error\">".$locale['post']['badcancel']
-            ."</p>";
+          $text = "<p class=\"error\">"._('Impossible d\'annuler le message')."</p>";
         }
       } else {
-        $text="<p class=\"error\">\n\t".$locale['post']['rghtcancel']
-          ."\n</p>";
+        $text="<p class=\"error\">\n\t"._('Vous n\'avez pas les permissions pour annuler ce message')."\n</p>";
       }
       break;
     case 'new':
@@ -95,9 +90,9 @@ if (isset($_REQUEST['action']) && (isset($_REQUEST['type'])) &&
         .wrap($body,"",$news['wrap']);
       $result = $nntp->post($message);
       if ($result) {
-        $text="<p class=\"normal\">".$locale['post']['posted']."</p>";
+        $text="<p class=\"normal\">"._('Message posté')."</p>";
       } else {
-        $text="<p class=\"error\">".$locale['post']['badpost']."</p>";
+        $text="<p class=\"error\">"._('Impossible de poster le message')."</p>";
       }
       break;
     case 'followupok':
@@ -122,9 +117,9 @@ if (isset($_REQUEST['action']) && (isset($_REQUEST['type'])) &&
         .wrap($body,"",$news['wrap']);
       $result = $nntp->post($message);
       if ($result) {
-        $text="<p class=\"normal\">".$locale['post']['posted']."</p>";
+        $text="<p class=\"normal\">"._('Message posté')."</p>";
       } else {
-        $text="<p class=\"error\">".$locale['post']['badpost']."</p>";
+        $text="<p class=\"error\">"._('Impossible de poster le message')."</p>";
       }
       break;
   }
@@ -137,8 +132,7 @@ if (isset($_REQUEST['action']) && (isset($_REQUEST['type'])) &&
 
 ?>
 <h1>
-  <?php echo $locale['thread']['group_b'].$group
-    .$locale['thread']['group_a'];?>
+  <?php echo $group; ?>
 </h1>
 <?php
 if (isset($text)) {
@@ -148,17 +142,16 @@ displayshortcuts();
 
 ?>
 
-<table class="<?php echo $css['bicol']?>" cellpadding="0" cellspacing="0" border="0" 
-  summary="<?php echo $locale['thread']['summary'];?>">
+<table class="<?php echo $css['bicol']?>" cellpadding="0" cellspacing="0" border="0">
   <tr>
     <th class="<?php echo $css['date']?>">
-      <?php echo $locale['thread']['date'];?>
+      <?php echo _('Date'); ?>
     </th>
     <th class="<?php echo $css['subject']?>">
-      <?php echo $locale['thread']['subject'];?>
+      <?php echo _('Sujet'); ?>
     </th>
     <th class="<?php echo $css['from']?>">
-      <?php echo $locale['thread']['author'];?>
+      <?php echo _('Auteur'); ?>
     </th>
   </tr>
 <?php