From e16a32bad211380ba615afb64d7b27faa2ae1194 Mon Sep 17 00:00:00 2001
From: bdalsass <95754414+bdalsass@users.noreply.github.com>
Date: Wed, 3 May 2023 09:47:56 +0200
Subject: [PATCH] Feature/6154 - Change dict key (#490)

---
 core/attributedef.class.inc.php                                | 2 +-
 .../uniqueness-rule/fr.dictionary.itop.uniqueness-rule.php     | 2 +-
 js/pages/backoffice/toolbox.js                                 | 1 -
 sources/Application/UI/Links/AbstractBlockLinkSetViewTable.php | 3 ++-
 sources/Controller/Links/LinkSetController.php                 | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 962ba98c5..1af353a8c 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -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);
                 }
diff --git a/dictionaries/core/uniqueness-rule/fr.dictionary.itop.uniqueness-rule.php b/dictionaries/core/uniqueness-rule/fr.dictionary.itop.uniqueness-rule.php
index 33da7773a..29f48744f 100644
--- a/dictionaries/core/uniqueness-rule/fr.dictionary.itop.uniqueness-rule.php
+++ b/dictionaries/core/uniqueness-rule/fr.dictionary.itop.uniqueness-rule.php
@@ -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.',
 ]);
diff --git a/js/pages/backoffice/toolbox.js b/js/pages/backoffice/toolbox.js
index aff714032..41e8b4936 100644
--- a/js/pages/backoffice/toolbox.js
+++ b/js/pages/backoffice/toolbox.js
@@ -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(' ') : '',
diff --git a/sources/Application/UI/Links/AbstractBlockLinkSetViewTable.php b/sources/Application/UI/Links/AbstractBlockLinkSetViewTable.php
index 98dc73c51..ba0ac954c 100644
--- a/sources/Application/UI/Links/AbstractBlockLinkSetViewTable.php
+++ b/sources/Application/UI/Links/AbstractBlockLinkSetViewTable.php
@@ -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,
diff --git a/sources/Controller/Links/LinkSetController.php b/sources/Controller/Links/LinkSetController.php
index 1373b52d9..0a1ad6636 100644
--- a/sources/Controller/Links/LinkSetController.php
+++ b/sources/Controller/Links/LinkSetController.php
@@ -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));