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

Fix: Duplicate translation in menu

Browse Source
This commit is contained in:
Laurent Destailleur 2008-10-24 00:24:56 +00:00
parent 5003369ec1
commit 35a95d9ee2
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
htdocs/core/menubase.class.php
View File

@ -594,22 +594,30 @@ class Menubase
// Define $chaine // Define $chaine
$chaine=""; $chaine="";
$title=$langs->trans($objm->titre); $title=$langs->trans($objm->titre);
if ($title == $objm->titre && ! empty($objm->langs)) if ($title == $objm->titre) // Translation not found
{ {
$langs->load($objm->langs); if (! empty($objm->langs))
$title=$langs->trans($objm->titre); {
// If it seems there no translation, we load language file defined in menu entry table
$langs->load($objm->langs);
}
if (eregi("/",$title))
{
$tab_titre = explode("/",$title);
$chaine = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);
}
else
{
$chaine = $langs->trans($title);
}
}
else
{
$chaine=$title;
} }
if (eregi("/",$title))
{
$tab_titre = explode("/",$title);
$chaine = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);
}
else
{
$chaine = $langs->trans($title);
}
//print "x".$objm->titre."-".$chaine; //print "x".$objm->titre."-".$chaine;
// Define $right // Define $right
$perms = true; $perms = true;
if ($objm->perms) if ($objm->perms)
@ -626,7 +634,7 @@ class Menubase
if ($objm->rowid != $oldrowid && $oldrowid) $b++; // Break on new entry if ($objm->rowid != $oldrowid && $oldrowid) $b++; // Break on new entry
$oldrowid=$objm->rowid; $oldrowid=$objm->rowid;
$tabMenu[$b]['rowid'] = $objm->rowid; $tabMenu[$b]['rowid'] = $objm->rowid;
$tabMenu[$b]['mainmenu'] = $objm->mainmenu; $tabMenu[$b]['mainmenu'] = $objm->mainmenu;
$tabMenu[$b]['titre'] = $chaine; // Title $tabMenu[$b]['titre'] = $chaine; // Title