From 8e046cafda7eebcbbd41e04f277972fb65ea84f3 Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Thu, 27 Apr 2017 08:43:45 +0000 Subject: [PATCH] Archives: default label for the magic attributes archive_flag and archive_date SVN:trunk[4699] --- core/attributedef.class.inc.php | 23 +++++++++++++++++++++ core/metamodel.class.php | 2 +- dictionaries/cs.dictionary.itop.core.php | 5 +++++ dictionaries/da.dictionary.itop.core.php | 5 +++++ dictionaries/de.dictionary.itop.core.php | 5 +++++ dictionaries/dictionary.itop.core.php | 5 +++++ dictionaries/es_cr.dictionary.itop.core.php | 5 +++++ dictionaries/fr.dictionary.itop.core.php | 6 ++++++ dictionaries/hu.dictionary.itop.core.php | 5 +++++ dictionaries/it.dictionary.itop.core.php | 5 +++++ dictionaries/ja.dictionary.itop.core.php | 5 +++++ dictionaries/nl.dictionary.itop.core.php | 5 +++++ dictionaries/pt_br.dictionary.itop.core.php | 5 +++++ dictionaries/ru.dictionary.itop.core.php | 5 +++++ dictionaries/tr.dictionary.itop.core.php | 6 +++++- dictionaries/zh.dictionary.itop.core.php | 5 +++++ 16 files changed, 95 insertions(+), 2 deletions(-) diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php index 166a127e4..78b395235 100644 --- a/core/attributedef.class.inc.php +++ b/core/attributedef.class.inc.php @@ -7616,4 +7616,27 @@ class AttributeArchiveFlag extends AttributeBoolean { return true; } + public function GetLabel($sDefault = null) + { + $sDefault = Dict::S('Core:AttributeArchiveFlag/Label', $sDefault); + return parent::GetLabel($sDefault); + } + public function GetDescription($sDefault = null) + { + $sDefault = Dict::S('Core:AttributeArchiveFlag/Label+', $sDefault); + return parent::GetDescription($sDefault); + } +} +class AttributeArchiveDate extends AttributeDate +{ + public function GetLabel($sDefault = null) + { + $sDefault = Dict::S('Core:AttributeArchiveDate/Label', $sDefault); + return parent::GetLabel($sDefault); + } + public function GetDescription($sDefault = null) + { + $sDefault = Dict::S('Core:AttributeArchiveDate/Label+', $sDefault); + return parent::GetDescription($sDefault); + } } diff --git a/core/metamodel.class.php b/core/metamodel.class.php index b6d8eecc8..e1dbcbdba 100644 --- a/core/metamodel.class.php +++ b/core/metamodel.class.php @@ -1832,7 +1832,7 @@ abstract class MetaModel $oArchiveFlag = new AttributeArchiveFlag('archive_flag'); self::AddMagicAttribute($oArchiveFlag, $sClass); - $oArchiveDate = new AttributeDate('archive_date', array('magic' => true, "allowed_values"=>null, "sql"=>'archive_date', "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())); + $oArchiveDate = new AttributeArchiveDate('archive_date', array('magic' => true, "allowed_values"=>null, "sql"=>'archive_date', "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())); self::AddMagicAttribute($oArchiveDate, $sClass); } elseif (self::$m_aClassParams[$sClass]["archive"]) diff --git a/dictionaries/cs.dictionary.itop.core.php b/dictionaries/cs.dictionary.itop.core.php index 4c2d0872d..445806b15 100755 --- a/dictionaries/cs.dictionary.itop.core.php +++ b/dictionaries/cs.dictionary.itop.core.php @@ -51,9 +51,14 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'Core:AttributeBoolean/Value:yes' => 'Yes~~', 'Core:AttributeBoolean/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag' => 'Archive flag~~', 'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~', 'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~', 'Core:AttributeArchiveFlag/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag/Label' => 'Archived~~', + 'Core:AttributeArchiveFlag/Label+' => '', + 'Core:AttributeArchiveDate/Label' => 'Archive date~~', + 'Core:AttributeArchiveDate/Label+' => '', 'Core:AttributeString' => 'Řetězec (string)', 'Core:AttributeString+' => 'Alfanumerický řetězec', diff --git a/dictionaries/da.dictionary.itop.core.php b/dictionaries/da.dictionary.itop.core.php index 4d04c6936..5145a4884 100644 --- a/dictionaries/da.dictionary.itop.core.php +++ b/dictionaries/da.dictionary.itop.core.php @@ -1400,9 +1400,14 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array( 'Core:AttributeBoolean/Value:null' => '', 'Core:AttributeBoolean/Value:yes' => 'Yes~~', 'Core:AttributeBoolean/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag' => 'Archive flag~~', 'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~', 'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~', 'Core:AttributeArchiveFlag/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag/Label' => 'Archived~~', + 'Core:AttributeArchiveFlag/Label+' => '', + 'Core:AttributeArchiveDate/Label' => 'Archive date~~', + 'Core:AttributeArchiveDate/Label+' => '', 'Core:AttributeString' => 'String', 'Core:AttributeString+' => '', 'Core:AttributeClass' => 'Class', diff --git a/dictionaries/de.dictionary.itop.core.php b/dictionaries/de.dictionary.itop.core.php index 7f2241d3d..bd22455f7 100644 --- a/dictionaries/de.dictionary.itop.core.php +++ b/dictionaries/de.dictionary.itop.core.php @@ -326,9 +326,14 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( 'Core:AttributeBoolean/Value:null' => '', 'Core:AttributeBoolean/Value:yes' => 'Yes~~', 'Core:AttributeBoolean/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag' => 'Archive flag~~', 'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~', 'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~', 'Core:AttributeArchiveFlag/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag/Label' => 'Archived~~', + 'Core:AttributeArchiveFlag/Label+' => '', + 'Core:AttributeArchiveDate/Label' => 'Archive date~~', + 'Core:AttributeArchiveDate/Label+' => '', 'Core:AttributeString' => 'String', 'Core:AttributeString+' => 'Alphanumerischer String', 'Core:AttributeClass' => 'Class', diff --git a/dictionaries/dictionary.itop.core.php b/dictionaries/dictionary.itop.core.php index bae31a442..7063fdd16 100644 --- a/dictionaries/dictionary.itop.core.php +++ b/dictionaries/dictionary.itop.core.php @@ -49,9 +49,14 @@ Dict::Add('EN US', 'English', 'English', array( 'Core:AttributeBoolean/Value:yes' => 'Yes', 'Core:AttributeBoolean/Value:no' => 'No', + 'Core:AttributeArchiveFlag' => 'Archive flag', 'Core:AttributeArchiveFlag/Value:yes' => 'Yes', 'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode', 'Core:AttributeArchiveFlag/Value:no' => 'No', + 'Core:AttributeArchiveFlag/Label' => 'Archived', + 'Core:AttributeArchiveFlag/Label+' => '', + 'Core:AttributeArchiveDate/Label' => 'Archive date', + 'Core:AttributeArchiveDate/Label+' => '', 'Core:AttributeString' => 'String', 'Core:AttributeString+' => 'Alphanumeric string', diff --git a/dictionaries/es_cr.dictionary.itop.core.php b/dictionaries/es_cr.dictionary.itop.core.php index 8410c5772..54e3447f5 100644 --- a/dictionaries/es_cr.dictionary.itop.core.php +++ b/dictionaries/es_cr.dictionary.itop.core.php @@ -49,9 +49,14 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array( 'Core:AttributeBoolean/Value:yes' => 'Yes~~', 'Core:AttributeBoolean/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag' => 'Archive flag~~', 'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~', 'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~', 'Core:AttributeArchiveFlag/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag/Label' => 'Archived~~', + 'Core:AttributeArchiveFlag/Label+' => '', + 'Core:AttributeArchiveDate/Label' => 'Archive date~~', + 'Core:AttributeArchiveDate/Label+' => '', 'Core:AttributeString' => 'Cadena de caracteres', 'Core:AttributeString+' => 'Cadena de caracteres alfanumerico', diff --git a/dictionaries/fr.dictionary.itop.core.php b/dictionaries/fr.dictionary.itop.core.php index 27328e206..c1f75d0bb 100644 --- a/dictionaries/fr.dictionary.itop.core.php +++ b/dictionaries/fr.dictionary.itop.core.php @@ -435,9 +435,15 @@ Dict::Add('FR FR', 'French', 'Français', array( 'Core:AttributeBoolean/Value:null' => '', 'Core:AttributeBoolean/Value:yes' => 'Oui', 'Core:AttributeBoolean/Value:no' => 'Non', + 'Core:AttributeArchiveFlag' => 'Drapeau Archive', 'Core:AttributeArchiveFlag/Value:yes' => 'Oui', 'Core:AttributeArchiveFlag/Value:yes+' => 'Cet object n\'est visible que dans le mode Archive', 'Core:AttributeArchiveFlag/Value:no' => 'Non', + 'Core:AttributeArchiveFlag/Label' => 'Archivé~~', + 'Core:AttributeArchiveFlag/Label+' => '', + 'Core:AttributeArchiveDate/Label' => 'Date archivage~~', + 'Core:AttributeArchiveDate/Label+' => '', + 'Core:AttributeString' => 'Chaîne de caractères', 'Core:AttributeString+' => 'Chaîne de caractères (limitée à une ligne)', 'Core:AttributeClass' => 'Classe', diff --git a/dictionaries/hu.dictionary.itop.core.php b/dictionaries/hu.dictionary.itop.core.php index a5a96d865..600008c48 100755 --- a/dictionaries/hu.dictionary.itop.core.php +++ b/dictionaries/hu.dictionary.itop.core.php @@ -309,9 +309,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( 'Core:AttributeBoolean/Value:null' => '', 'Core:AttributeBoolean/Value:yes' => 'Yes~~', 'Core:AttributeBoolean/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag' => 'Archive flag~~', 'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~', 'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~', 'Core:AttributeArchiveFlag/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag/Label' => 'Archived~~', + 'Core:AttributeArchiveFlag/Label+' => '', + 'Core:AttributeArchiveDate/Label' => 'Archive date~~', + 'Core:AttributeArchiveDate/Label+' => '', 'Core:AttributeString' => 'String', 'Core:AttributeString+' => '', 'Core:AttributeClass' => 'Class', diff --git a/dictionaries/it.dictionary.itop.core.php b/dictionaries/it.dictionary.itop.core.php index fa58fd5e6..bd7287c9a 100644 --- a/dictionaries/it.dictionary.itop.core.php +++ b/dictionaries/it.dictionary.itop.core.php @@ -43,9 +43,14 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( 'Core:AttributeBoolean/Value:yes' => 'Yes~~', 'Core:AttributeBoolean/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag' => 'Archive flag~~', 'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~', 'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~', 'Core:AttributeArchiveFlag/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag/Label' => 'Archived~~', + 'Core:AttributeArchiveFlag/Label+' => '', + 'Core:AttributeArchiveDate/Label' => 'Archive date~~', + 'Core:AttributeArchiveDate/Label+' => '', 'Core:AttributeString' => 'Stringa', 'Core:AttributeString+' => 'Stringa alfanumerica', diff --git a/dictionaries/ja.dictionary.itop.core.php b/dictionaries/ja.dictionary.itop.core.php index f4d897fc6..c7c2bc02d 100644 --- a/dictionaries/ja.dictionary.itop.core.php +++ b/dictionaries/ja.dictionary.itop.core.php @@ -328,9 +328,14 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( 'Core:AttributeBoolean/Value:null' => '', 'Core:AttributeBoolean/Value:yes' => 'Yes~~', 'Core:AttributeBoolean/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag' => 'Archive flag~~', 'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~', 'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~', 'Core:AttributeArchiveFlag/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag/Label' => 'Archived~~', + 'Core:AttributeArchiveFlag/Label+' => '', + 'Core:AttributeArchiveDate/Label' => 'Archive date~~', + 'Core:AttributeArchiveDate/Label+' => '', 'Core:AttributeString' => '文字列', 'Core:AttributeString+' => '文字列', 'Core:AttributeClass' => 'クラス', diff --git a/dictionaries/nl.dictionary.itop.core.php b/dictionaries/nl.dictionary.itop.core.php index 84c6d5b4c..7a606f645 100644 --- a/dictionaries/nl.dictionary.itop.core.php +++ b/dictionaries/nl.dictionary.itop.core.php @@ -54,9 +54,14 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'Core:AttributeBoolean/Value:yes' => 'Yes~~', 'Core:AttributeBoolean/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag' => 'Archive flag~~', 'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~', 'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~', 'Core:AttributeArchiveFlag/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag/Label' => 'Archived~~', + 'Core:AttributeArchiveFlag/Label+' => '', + 'Core:AttributeArchiveDate/Label' => 'Archive date~~', + 'Core:AttributeArchiveDate/Label+' => '', 'Core:AttributeString' => 'String', 'Core:AttributeString+' => 'Alphanumerieke string', diff --git a/dictionaries/pt_br.dictionary.itop.core.php b/dictionaries/pt_br.dictionary.itop.core.php index 97613c4a3..d54f6d2cb 100644 --- a/dictionaries/pt_br.dictionary.itop.core.php +++ b/dictionaries/pt_br.dictionary.itop.core.php @@ -49,9 +49,14 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'Core:AttributeBoolean/Value:yes' => 'Yes~~', 'Core:AttributeBoolean/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag' => 'Archive flag~~', 'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~', 'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~', 'Core:AttributeArchiveFlag/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag/Label' => 'Archived~~', + 'Core:AttributeArchiveFlag/Label+' => '', + 'Core:AttributeArchiveDate/Label' => 'Archive date~~', + 'Core:AttributeArchiveDate/Label+' => '', 'Core:AttributeString' => 'String', 'Core:AttributeString+' => 'Seqüência alfanumérica', diff --git a/dictionaries/ru.dictionary.itop.core.php b/dictionaries/ru.dictionary.itop.core.php index b46ac569c..89b152e52 100644 --- a/dictionaries/ru.dictionary.itop.core.php +++ b/dictionaries/ru.dictionary.itop.core.php @@ -35,9 +35,14 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'Core:AttributeBoolean/Value:yes' => 'Yes~~', 'Core:AttributeBoolean/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag' => 'Archive flag~~', 'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~', 'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~', 'Core:AttributeArchiveFlag/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag/Label' => 'Archived~~', + 'Core:AttributeArchiveFlag/Label+' => '', + 'Core:AttributeArchiveDate/Label' => 'Archive date~~', + 'Core:AttributeArchiveDate/Label+' => '', 'Core:AttributeString' => 'Строка', 'Core:AttributeString+' => 'Alphanumeric string', diff --git a/dictionaries/tr.dictionary.itop.core.php b/dictionaries/tr.dictionary.itop.core.php index f1eafd79b..ec0e8d7f9 100644 --- a/dictionaries/tr.dictionary.itop.core.php +++ b/dictionaries/tr.dictionary.itop.core.php @@ -416,10 +416,14 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array( 'Core:AttributeBoolean/Value:null' => '', 'Core:AttributeBoolean/Value:yes' => 'Yes~~', 'Core:AttributeBoolean/Value:no' => 'No~~', - + 'Core:AttributeArchiveFlag' => 'Archive flag~~', 'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~', 'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~', 'Core:AttributeArchiveFlag/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag/Label' => 'Archived~~', + 'Core:AttributeArchiveFlag/Label+' => '', + 'Core:AttributeArchiveDate/Label' => 'Archive date~~', + 'Core:AttributeArchiveDate/Label+' => '', 'Core:AttributeString' => 'String~~', 'Core:AttributeString+' => 'Alphanumeric string~~', 'Core:AttributeClass' => 'Class~~', diff --git a/dictionaries/zh.dictionary.itop.core.php b/dictionaries/zh.dictionary.itop.core.php index c0b72226b..82d3fd688 100644 --- a/dictionaries/zh.dictionary.itop.core.php +++ b/dictionaries/zh.dictionary.itop.core.php @@ -415,9 +415,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Core:AttributeBoolean/Value:null' => '', 'Core:AttributeBoolean/Value:yes' => 'Yes~~', 'Core:AttributeBoolean/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag' => 'Archive flag~~', 'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~', 'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~', 'Core:AttributeArchiveFlag/Value:no' => 'No~~', + 'Core:AttributeArchiveFlag/Label' => 'Archived~~', + 'Core:AttributeArchiveFlag/Label+' => '', + 'Core:AttributeArchiveDate/Label' => 'Archive date~~', + 'Core:AttributeArchiveDate/Label+' => '', 'Core:AttributeString' => 'String~~', 'Core:AttributeString+' => 'Alphanumeric string~~', 'Core:AttributeClass' => 'Class~~',