From 52fd33392286b6f27a42eb1a34565a7e3bf8a471 Mon Sep 17 00:00:00 2001 From: vdumas Date: Wed, 24 May 2023 18:17:58 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B06339=20-=20n:n=20Add=20nice=20french=20d?= =?UTF-8?q?ico=20entry=20on=20standard=20lnk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dictionaries/fr.dict.itop-config-mgmt.php | 24 +++++++++++++++++++ .../dictionaries/fr.dict.itop-structure.php | 17 +++++++++++++ .../links/en.dictionary.itop.links.php | 2 +- .../links/fr.dictionary.itop.links.php | 8 +++---- 4 files changed, 46 insertions(+), 5 deletions(-) diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php index 92b2795237..5dac534e89 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php @@ -1579,4 +1579,28 @@ Dict::Add('FR FR', 'French', 'Français', array( 'Menu:Software' => 'Catalogue des logiciels de références', 'Menu:Software+' => 'Catalogue des logiciels de références', )); + +// +// n:n relations custom labels : nom de class féminin +// + +Dict::Add('FR FR', 'French', 'Français', array( +'Class:BusinessProcess/Attribute:applicationsolutions_list/UI:links:Add:Button+' => 'Ajouter une %4$s', +'Class:BusinessProcess/Attribute:applicationsolutions_list/UI:Links:Remove:Modal:Title' => 'Retirer une %4$s', +'Class:BusinessProcess/Attribute:applicationsolutions_list/UI:Links:Add:Modal:Title' => 'Ajouter une %4$s à %2$s', +'Class:BusinessProcess/Attribute:applicationsolutions_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s', +'Class:FunctionalCI/Attribute:applicationsolution_list/UI:links:Add:Button+' => 'Ajouter une %4$s', +'Class:FunctionalCI/Attribute:applicationsolution_list/UI:Links:Remove:Modal:Title' => 'Retirer une %4$s', +'Class:FunctionalCI/Attribute:applicationsolution_list/UI:Links:Add:Modal:Title' => 'Ajouter une %4$s à %2$s', +'Class:FunctionalCI/Attribute:applicationsolution_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s', +'Class:SoftwarePatch/Attribute:softwareinstances_list/UI:links:Add:Button+' => 'Ajouter une %4$s', +'Class:SoftwarePatch/Attribute:softwareinstances_list/UI:Links:Remove:Modal:Title' => 'Retirer une %4$s', +'Class:SoftwarePatch/Attribute:softwareinstances_list/UI:Links:Add:Modal:Title' => 'Ajouter une %4$s à %2$s', +'Class:SoftwarePatch/Attribute:softwareinstances_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s', +'Class:VLAN/Attribute:physicalinterfaces_list/UI:links:Add:Button+' => 'Ajouter une %4$s', +'Class:VLAN/Attribute:physicalinterfaces_list/UI:Links:Remove:Modal:Title' => 'Retirer une %4$s', +'Class:VLAN/Attribute:physicalinterfaces_list/UI:Links:Add:Modal:Title' => 'Ajouter une %4$s à %2$s', +'Class:VLAN/Attribute:physicalinterfaces_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s', +)); + ?> diff --git a/datamodels/2.x/itop-structure/dictionaries/fr.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/fr.dict.itop-structure.php index 7b418240d3..93cd89a3ec 100644 --- a/datamodels/2.x/itop-structure/dictionaries/fr.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/dictionaries/fr.dict.itop-structure.php @@ -391,3 +391,20 @@ Dict::Add('FR FR', 'French', 'Français', array( 'theme:fullmoon' => 'Full moon', 'theme:test-red' => 'Instance de test (Rouge)', )); + +// +// n:n relations custom labels : nom de classe féminin +// +Dict::Add('FR FR', 'French', 'Français', array( + 'Class:Person/Attribute:team_list/UI:links:Add:Button+' => 'Ajouter une %4$s', + 'Class:Person/Attribute:team_list/UI:Links:Add:Modal:Title' => 'Ajouter une %4$s à %2$s', + 'Class:Person/Attribute:team_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s', + 'Class:Person/Attribute:team_list/UI:links:Remove:Title' => 'Retirer une %4$s', + 'Class:Team/Attribute:persons_list/UI:links:Add:Button+' => 'Ajouter une %4$s', + 'Class:Team/Attribute:persons_list/UI:Links:Add:Modal:Title' => 'Ajouter une %4$s à %2$s', + 'Class:Team/Attribute:persons_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s', + 'Class:Team/Attribute:persons_list/UI:links:Remove:Title' => 'Retirer une %4$s', +)); + + + diff --git a/dictionaries/ui/application/links/en.dictionary.itop.links.php b/dictionaries/ui/application/links/en.dictionary.itop.links.php index 1f5c120690..d3bd7990b2 100644 --- a/dictionaries/ui/application/links/en.dictionary.itop.links.php +++ b/dictionaries/ui/application/links/en.dictionary.itop.links.php @@ -21,7 +21,7 @@ Dict::Add('EN US', 'English', 'English', array( // Placeholders // $%1s : host object class name - // $%2s : host object firendlyname + // $%2s : host object friendlyname // $%3s : current tab name // $%4s : remote object class name // $%5s : remote object friendlyname diff --git a/dictionaries/ui/application/links/fr.dictionary.itop.links.php b/dictionaries/ui/application/links/fr.dictionary.itop.links.php index f5f6490698..577639ebc6 100644 --- a/dictionaries/ui/application/links/fr.dictionary.itop.links.php +++ b/dictionaries/ui/application/links/fr.dictionary.itop.links.php @@ -36,8 +36,8 @@ Dict::Add('FR FR', 'French', 'Français', array( // Add 'UI:Links:Add:Button' => 'Ajouter', - 'UI:Links:Add:Button+' => 'Ajouter un(e) %4$s', - 'UI:Links:Add:Modal:Title' => 'Ajouter un(e) %4$s à %2$s', + 'UI:Links:Add:Button+' => 'Ajouter un %4$s', + 'UI:Links:Add:Modal:Title' => 'Ajouter un %4$s à %2$s', // Modify link 'UI:Links:ModifyLink:Button' => 'Modifier', @@ -51,8 +51,8 @@ Dict::Add('FR FR', 'French', 'Français', array( // Remove 'UI:Links:Remove:Button' => 'Retirer', - 'UI:Links:Remove:Button+' => 'Retirer cet(te) %4$s', - 'UI:Links:Remove:Modal:Title' => 'Retirer un(e) %4$s de %1$s', + 'UI:Links:Remove:Button+' => 'Retirer cet %4$s', + 'UI:Links:Remove:Modal:Title' => 'Retirer un %4$s de %1$s', 'UI:Links:Remove:Modal:Message' => 'Voulez-vous vraiment retirer %5$s de %2$s ?', // Delete