Somme progress about translation

diff --git a/www/gesdis.php b/www/gesdis.php
index 3bf19e88a4a4f65c3a48dd79a9cd8f8641f76d8d..649ec2d6c7a5ee3f50f444cf90240fcddea611f4 100644 (file)
--- a/www/gesdis.php
+++ b/www/gesdis.php
@@ -39,7 +39,7 @@ switch ($pageref) {
     $sellang="";
     break;
   case "lvlmai"        :
-    $entete=gettranslate($userlang,"Main screen");
+    $entete="<span class=\"translatable\" trkey=\"Main screen\">Main screen</span>";
     $out=gettranslate($userlang,"Logout");
     if ($isadmin==true) {
       $remotes=gettranslate($userlang,"SMTP server");
@@ -176,10 +176,12 @@ return $STR;
 function starthtml($js)
 
 {
+$curtime=time();        //Loading time stamp
+
 $JSTR=NULL;
 if ($js!=NULL) {
   $JSTR = <<<EOT
-  <script defer src="$js.js?v=<?= time() ?>"></script>
+  <script defer src="$js.js?v={$curtime}"></script>
   EOT;
   }
 

diff --git a/www/index.php b/www/index.php
deleted file mode 100644 (file)
index d0f465ab9397e7a5a4a993268f4baa9aeb90ef60..0000000000000000000000000000000000000000
--- a/www/index.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-// vim: smarttab tabstop=8 shiftwidth=2 expandtab
-//==============================================================
-//
-//     login screen management
-//
-//==============================================================
-include_once "subrou.php";
-include_once "unienv.php";
-include_once "unilng.php";
-include_once "gesdis.php";
-include_once "gessql.php";
-
-//==============================================================
-//
-//     To display the login screen
-//
-//==============================================================
-function login()
-
-{
-$STR  = <<<EOT
-
-<table border="0" align="center" width="60%" cellpadding="0" cellspacing="0">
-    <tr>
-      <td align="center">
-      <FONT SIZE=+2><STRONG>
-      <span class="translatable" trkey="Authentication">Authentication</span>
-      </STRONG></FONT>
-      </td>
-    </tr>
-    <tr>
-      <td align="center" bgcolor="#000000">
-        <table width="100%" cellpadding="0" cellspacing="1" border="0">
-          <tr>
-            <td bgcolor="#FFFFFF" align="right">
-           <form method="post"
-                 action="lvllog.php"
-                 enctype="application/x-www-form-urlencoded"
-                 name="login">
-              <table align="center" border="0" cellspacing="5" cellpadding="0">
-                <tr>
-                  <td align="left" nowrap="nowrap"><span class="translatable" trkey="Email">Email</span><span>:</span></td>
-                  <td>
-                  <input  tabindex="1" type="text" name="email" size="40" onchange="" />
-                  <select id="first-choice" onchange="updateTranslations()">
-                    <option value="en">English</option>
-                    <option value="fr">Francais</option>
-                  </select>
-                  </td>
-                </tr>
-
-                <tr>
-                  <td align="left" nowrap="nowrap"><span class="translatable" trkey="Password">Password</span><span>:</span></td>
-                  <td>
-                 <input  tabindex="2" type="password" name="passwd" size="40" id="myInput" />
-                  <input type="checkbox" onclick="showpass()">
-                    <span class="translatable" trkey="Show" >Show</span>
-                 </td>
-                </tr>
-              </table>
-
-              <table width="100%" cellpadding="0" cellspacing="1" border="0">
-                <tr>
-                  <td align="center" colspan="2">
-                    <input  type="hidden" name="action" value="login" />
-                    <table>
-                      <tr>
-                        <td align="center">
-                        <input  tabindex="3" type="submit" name="loginbutton" value="Login" 
-                        class="translatable" trkey="Login" />
-                       </td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-              </table>
-           </form>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-<br>
-<br>
-
-EOT;
-
-return $STR;
-}
-
-//==============================================================
-//
-//      To display login screen body
-//
-//==============================================================
-function body()
-
-{
-global $isadmin;
-
-$start=starthtml("translations");
-$stop=endhtml();
-$top=topper($isadmin,NULL,"lvllog");
-$footer=footer("lvllog");
-$login=login();
-
-$STR  = <<<EOT
-$start
-$top
-$login
-$footer
-$stop
-EOT;
-
-return $STR;
-}
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-  $pass=$_POST["passwd"];
-  $logname=$_POST["email"];
-  $dbsql=sql_connect();
-  $isok=sql_checkpassword($dbsql,$logname,$pass);
-  sql_close($dbsql);
-  switch ($isok) {
-    case false  :       //trouble report
-      echo "<script>";
-      echo "alert('wrong username or password. Please try again.');";
-      echo "</script>";
-      break;
-    default     :
-      header('Location: lvlmai.php');
-      break;
-    }
-  }
-
-//display main screen
-echo body();
-?>
-
-
-

diff --git a/www/index.php b/www/index.php
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..336b4849320600a8e6e116b7133186d755b76c8e
--- /dev/null
+++ b/www/index.php
@@ -0,0 +1 @@
+lvllog.php
\ No newline at end of file

diff --git a/www/translations.js b/www/translations.js
index 6b8db517734aa0c7f429d04a953bf4670abb0ac3..b0005a0575c3c6fc3b04a1d6a6cd4382e4e0661f 100644 (file)
--- a/www/translations.js
+++ b/www/translations.js
@@ -5,6 +5,7 @@ const TR = [
     ["Authentication",  "Authentification"],
     ["Email",           "Courriel"],
     ["Login",           "Connexion"],
+    ["Main screen",     "Ecran Principal"],
     ["Originator",      "Expediteur"],
     ["Password",        "Mot de passe"],
     ["Recipient",       "Destinataire"],

diff --git a/www/unilng.php b/www/unilng.php
index 439b715e60a0607469d16b76db4a11afc0b48f25..41b2b19ccda0d944f11075c76933ccfe07b0a7de 100644 (file)
--- a/www/unilng.php
+++ b/www/unilng.php
@@ -34,7 +34,6 @@ function gettranslate(lng $lang,$mot)
 {
 global $TR;
 
-rou_alert(0,"JMPDBG lang=<XXX>");
 foreach ($TR as $row) {
   if ($row[0]===$mot) {
     switch ($lang) {