Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Norm: Suppression vieille fonction translate qui ne sert plus

Browse Source 
Trad: Traduction des chaines Paramtre et Valeur dans tous le code.
Trad: Ajout fichier lang pour le module commandes.
This commit is contained in:
Laurent Destailleur
2004-07-31 11:36:01 +00:00
parent 3f221360c9
commit d513385e66
19 changed files with 101 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/admin/ihm.php
View File

@@ -55,7 +55,7 @@ if ($_GET["action"] == 'edit')
print '<form method="post" action="ihm.php">';
print '<table class="noborder" cellpadding="3" cellspacing="0" width="100%">';
print '<tr class="liste_titre"><td>Nom</td><td>Valeur</td></tr>';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
print '<tr class="impair"><td>Th<54>me</td>';
print '<td><select name="main_theme">';
@@ -107,13 +107,10 @@ if ($_GET["action"] == 'edit')
print '</td></tr>';
print '<tr class="pair"><td width="50%">Langue par d<>faut <20> utiliser (code langue)</td><td>';
$langs_available=$langs->get_available_languages();
print '<select name="main_lang_default">';
// On parcour le r<>pertoire langs pour d<>tecter les langues possibles
$handle=opendir(DOL_DOCUMENT_ROOT ."/langs");
while ($file = trim(readdir($handle))){
if($file != "." && $file != ".." && $file != "CVS") {
print '<option value="'.$file.'"'.(MAIN_LANG_DEFAULT==$file?'selected':'').'>'.$file.'</option>';
}
foreach ($langs_available as $lang) {
print '<option value="'.$lang.'"'.(MAIN_LANG_DEFAULT==$lang?'selected':'').'>'.$lang.'</option>';
}
print '</select>';
print '</td></tr>';
@@ -128,7 +125,7 @@ if ($_GET["action"] == 'edit')
print '</table><br>';
print '<div class="tabsAction">';
print '<input class="tabAction" type="submit" value="Enregistrer">';
print '<input class="tabAction" type="submit" value="'.$langs->trans("Save").'">';
print '</div>';
print '</form>';
@@ -137,7 +134,7 @@ else
{
print '<table class="noborder" cellpadding="3" cellspacing="0" width="100%">';
print '<tr class="liste_titre"><td>Nom</td><td>Valeur</td></tr>';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
print '<tr class="impair"><td width="50%">Th<54>me</td><td>' . MAIN_THEME . '</td></tr>';
print '<tr class="pair"><td>Longueur maximum des listes</td><td>' . SIZE_LISTE_LIMIT . '</td></tr>';
print '<tr class="impair"><td width="50%">Gestionnaire du menu du haut</td><td>';
@@ -157,7 +154,7 @@ else
print '<div class="tabsAction">';
print '<a class="tabAction" href="ihm.php?action=edit">Editer</a>';
print '<a class="tabAction" href="ihm.php?action=edit">'.$langs->trans("Edit").'</a>';
print '</div>';
}

4
htdocs/admin/system/constall.php
View File

@@ -32,8 +32,8 @@ print_titre("Liste de tous les param
print '<br>';
print '<table class="noborder" cellpadding="3" cellspacing="0">';
print '<tr class="liste_titre">';
print '<td>Param<EFBFBD>tre</td>';
print '<td>Valeur</td>';
print '<td>'.$langs->trans("Parameter").'</td>';
print '<td>'.$langs->trans("Value").'</td>';
print "</tr>\n";
$sql = "SELECT rowid, name, value, type, note FROM ".MAIN_DB_PREFIX."const ORDER BY name ASC";

3
htdocs/admin/system/os.php
View File

@@ -31,7 +31,8 @@ print_titre("OS");
print "<br>\n";
print '<table class="noborder" cellpadding="3" cellspacing="0" width="100%">';
print "<tr class=\"liste_titre\"><td>Param<61>tre</td><td>Valeur</td></tr>\n";
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
print "\n";
// R<>cup<75>re la version de l'OS
ob_start();
phpinfo();

2
htdocs/admin/system/web.php
View File

@@ -31,7 +31,7 @@ print_titre("Serveur Web");
print "<br>\n";
print '<table class="noborder" cellpadding="3" cellspacing="0" width="100%">';
print "<tr class=\"liste_titre\"><td>Param<EFBFBD>tre</td><td>Valeur</td></tr>\n";
print "<tr class=\"liste_titre\"><td>".$langs->trans("Parameter")."</td><td>".$langs->trans("Value")."</td></tr>\n";
print "<tr $bc[1]><td width=\"140\">Version</td><td>".$_SERVER["SERVER_SOFTWARE"]."</td></tr>\n";
print "<tr $bc[0]><td>Nom du serveur virtuel</td><td>" . $_SERVER["SERVER_NAME"] . "</td></tr>\n";
print "<tr $bc[1]><td width=\"140\">IP</td><td>".$_SERVER["SERVER_ADDR"]."</td></tr>\n";

12
htdocs/admin/webcalendar.php
View File

@@ -81,8 +81,8 @@ if ($actionsave)
print '<form name="phpwebcalendarconfig" action="webcalendar.php" method="post">';
print "<table class=\"noborder\" cellpadding=\"3\" cellspacing=\"1\">
<tr class=\"liste_titre\">
<td>Param<EFBFBD>tre</td>
<td>Valeur</td>
<td>".$langs->trans("Parameter")."</td>
<td>".$langs->trans("Value")."</td>
</tr>
<tr class=\"impair\">
<td>Adresse URL d'acc<63>s au calendrier</td>
@@ -101,17 +101,17 @@ print "<table class=\"noborder\" cellpadding=\"3\" cellspacing=\"1\">
<td><input type=\"text\" name=\"phpwebcalendar_user\" value=\"". PHPWEBCALENDAR_USER . "\" size=\"45\"></td>
</tr>
<tr class=\"impair\">
<td>Mot de passe d'acc<63>s <20> la base</td>
<td>".$langs->trans("Password")."</td>
<td><input type=\"password\" name=\"phpwebcalendar_pass\" value=\"" . PHPWEBCALENDAR_PASS . "\" size=\"45\"></td>
</tr>
<tr class=\"pair\">
<td>Mot de passe (v<>rification)</td>
<td>".$langs->trans("PasswordRetype")."</td>
<td><input type=\"password\" name=\"phpwebcalendar_pass2\" value=\"" . PHPWEBCALENDAR_PASS ."\" size=\"45\"></td>
</tr>
<tr class=\"impair\">
<td colspan=\"2\" align=\"center\">
<input type=\"submit\" name=\"test\" value=\"Tester connexion\">
<input type=\"submit\" name=\"save\" value=\"Enregistrer\">
<input type=\"submit\" name=\"test\" value=\"".$langs->trans("TestConnection")."\">
<input type=\"submit\" name=\"save\" value=\"".$langs->trans("Save")."\">
</td>
</tr>\n";

9
htdocs/comm/fiche.php
View File

@@ -374,13 +374,6 @@ if ($_socid > 0)
print '<a class="tabAction" href="../fichinter/fiche.php?socidp='.$objsoc->id.'&amp;action=create">Intervention</a>';
}
// if ($user->societe_id == 0)
// {
// if ($user->rights->facture->creer) {
// print "<a class=\"tabAction\" href=\"facture.php?action=create&socidp=$objsoc->idp\">".translate("Cr<43>er Facture")."</a>";
// }
// }
print '</div>';
print '<br>';
@@ -400,7 +393,7 @@ if ($_socid > 0)
print "<option value=\"t\">Oui";
print "<option value=\"f\">Non";
print "</select>";
print "<input type=\"submit\" value=\"Mettre &agrave; jour\">";
print "<input type=\"submit\" value=\"".$langs->trans("Valid")."\">";
print "</form>\n";
} else {
/*

3
htdocs/comm/index.php
View File

@@ -124,6 +124,7 @@ if ($conf->propal->enabled) {
*/
if ($conf->commande->enabled)
{
$langs->load("orders");
$sql = "SELECT c.rowid, c.ref, s.nom, s.idp FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE c.fk_soc = s.idp AND c.fk_statut = 0";
if ($socidp)
@@ -138,7 +139,7 @@ if ($conf->commande->enabled)
{
print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.translate("Commandes <20> valider").'</td></tr>';
print '<td colspan="2">'.$langs->trans("OrdersToValid").'</td></tr>';
$i = 0;
$var = False;
while ($i < $num)

15
htdocs/commande/index.php
View File

@@ -22,12 +22,14 @@
*/
require("./pre.inc.php");
$langs->load("orders");
llxHeader("", 'Commandes','Commande');
print_titre("Commandes");
llxHeader("",$langs->trans("Orders"),"Commande");
print '<table border="0" width="100%" cellspacing="0" cellpadding="4">';
print_titre($langs->trans("OrdersArea"));
print '<table border="0" width="100%" cellspacing="0" cellpadding="3">';
print '<tr><td valign="top" width="30%">';
/*
@@ -35,7 +37,7 @@ print '<tr><td valign="top" width="30%">';
*/
print '<form method="post" action="liste.php">';
print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">';
print '<tr class="liste_titre"><td colspan="2">Rechercher une commande</td></tr>';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("SearchOrder").'</td></tr>';
print "<tr $bc[1]><td>";
print 'Num. : <input type="text" name="sf_ref"> <input type="submit" value="'.$langs->trans("Search").'" class="flat"></td></tr>';
print "</table></form>\n";
@@ -53,13 +55,14 @@ if ($socidp)
if ( $db->query($sql) )
{
$langs->load("orders");
$num = $db->num_rows();
if ($num)
{
$i = 0;
print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.translate("Commandes <20> valider").'</td></tr>';
print '<td colspan="2">'.$langs->trans("OrdersToValid").'</td></tr>';
$var = True;
while ($i < $num)
{
@@ -93,7 +96,7 @@ if ( $db->query($sql) )
$i = 0;
print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="2">Commandes <20> traiter</td></tr>';
print '<td colspan="2">'.$langs->trans("OrdersToProcess").'</td></tr>';
$var = True;
while ($i < $num)
{

3
htdocs/compta/fiche.php
View File

@@ -331,7 +331,8 @@ if ($socid > 0)
if ($user->societe_id == 0)
{
if ($user->rights->facture->creer) {
print "<a class=\"tabAction\" href=\"facture.php?action=create&socidp=$societe->id\">".translate("Cr<EFBFBD>er Facture")."</a>";
$langs->load("bills");
print "<a class=\"tabAction\" href=\"facture.php?action=create&socidp=$societe->id\">".$langs->trans("CreateBill")."</a>";
}
print "<a class=\"tabAction\" href=\"deplacement/fiche.php?socid=$societe->id&amp;action=create\">Cr<43>er D<>placement</a>";
}

8
htdocs/compta/index.php
View File

@@ -24,6 +24,8 @@ require("./pre.inc.php");
$user->getrights('banque');
$langs->load("compta");
/*
* S<>curit<69> acc<63>s client
*/
@@ -63,7 +65,7 @@ if ($action == 'del_bookmark')
*
*
*/
print_titre(translate("Espace comptabilit<69>"));
print_titre("Espace comptabilit<69>");
print '<table border="0" width="100%" cellspacing="0" cellpadding="4">';
@@ -213,6 +215,8 @@ print '</td><td valign="top" width="70%">';
*/
if ($user->comm > 0 && $conf->commercial->enabled )
{
$langs->load("orders");
$sql = "SELECT p.rowid, p.ref, s.nom, s.idp FROM ".MAIN_DB_PREFIX."commande as p, ".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE p.fk_soc = s.idp AND p.fk_statut >= 1 AND p.facture = 0";
if ($socidp)
@@ -228,7 +232,7 @@ if ($user->comm > 0 && $conf->commercial->enabled )
$i = 0;
print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">';
print "<tr class=\"liste_titre\">";
print '<td colspan="2">'.translate("Commandes <20> facturer").'</td></tr>';
print '<td colspan="2">'.$langs->trans("OrdersToBill").'</td></tr>';
$var = True;
while ($i < $num)
{

2
htdocs/compta/propal.php
View File

@@ -126,7 +126,7 @@ if ($_GET["propalid"])
print "<td valign=\"top\" width=\"50%\" rowspan=\"9\">Note :<br>". nl2br($obj->note)."</td></tr>";
//
print '<tr><td>'.translate("Date").'</td><td colspan="2">'.strftime("%A %d %B %Y",$obj->dp).'</td></tr>';
print '<tr><td>'.$langs->trans("Date").'</td><td colspan="2">'.dolibarr_print_date($obj->dp).'</td></tr>';
if ($obj->fk_projet)
{

12
htdocs/expedition/index.php
View File

@@ -55,7 +55,7 @@ if ( $db->query($sql) )
{
print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="3">'.translate("Expeditions <20> valider").'</td></tr>';
print '<td colspan="3">Expeditions <20> valider</td></tr>';
$i = 0;
$var = True;
while ($i < $num)
@@ -87,10 +87,12 @@ if ( $db->query($sql) )
$num = $db->num_rows();
if ($num)
{
$langs->load("orders");
$i = 0;
print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.translate("Commandes <EFBFBD> traiter").'</td></tr>';
print '<td colspan="2">'.$langs->trans("OrdersToProcess").'</td></tr>';
$var = True;
while ($i < $num)
{
@@ -124,13 +126,15 @@ if ($socidp)
if ( $db->query($sql) )
{
$langs->load("orders");
$num = $db->num_rows();
if ($num)
{
$i = 0;
print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.translate("Commandes en traitement").'</td></tr>';
print '<td colspan="2">'.$langs->trans("OrdersInProcess").'</td></tr>';
$var = True;
while ($i < $num)
{
@@ -166,7 +170,7 @@ if ( $db->query($sql) )
$i = 0;
print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="3">'.translate("5 derni<EFBFBD>res exp<EFBFBD>ditions").'</td></tr>';
print '<td colspan="3">5 derni<EFBFBD>res exp<EFBFBD>ditions</td></tr>';
$var = True;
while ($i < $num)
{

14
htdocs/fourn/fiche.php
View File

@@ -150,13 +150,11 @@ if ( $societe->fetch($socid) )
/*
* Boutons Actions
*/
$langs->load("bills");
print '<div class="tabsAction">';
print '<a class="tabAction" href="facture/fiche.php?action=create&socid='.$societe->id.'">'.translate("Cr<EFBFBD>er Facture").'</a>';
print '<a class="tabAction" href="facture/fiche.php?action=create&socid='.$societe->id.'">'.$langs->trans("CreateBill").'</a>';
print '<a class="tabAction" href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$socid.'&amp;action=create">Ajouter un contact</a>';
print '</div>';
@@ -165,11 +163,13 @@ if ( $societe->fetch($socid) )
* Liste des contacts
*
*/
$langs->load("companies");
print '<br><table class="noborder" cellspacing="0" cellpadding="2" width="100%">';
print "<tr class=\"liste_titre\"><td><b>Pr&eacute;nom Nom</b></td>";
print '<td><b>Poste</b></td><td><b>T&eacute;l</b></td>';
print "<td><b>Fax</b></td><td><b>Email</b></td>";
print '<td><b>Poste</b></td><td><b>'.$langs->trans("Tel").'</b></td>';
print "<td><b>".$langs->trans("Fax")."</b></td><td><b>".$langs->trans("EMail")."</b></td>";
print "<td align=\"center\"><a href=\"".DOL_URL_ROOT.'/contact/fiche.php?socid='.$socid."&amp;action=create\">Ajouter</a></td></tr>";
$sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email, p.note";

1
htdocs/langs/en_US/bills.lang
View File

@@ -3,6 +3,7 @@ Bill=Bill
Bills=Bills
ClassifyPayed=Classify 'Payed'
ClassifyCanceled=Classify 'Abandonned'
CreateBill=Create Bill
Send=Send
SendRemind=Send reminder
DoPaiement=Do paiement

14
htdocs/langs/en_US/main.lang
View File

@@ -12,14 +12,21 @@ Resiliate=Resiliate
Cancel=Cancel
Modify=Modify
Edit=Edit
Save=Save
SaveAs=Save As
Show=Show
Search=Search
TestConnection=Test connection
ChooseLangage=Please choose your language
User=User
Users=Users
Group=Group
Groups=Groups
Password=Password
PasswordRetype=Retype your password
Name=Name
Parameter=Parameter
Parameters=Parameters
Value=Value
Type=Type
Note=Note
@@ -35,3 +42,10 @@ Previous=Previous
Next=Next
ErrorForbidden=Access is forbidden
Cards=Cards
Date=Date
Year=Year
Month=Month
Day=Day
Hour=Hour
Minute=Minute
Second=Second

1
htdocs/langs/fr_FR/bills.lang
View File

@@ -3,6 +3,7 @@ Bill=Facture
Bills=Factures
ClassifyPayed=Classer 'Pay<61>e'
ClassifyCanceled=Classer 'Abandonn<6E>e'
CreateBill=Cr<43>er Facture
Send=Envoyer
SendRemind=Envoyer rappel
DoPaiement=Emettre paiement

14
htdocs/langs/fr_FR/main.lang
View File

@@ -12,6 +12,9 @@ Resiliate=R
Cancel=Annuler
Modify=Modifier
Edit=Editer
Save=Enregistrer
SaveAs=Enregistrer sous
TestConnection=Tester connexion
Show=Voir
Search=Rechercher
ChooseLangage=Choisissez votre langue
@@ -19,7 +22,11 @@ User=Utilisateur
Users=Utilisateurs
Group=Groupe
Groups=Groupes
Password=Mot de passe
PasswordRetype=Retaper le mot de passe
Name=Nom
Parameter=Param<61>tre
Parameters=Param<61>tres
Value=Valeur
Type=Type
Note=Note
@@ -35,3 +42,10 @@ Previous=Pr
Next=Suivant
ErrorForbidden=Acc<63>s non autoris<69>
Cards=Fiches
Date=Date
Year=Ann<6E>e
Month=Mois
Day=Jour
Hour=Heure
Minute=Minute
Second=Seconde

2
htdocs/lib/functions.inc.php
View File

@@ -474,7 +474,7 @@ function dolibarr_print_error($db='',$msg='')
print "<b>Serveur:</b>".$_SERVER["SERVER_SOFTWARE"]."<br>\n";;
print "<b>URL sollicit<69>e:</b> ".$_SERVER["REQUEST_URI"]."<br>\n";;
print "<b>Param<EFBFBD>tres:</b> ".$_SERVER["QUERY_STRING"]."<br>\n";;
print "<b>".$langs->trans("Parameters").":</b> ".$_SERVER["QUERY_STRING"]."<br>\n";;
print "<b>URL d'origine:</b> ".$_SERVER["HTTP_REFERER"]."<br>\n";;
if ($db) {

18
htdocs/translate.class.php
View File

@@ -93,14 +93,21 @@ Class Translate {
/**
* Return the list of available languages
* [fr] Retourne la liste des langues disponibles
*
* @access public
* @return array: list of languages
*/
function get_available_languages()
{
// On parcour le r<>pertoire langs pour d<>tecter les langues dispo
$handle=opendir(DOL_DOCUMENT_ROOT ."/langs");
$langs_available=array();
while ($file = trim(readdir($handle))){
if($file != "." && $file != ".." && $file != "CVS") {
array_push($langs_available,$file);
}
}
return $langs_available;
}
/**
@@ -124,11 +131,4 @@ Class Translate {
}
// Pour compatibilit<69> avec l'existant. Il existe quelques appels a une fonction
// tranlsate. On l'impl<70>mente donc ici mais il vaut mieux utiliser $langs->trans
function translate($str) {
return $str;
}
?>