composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-18 23:08:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

New verb to display information on edited fields and fixed a few typos in the dictionary

Browse Source 
SVN:trunk[447]
This commit is contained in:
Romain Quetiez
2010-06-09 15:20:49 +00:00
parent 0fea8f1ea0
commit 8e2ca8c027
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,6 +176,7 @@ abstract class AttributeDefinition
}
}
public function GetDescription() {return Dict::S('Class:'.$this->m_sHostClass.'/Attribute:'.$this->m_sCode.'+', '');}
public function GetHelpOnEdition() {return Dict::S('Class:'.$this->m_sHostClass.'/Attribute:'.$this->m_sCode.'?', '');}
public function GetDescription_Obsolete()
{
// Written for compatibility with a data model written prior to version 0.9.1

1
dictionaries/dictionary.itop.model.php
View File

@@ -456,6 +456,7 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:bizDevice/Attribute:serial_number+' => 'The serial number of the device',
'Class:bizDevice/Attribute:mgmt_ip' => 'Mgmt IP',
'Class:bizDevice/Attribute:mgmt_ip+' => 'Management IP',
'Class:bizDevice/Attribute:mgmt_ip?' => 'Format: nnn.nnn.nnn.nnn',
));
//

6
dictionaries/dictionary.itop.ui.php
View File

@@ -43,7 +43,7 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:menuNode/Attribute:hyperlink' => 'Hyperlink',
'Class:menuNode/Attribute:hyperlink+' => 'Hyperlink to the page',
'Class:menuNode/Attribute:icon_path' => 'Menu Icon',
'Class:menuNode/Attribute:icon_path+' => 'Path to the icon o the menu',
'Class:menuNode/Attribute:icon_path+' => 'Path to the icon of the menu',
'Class:menuNode/Attribute:template' => 'Template',
'Class:menuNode/Attribute:template+' => 'HTML template for the view',
'Class:menuNode/Attribute:type' => 'Type',
@@ -386,7 +386,7 @@ Dict::Add('EN US', 'English', 'English', array(
'UI:Error:BulkDeleteNotAllowedOn_Class' => 'You are not allowed to perform a bulk delete of objects of class %1$s',
'UI:Error:DeleteNotAllowedOn_Class' => 'You are not allowed to delete objects of class %1$s',
'UI:Error:ObjectAlreadyCloned' => 'Error: the object has already been cloned!',
'UI:Error:ObjectAlreadyCreated' => 'Error: the object has laready been created!',
'UI:Error:ObjectAlreadyCreated' => 'Error: the object has already been created!',
'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'Error: invalid stimulus "%1$s" on object %2$s in state "%3$s".',
@@ -450,7 +450,7 @@ Dict::Add('EN US', 'English', 'English', array(
'UI:CSVImport:ClassesSelectOne' => '-- select one --',
'UI:CSVImport:ErrorExtendedAttCode' => 'Internal error: "%1$s" is an incorrect code because "%2$s" is NOT an external key of the class "%3$s"',
'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objects(s) will stay unchanged.',
'UI:CSVImport:ObjectsWillBeModified' => '%1$d objects(s) will stay be modified.',
'UI:CSVImport:ObjectsWillBeModified' => '%1$d objects(s) will be modified.',
'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objects(s) will be added.',
'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objects(s) will have errors.',
'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objects(s) remained unchanged.',