composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°2969 - Add support for dictionaries folder in modules

Browse Source
This commit is contained in:
Eric
2020-07-08 15:21:07 +02:00
parent e564f71c14
commit b718e26c7f
2 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
setup/modelfactory.class.inc.php
View File

@@ -256,18 +256,21 @@ class MFModule
public function GetDictionaryFiles() public function GetDictionaryFiles()
{ {
$aDictionaries = array(); $aDictionaries = array();
if ($hDir = opendir($this->sRootDir)) foreach (array($this->sRootDir, $this->sRootDir.'/dictionary') as $sRootDir)
{ {
while (($sFile = readdir($hDir)) !== false) if ($hDir = @opendir($sRootDir))
{ {
$aMatches = array(); while (($sFile = readdir($hDir)) !== false)
if (preg_match("/^[^\\.]+.dict.".$this->sName.'.php$/i', $sFile,
$aMatches)) // Dictionary files are named like <Lang>.dict.<ModuleName>.php
{ {
$aDictionaries[] = $this->sRootDir.'/'.$sFile; $aMatches = array();
if (preg_match("/^[^\\.]+.dict.".$this->sName.'.php$/i', $sFile,
$aMatches)) // Dictionary files are named like <Lang>.dict.<ModuleName>.php
{
$aDictionaries[] = $sRootDir.'/'.$sFile;
}
} }
closedir($hDir);
} }
closedir($hDir);
} }
return $aDictionaries; return $aDictionaries;
@@ -466,18 +469,21 @@ class MFDictModule extends MFModule
public function GetDictionaryFiles() public function GetDictionaryFiles()
{ {
$aDictionaries = array(); $aDictionaries = array();
if ($hDir = opendir($this->sRootDir)) foreach (array($this->sRootDir, $this->sRootDir.'/dictionary') as $sRootDir)
{ {
while (($sFile = readdir($hDir)) !== false) if ($hDir = @opendir($sRootDir))
{ {
$aMatches = array(); while (($sFile = readdir($hDir)) !== false)
if (preg_match("/^.*dictionary\\.itop.*.php$/i", $sFile,
$aMatches)) // Dictionary files are named like <Lang>.dict.<ModuleName>.php
{ {
$aDictionaries[] = $this->sRootDir.'/'.$sFile; $aMatches = array();
if (preg_match("/^.*dictionary\\.itop.*.php$/i", $sFile,
$aMatches)) // Dictionary files are named like <Lang>.dict.<ModuleName>.php
{
$aDictionaries[] = $sRootDir.'/'.$sFile;
}
} }
closedir($hDir);
} }
closedir($hDir);
} }
return $aDictionaries; return $aDictionaries;
@@ -2898,4 +2904,4 @@ class MFParameters
return $merged; return $merged;
} }
} }

15
setup/modulediscovery.class.inc.php
View File

@@ -134,17 +134,20 @@ class ModuleDiscovery
{ {
$sModuleName = $aMatches[1]; $sModuleName = $aMatches[1];
$sDir = dirname($sFilePath); $sDir = dirname($sFilePath);
if ($hDir = opendir($sDir)) foreach (array($sDir, $sDir.'/dictionary') as $sRootDir)
{ {
while (($sFile = readdir($hDir)) !== false) if ($hDir = @opendir($sRootDir))
{ {
$aMatches = array(); while (($sFile = readdir($hDir)) !== false)
if (preg_match("/^[^\\.]+.dict.$sModuleName.php$/i", $sFile, $aMatches)) // Dictionary files named like <Lang>.dict.<ModuleName>.php are loaded automatically
{ {
self::$m_aModules[$sId]['dictionary'][] = self::$m_sModulePath.'/'.$sFile; $aMatches = array();
if (preg_match("/^[^\\.]+.dict.$sModuleName.php$/i", $sFile, $aMatches)) // Dictionary files named like <Lang>.dict.<ModuleName>.php are loaded automatically
{
self::$m_aModules[$sId]['dictionary'][] = $sRootDir.'/'.$sFile;
}
} }
closedir($hDir);
} }
closedir($hDir);
} }
} }
} }