Преглед изворни кода

Injectable methods: labels/descriptions given in the dictionary

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3466 a333f486-631f-4898-b8df-5754b55c2be0
romainq пре 10 година
родитељ
комит
5ec8ad729d

+ 4 - 4
datamodels/2.x/itop-incident-mgmt-itil/en.dict.itop-incident-mgmt-itil.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
+// Copyright (C) 2010-2014 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -237,7 +237,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Incident/Stimulus:ev_reopen' => 'Re-open',
 	'Class:Incident/Stimulus:ev_reopen+' => '',
 	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Cannot assign the Parent incident to the incident itself',
-));
-
 
-?>
+	'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets',
+	'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info',
+));

+ 4 - 2
datamodels/2.x/itop-incident-mgmt-itil/fr.dict.itop-incident-mgmt-itil.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
+// Copyright (C) 2010-2014 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -218,5 +218,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI-IncidentManagementOverview-OpenIncidentByStatus' => 'Incidents ouverts par statut',
 	'UI-IncidentManagementOverview-OpenIncidentByAgent' => 'Incidents ouverts par agent',
 	'UI-IncidentManagementOverview-OpenIncidentByCustomer' => 'Incidents ouverts par client',
+
+	'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets (résoudre les tickets fils)',
+	'Class:Incident/Method:ResolveChildTickets+' => 'Cascader l\'action de résolution du ticket (ev_autoresolve) vers les requêtes et incidents fils, et aligner les caractéristiques suivantes : service, équipe, agent, information de résolution',
 ));
-?>

+ 4 - 5
datamodels/2.x/itop-request-mgmt-itil/en.dict.itop-request-mgmt-itil.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
+// Copyright (C) 2010-2014 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -261,8 +261,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Wait for approval',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
 	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Cannot assign the Parent request to the request itself',
-));
-
 
-
-?>
+	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
+	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info',
+));

+ 5 - 3
datamodels/2.x/itop-request-mgmt-itil/fr.dict.itop-request-mgmt-itil.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
+// Copyright (C) 2010-2014 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -267,6 +267,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Portal:UserRequest:MoreInfo' => 'Informations complémentaires',
 	'Portal:Details-Service-Element' => 'Eléments de service',
 	'Portal:NoClosedTicket' => 'Pas de requête fermée',
-	'Portal:NoService' => ''
+	'Portal:NoService' => '',
+
+	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets (résoudre les tickets fils)',
+	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascader l\'action de résolution de la demande (ev_autoresolve), et aligner les caractéristiques suivantes : service, équipe, agent, information de résolution',
 ));
-?>

+ 4 - 3
datamodels/2.x/itop-request-mgmt/en.dict.itop-request-mgmt.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
+// Copyright (C) 2010-2014 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -290,6 +290,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Portal:SelectLanguage' => "Change you language",
 	'Portal:LanguageChangedTo_Lang' => 'Language changed to',
 	'Portal:ChooseYourFavoriteLanguage' => 'Choose your favorite language',
-));
 
-?>
+	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
+	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info',
+));

+ 4 - 2
datamodels/2.x/itop-request-mgmt/fr.dict.itop-request-mgmt.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
+// Copyright (C) 2010-2014 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -280,5 +280,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Portal:SelectLanguage' => "Changer ma langue",
 	'Portal:LanguageChangedTo_Lang' => 'Langue changée en',
 	'Portal:ChooseYourFavoriteLanguage' => 'Choisissez votre langue',
+
+	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets (résoudre les tickets fils)',
+	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascader l\'action de résolution de la demande (ev_autoresolve), et aligner les caractéristiques suivantes : service, équipe, agent, information de résolution',
 ));
-?>

+ 3 - 32
datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml

@@ -744,89 +744,64 @@
           <method id="Set">
             <arguments>
               <argument id="1">
-                <label>Field Code</label>
                 <type>attcode</type>
                 <mandatory>true</mandatory>
-                <description>The field to set, in the current object</description>
               </argument>
               <argument id="2">
-                <label>Value</label>
                 <type>string</type>
                 <mandatory>true</mandatory>
-                <description>The value to set</description>
               </argument>
             </arguments>
           </method>
           <method id="SetCurrentDate">
             <arguments>
               <argument id="1">
-                <label>Field Code</label>
                 <type>attcode</type>
                 <mandatory>true</mandatory>
-                <description>The field, in the current object, to set to
-                  the current date</description>
               </argument>
             </arguments>
           </method>
           <method id="SetCurrentUser">
             <arguments>
               <argument id="1">
-                <label>Field Code</label>
                 <type>attcode</type>
                 <mandatory>true</mandatory>
-                <description>The field, in the current object, to set to
-                  the current logged in user</description>
               </argument>
             </arguments>
           </method>
           <method id="SetElapsedTime">
             <arguments>
               <argument id="1">
-                <label>Field Code</label>
                 <type>attcode</type>
                 <mandatory>true</mandatory>
-                <description>The field, in the current object, to set to
-                  the time elapsed since the date given by the reference field</description>
               </argument>
               <argument id="2">
-                <label>Reference Field Code</label>
                 <type>attcode</type>
                 <mandatory>true</mandatory>
-                <description>The reference date or date/time</description>
               </argument>
               <argument id="3">
-                <label>Working hours</label>
                 <type>string</type>
                 <mandatory>false</mandatory>
-                <description>Leave empty to rely on the standard working hours scheme, or set to "DefaultWorkingTimeComputer" to force a 24x7 scheme</description>
               </argument>
             </arguments>
           </method>
           <method id="Reset">
             <arguments>
               <argument id="1">
-                <label>Field Code</label>
                 <type>attcode</type>
                 <mandatory>true</mandatory>
-                <description>The field, in the current object, to reset
-                  to its default value</description>
               </argument>
             </arguments>
           </method>
           <method id="Copy">
             <arguments>
               <argument id="1">
-                <label>Destination</label>
                 <type>attcode</type>
                 <mandatory>true</mandatory>
-                <description>The field, in the current object, to set</description>
               </argument>
               <argument id="2">
-                <label>Source</label>
                 <type>attcode</type>
                 <mandatory>true</mandatory>
-                <description>The field, in the current object, to get
-                  the value from</description>
               </argument>
             </arguments>
           </method>
@@ -834,18 +809,14 @@
       </class>
       <class id="ResponseTicketTTO" _delta="define">
         <interfaces>
-          <interface id="iMetricComputer">
-            <label>Time To Own</label>
-          </interface>
+          <interface id="iMetricComputer"/>
         </interfaces>
       </class>
       <class id="ResponseTicketTTR" _delta="define">
         <interfaces>
-          <interface id="iMetricComputer">
-             <label>Time To Resolve</label>
-          </interface>
+          <interface id="iMetricComputer"/>
         </interfaces>
       </class>
     </classes>
   </meta>
-</itop_design>
+</itop_design>

+ 38 - 1
datamodels/2.x/itop-tickets/en.dict.itop-tickets.php

@@ -179,5 +179,42 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Ticket:SLA' => 'SLA report',
 	'WorkOrder:Details' => 'Details',
 	'WorkOrder:Moreinfo' => 'More information',
-	'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s'
+	'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s',
+
+	'Class:cmdbAbstractObject/Method:Set' => 'Set',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'The field to set, in the current object',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Value',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'The value to set',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Set a field with the current date and time',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'The field to set, in the current object',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Set a field with the currently logged in user',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Set a field with the time (seconds) elapsed since a date given by another field',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to "DefaultWorkingTimeComputer" to force a 24x7 scheme',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Reset',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Reset a field to its default value',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'The field to reset, in the current object',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Copy',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Copy the value of a field to another field',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'The field to set, in the current object',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Source Field',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'The field to get the value from, in the current object',
+	'Class:ResponseTicketTT0/Interface:iMetricComputer' => 'Time To Own',
+	'Class:ResponseTicketTT0/Interface:iMetricComputer+' => 'Time To Own',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Time To Resolve',
 ));

+ 39 - 2
datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
+// Copyright (C) 2010-2014 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -164,5 +164,42 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Ticket:SLA' => 'Rapport SLA',
 	'WorkOrder:Details' => 'Détails',
 	'WorkOrder:Moreinfo' => 'Informations complémentaires',
-	'Tickets:ResolvedFrom' => 'Résolu via %1$s'
+	'Tickets:ResolvedFrom' => 'Résolu via %1$s',
+
+	'Class:cmdbAbstractObject/Method:Set' => 'Set (initialiser)',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Initialiser un champ avec une valeur statique',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Champ Cible',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'Le champ à initialiser, dans l\'objet courant',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Valeur',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'La valeur statique',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate (initialiser à la date courante)',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Initialiser un champ avec la date et l\'heure courants',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Champ Cible',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'Le champ à initialiser, dans l\'objet courant',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser (initialiser à l\'utilisateur courant)',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Initialiser un champ avec l\'utilisateur qui est en train d\'effectuer une action sur l\'objet',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Champ Cible',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'Le champ à initialiser, dans l\'objet courant',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime (initialiser avec le temps passé)',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Initialiser un champ avec le temps passé (en secondes) depuis une date donnée par un autre champ',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Champ Cible',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'Le champ à initialiser, dans l\'objet courant',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Champ de Référence',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'Le champ qui doit contenir la date de début',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Jours et Heures Ouvrés',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Laisser ce champ vide pour bénéficier de la gestion des fenêtres de couverture, ou saisir "DefaultWorkingTimeComputer" pour passer en mode 24h/24 7j/7',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Reset (réinitialiser)',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Réinitialiser un champ à sa valeur par défaut',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Champ Cible',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'Le champ à réinitialiser, dans l\'objet courant',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Copy (copier)',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Copier la valeur depuis un champ vers un autre champ',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Champ Cible',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'Le champ à initialiser, dans l\'objet courant',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Champ Source',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'Le champ dans lequel on va lire la valeur, dans l\'objet courant',
+	'Class:ResponseTicketTT0/Interface:iMetricComputer' => 'Time To Own',
+	'Class:ResponseTicketTT0/Interface:iMetricComputer+' => 'Time To Own',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Time To Resolve',
 ));