lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Le chargement de dict se fait au meme niveau que main. Les 2 fichiers tant utiliss par la plupart des pages, sont sytematiquement charges.

Browse Source
This commit is contained in:
Laurent Destailleur 2007-09-15 14:35:44 +00:00
parent 0be3911d40
commit 9d2da43dab
6 changed files with 67 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/admin/dict.php
View File

@ -31,7 +31,6 @@
require("./pre.inc.php"); require("./pre.inc.php");
$langs->load("main");
$langs->load("other"); $langs->load("other");
$langs->load("admin"); $langs->load("admin");
$langs->load("companies"); $langs->load("companies");

1
htdocs/compta/facture/impayees.php
View File

@ -38,7 +38,6 @@ $user->getrights('banque');
if (!$user->rights->facture->lire) if (!$user->rights->facture->lire)
accessforbidden(); accessforbidden();
$langs->load("main"); // BUG De chargement de traduction ne pas modifier cette ligne
$langs->load("bills"); $langs->load("bills");

1
htdocs/fourn/facture/impayees.php
View File

@ -38,7 +38,6 @@ $user->getrights('banque');
if (!$user->rights->facture->lire) if (!$user->rights->facture->lire)
accessforbidden(); accessforbidden();
$langs->load("main"); // BUG De chargement de traduction ne pas modifier cette ligne
$langs->load("companies"); $langs->load("companies");
$langs->load("bills"); $langs->load("bills");

1
htdocs/lib/datepicker.php
View File

@ -71,7 +71,6 @@ function xyzToUnixTimestamp($mysqldate){
function displayBox($selectedDate,$month,$year){ function displayBox($selectedDate,$month,$year){
global $dolibarr_main_url_root,$langs,$conf; global $dolibarr_main_url_root,$langs,$conf;
$langs->load("main");
//print "$selectedDate,$month,$year"; //print "$selectedDate,$month,$year";
$thedate=dolibarr_mktime(0,0,0,$month,1,$year); $thedate=dolibarr_mktime(0,0,0,$month,1,$year);

123
htdocs/main.inc.php
View File

@ -577,8 +577,9 @@ if (! defined('MAIN_INFO_SOCIETE_PAYS'))
define('MAIN_INFO_SOCIETE_PAYS','1'); define('MAIN_INFO_SOCIETE_PAYS','1');
} }
// On charge le fichier lang principal // On charge les fichiers lang principaux
$langs->load("main"); $langs->load("main");
$langs->load("dict");
/* /*
* *
@ -625,9 +626,7 @@ else
*/ */
function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0) function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0)
{ {
global $user, $conf, $langs, $db, $micro_start_time; global $user, $conf, $langs, $db, $micro_start_time;
$langs->load("dict");
// Pour le tuning optionnel. Activer si la variable d'environnement DOL_TUNING // Pour le tuning optionnel. Activer si la variable d'environnement DOL_TUNING
// est positionne A appeler avant tout. // est positionne A appeler avant tout.
@ -635,80 +634,80 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0)
if (! $conf->css) $conf->css ='/theme/eldy/eldy.css.php'; if (! $conf->css) $conf->css ='/theme/eldy/eldy.css.php';
//header("Content-type: text/html; charset=UTF-8"); //header("Content-type: text/html; charset=UTF-8");
header("Content-type: text/html; charset=".$conf->character_set_client); header("Content-type: text/html; charset=".$conf->character_set_client);
print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'; print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
//print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd>'; //print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd>';
print "\n"; print "\n";
print "<html>\n"; print "<html>\n";
if ($disablehead == 0) if ($disablehead == 0)
{ {
print "<head>\n"; print "<head>\n";
print $langs->lang_header(); print $langs->lang_header();
print $head; print $head;
// Affiche meta // Affiche meta
print '<meta name="robots" content="noindex,nofollow">'."\n"; // Evite indexation par robots print '<meta name="robots" content="noindex,nofollow">'."\n"; // Evite indexation par robots
print '<meta name="author" content="Dolibarr Development Team">'."\n"; print '<meta name="author" content="Dolibarr Development Team">'."\n";
// Affiche title // Affiche title
if ($title) if ($title)
{ {
print '<title>Dolibarr - '.$title.'</title>'; print '<title>Dolibarr - '.$title.'</title>';
} }
else else
{ {
if (defined("MAIN_TITLE")) if (defined("MAIN_TITLE"))
{ {
print "<title>".MAIN_TITLE."</title>"; print "<title>".MAIN_TITLE."</title>";
} }
else else
{ {
print '<title>Dolibarr</title>'; print '<title>Dolibarr</title>';
} }
} }
print "\n"; print "\n";
// Affiche style sheets et link // Affiche style sheets et link
print '<link rel="stylesheet" type="text/css" title="default" href="'.DOL_URL_ROOT.'/'.$conf->css.'">'."\n"; print '<link rel="stylesheet" type="text/css" title="default" href="'.DOL_URL_ROOT.'/'.$conf->css.'">'."\n";
print '<link rel="stylesheet" type="text/css" media="print" href="'.DOL_URL_ROOT.'/theme/print.css">'."\n"; print '<link rel="stylesheet" type="text/css" media="print" href="'.DOL_URL_ROOT.'/theme/print.css">'."\n";
// Style sheets pour la class Window // Style sheets pour la class Window
print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/window/default.css">'."\n"; print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/window/default.css">'."\n";
print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/window/alphacube.css">'."\n"; print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/window/alphacube.css">'."\n";
print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/window/alert.css">'."\n"; print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/window/alert.css">'."\n";
// Definition en alternate style sheet des feuilles de styles les plus maintenues // Definition en alternate style sheet des feuilles de styles les plus maintenues
// Les navigateurs qui supportent sont rares. Plus aucun connu. // Les navigateurs qui supportent sont rares. Plus aucun connu.
/* /*
print '<link rel="alternate stylesheet" type="text/css" title="Eldy" href="'.DOL_URL_ROOT.'/theme/eldy/eldy.css.php">'."\n"; print '<link rel="alternate stylesheet" type="text/css" title="Eldy" href="'.DOL_URL_ROOT.'/theme/eldy/eldy.css.php">'."\n";
print '<link rel="alternate stylesheet" type="text/css" title="Freelug" href="'.DOL_URL_ROOT.'/theme/freelug/freelug.css.php">'."\n"; print '<link rel="alternate stylesheet" type="text/css" title="Freelug" href="'.DOL_URL_ROOT.'/theme/freelug/freelug.css.php">'."\n";
print '<link rel="alternate stylesheet" type="text/css" title="Yellow" href="'.DOL_URL_ROOT.'/theme/yellow/yellow.css">'."\n"; print '<link rel="alternate stylesheet" type="text/css" title="Yellow" href="'.DOL_URL_ROOT.'/theme/yellow/yellow.css">'."\n";
*/ */
print '<link rel="top" title="'.$langs->trans("Home").'" href="'.DOL_URL_ROOT.'/">'."\n"; print '<link rel="top" title="'.$langs->trans("Home").'" href="'.DOL_URL_ROOT.'/">'."\n";
print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n"; print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
print '<link rel="author" title="Dolibarr Development Team" href="http://www.dolibarr.org">'."\n"; print '<link rel="author" title="Dolibarr Development Team" href="http://www.dolibarr.org">'."\n";
if (! $disablejs && ($conf->use_javascript || $conf->use_ajax)) if (! $disablejs && ($conf->use_javascript || $conf->use_ajax))
{ {
print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_head.js"></script>'."\n"; print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_head.js"></script>'."\n";
} }
if (! $disablejs && $conf->use_ajax) if (! $disablejs && $conf->use_ajax)
{ {
print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/lib/prototype.js"></script>'."\n"; print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/lib/prototype.js"></script>'."\n";
print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/scriptaculous.js"></script>'."\n"; print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/scriptaculous.js"></script>'."\n";
print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/effects.js"></script>'."\n"; print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/effects.js"></script>'."\n";
print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/controls.js"></script>'."\n"; print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/controls.js"></script>'."\n";
print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/window/window.js"></script>'."\n"; print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/window/window.js"></script>'."\n";
print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/window/tooltip.js"></script>'."\n"; print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/window/tooltip.js"></script>'."\n";
} }
print "</head>\n"; print "</head>\n";
} }
} }
/** /**

2
htdocs/product.class.php
View File

@ -313,8 +313,6 @@ class Product
function update($id, $user) function update($id, $user)
{ {
global $langs, $conf; global $langs, $conf;
$langs->load("main");
$langs->load("products");
// Verification parametres // Verification parametres
if (! $this->libelle) $this->libelle = 'LIBELLE MANQUANT'; if (! $this->libelle) $this->libelle = 'LIBELLE MANQUANT';