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

Feature/6154 - Change dict key (#490)

Browse Source
This commit is contained in:
bdalsass
2023-05-03 09:47:56 +02:00
committed by GitHub
parent 375677612d
commit e16a32bad2
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/attributedef.class.inc.php
View File

@@ -2455,7 +2455,7 @@ class AttributeLinkedSet extends AttributeDefinition
$sNextClass = $this->m_sHostClass;
do {
$sKey = "class:{$sNextClass}/Attribute:{$this->m_sCode}/{$sDictEntrySuffix}";
$sKey = "Class:{$sNextClass}/Attribute:{$this->m_sCode}/{$sDictEntrySuffix}";
if (Dict::S($sKey, null, $bUserLanguageOnly) !== $sKey) {
return Dict::Format($sKey, ...$aArgs);
}

2
dictionaries/core/uniqueness-rule/fr.dictionary.itop.uniqueness-rule.php
View File

@@ -22,5 +22,5 @@
*/
Dict::Add('FR FR', 'French', 'Français', [
'Class:cmdbAbstractObject/UniquenessRule:no_duplicate' => '%1$s : %2$s est déjà lié à %3$s : %4$s, les doublons ne sont pas autorisés sur cette relation.',
'Class:cmdbAbstractObject/UniquenessRule:no_duplicate' => '%1$s : %2$s est déjà lié à un(e) %3$s : %4$s, les doublons ne sont pas autorisés sur cette relation.',
]);

1
js/pages/backoffice/toolbox.js
View File

@@ -327,7 +327,6 @@ CombodoModal._ConvertButtonDefinition = function (aButtonsDefinitions) {
}
Object.keys(aButtonsDefinitions).forEach(key => {
const element = aButtonsDefinitions[key];
console.log(element);
const aButton = {
text: element.text,
class: typeof(element.classes) !== 'undefined' ? element.classes.join(' ') : '',

3
sources/Application/UI/Links/AbstractBlockLinkSetViewTable.php
View File

@@ -13,6 +13,7 @@ use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
use CoreException;
use CoreWarning;
use DBObject;
use Dict;
use DictExceptionMissingString;
use DisplayBlock;
use Exception;
@@ -123,7 +124,7 @@ abstract class AbstractBlockLinkSetViewTable extends UIContentBlock
public function GetDictionaryEntry(string $sKey, DBObject $oDBObject = null)
{
return $this->oAttDef->SearchSpecificLabel($sKey, '', true,
$this->sObjectClass,
Dict::S("Class:{$this->sObjectClass}"),
$this->oDbObject->Get('friendlyname'),
$this->oAttDef->GetLabel(),
$this->sTargetClass,

3
sources/Controller/Links/LinkSetController.php
View File

@@ -14,6 +14,7 @@ use Combodo\iTop\Controller\AbstractController;
use Combodo\iTop\Service\Links\LinkSetModel;
use Combodo\iTop\Service\Router\Router;
use Combodo\iTop\Service\Base\ObjectRepository;
use Dict;
use Exception;
use JsonPage;
use CoreException;
@@ -207,7 +208,7 @@ JS;
$oLinksetDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
$oHostObj = MetaModel::GetObject($sClass, $sId);
$sFormTitle = $oLinksetDef->SearchSpecificLabel('UI:Links:Add:Modal:Title', '', true,
$sClass,
Dict::S("Class:{$sClass}"),
$oHostObj->Get('friendlyname'),
$oLinksetDef->GetLabel(),
LinkSetModel::GetTargetClass($oLinksetDef));