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

Fix: Search if module directory name is different of lang file name

Browse Source 
we can use "langfile@mymodule" or "@mymodule"
This commit is contained in:
Regis Houssin 2010-04-19 09:34:50 +00:00
parent db8f5ed592
commit c0a32c8fb4
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/core/translate.class.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* *************************************************************************** /* Copyright (C) 2001 Eric Seigne <erics@rycks.com>
* Copyright (C) 2001 Eric Seigne <erics@rycks.com> * Copyright (C) 2004-2010 Destailleur Laurent <eldy@users.sourceforge.net>
* Copyright (C) 2004-2009 Destailleur Laurent <eldy@users.sourceforge.net> * Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* ************************************************************************* */ */
/** /**
* \file htdocs/translate.class.php * \file htdocs/translate.class.php
@ -148,7 +148,18 @@ 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=str_replace('@','',$domain); // Remove the @ if present $modulename = '';
// Search if module directory name is different of lang file name
if (preg_match('/^([^@]+)?@([^@]+)$/i',$domain,$regs))
{
$newdomain = (!empty($regs[1])?$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
@ -170,7 +181,7 @@ class Translate {
{ {
// If $domain is @xxx instead of xxx then we look for module lang file htdocs/xxx/langs/code_CODE/xxx.lang // If $domain is @xxx instead of xxx then we look for module lang file htdocs/xxx/langs/code_CODE/xxx.lang
// instead of global lang file htdocs/langs/code_CODE/xxx.lang // instead of global lang file htdocs/langs/code_CODE/xxx.lang
if (preg_match('/@/',$domain)) $searchdir=$searchdir ."/".$newdomain."/langs"; if (preg_match('/@/',$domain)) $searchdir = $searchdir."/".(!empty($modulename)?$modulename:$newdomain)."/langs";
else $searchdir=$searchdir."/langs"; else $searchdir=$searchdir."/langs";
// Directory of translation files // Directory of translation files