diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php index 6acecd410..f57725877 100644 --- a/dictionaries/fr.dictionary.itop.ui.php +++ b/dictionaries/fr.dictionary.itop.ui.php @@ -1428,7 +1428,7 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé 'UI:About:InstallationOptions' => 'Options d\'installation', 'UI:About:ManualExtensionSource' => 'Extension', 'UI:About:Extension_Version' => 'Version: %1$s', - 'UI:About:RemoteExtensionSource' => 'iTop Hub', + 'UI:About:RemoteExtensionSource' => 'Data', 'UI:DisconnectedDlgMessage' => 'Vous êtes déconnecté(e). Vous devez vous identifier pour pouvoir continuer à utiliser l\'application.', 'UI:DisconnectedDlgTitle' => 'Attention !', diff --git a/dictionaries/sk.dictionary.itop.ui.php b/dictionaries/sk.dictionary.itop.ui.php index e46cf0a56..95bb4e6d3 100644 --- a/dictionaries/sk.dictionary.itop.ui.php +++ b/dictionaries/sk.dictionary.itop.ui.php @@ -1431,7 +1431,7 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp 'UI:About:InstallationOptions' => 'Installation options~~', 'UI:About:ManualExtensionSource' => 'Extension~~', 'UI:About:Extension_Version' => 'Version: %1$s~~', - 'UI:About:RemoteExtensionSource' => 'iTop Hub~~', + 'UI:About:RemoteExtensionSource' => 'Data~~', 'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~', 'UI:DisconnectedDlgTitle' => 'Warning!~~', diff --git a/test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php b/test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php index b554b865e..02d9d5645 100644 --- a/test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php +++ b/test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php @@ -36,30 +36,36 @@ class iTopModuleXmlInstallationChecklistTest extends ItopTestCase public function testAllModuleAreIncludedInInstallationXml() { $sInstallationXmlPath = APPROOT.'datamodels/2.x/installation.xml'; - if (!is_file($sInstallationXmlPath)) - { + if (!is_file($sInstallationXmlPath)) { $sInstallationXmlPath = APPROOT.'datamodels/1.x/installation.xml'; } $this->assertTrue(is_file($sInstallationXmlPath), "$sInstallationXmlPath does not exist"); $sInstallationXmlContent = file_get_contents($sInstallationXmlPath); preg_match_all("|(.*)|", $sInstallationXmlContent, $aMatches); - $aDeclaredModules = [] ; - if (!empty($aMatches)) - { - foreach ($aMatches[1] as $sModule) - { - if (!array_key_exists($sModule, $aDeclaredModules)) - { + $aDeclaredModules = []; + if (!empty($aMatches)) { + foreach ($aMatches[1] as $sModule) { + if (!array_key_exists($sModule, $aDeclaredModules)) { $aDeclaredModules[$sModule] = $sModule; } } } - $this->assertArraySubset($this->GetFilteredModulesFromDatamodels(APPROOT.'/datamodels'), $aDeclaredModules, false, "$sInstallationXmlPath does not refer to all provided modules. Refered modules:\n " . var_export($aDeclaredModules, true)); + $this->assertArraySubset( + $this->GetFilteredModulesFromDatamodels(APPROOT.'/datamodels'), + $aDeclaredModules, + false, + "{$sInstallationXmlPath} does not list all modules in /datamodels ! List of modules in installation.xml:\n ".var_export($aDeclaredModules, true) + ); $aModulesFromDatamodels = $this->GetAllModules(APPROOT.'/datamodels'); - $this->assertArraySubset($aDeclaredModules, $aModulesFromDatamodels, false, "Not all modules are contained in $sInstallationXmlPath. Refered modules:\n " . var_export($aModulesFromDatamodels, true)); + $this->assertArraySubset( + $aDeclaredModules, + $aModulesFromDatamodels, + false, + "Not all modules are contained in {$sInstallationXmlPath}. List of modules in /datamodels:\n ".var_export($aModulesFromDatamodels, true) + ); } public function GetFilteredModulesFromDatamodels($sFolder)