Fix: Search if module directory name is different of lang file name
we can use "langfile@mymodule" or "@mymodule"
This commit is contained in:
parent
c0a32c8fb4
commit
921df5f94f
@ -148,6 +148,7 @@ class Translate {
|
|||||||
|
|
||||||
//dol_syslog("Translate::Load Start domain=".$domain." alt=".$alt." forcelangdir=".$forcelangdir." this->defaultlang=".$this->defaultlang);
|
//dol_syslog("Translate::Load Start domain=".$domain." alt=".$alt." forcelangdir=".$forcelangdir." this->defaultlang=".$this->defaultlang);
|
||||||
|
|
||||||
|
$newdomain = $domain;
|
||||||
$modulename = '';
|
$modulename = '';
|
||||||
|
|
||||||
// Search if module directory name is different of lang file name
|
// Search if module directory name is different of lang file name
|
||||||
@ -156,10 +157,6 @@ class Translate {
|
|||||||
$newdomain = (!empty($regs[1])?$regs[1]:$regs[2]);
|
$newdomain = (!empty($regs[1])?$regs[1]:$regs[2]);
|
||||||
$modulename = (!empty($regs[1])?$regs[2]:'');
|
$modulename = (!empty($regs[1])?$regs[2]:'');
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
$newdomain=$domain;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check cache
|
// Check cache
|
||||||
if (! empty($this->tab_loaded[$newdomain])) // File already loaded for this domain
|
if (! empty($this->tab_loaded[$newdomain])) // File already loaded for this domain
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user