diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php index 5981ec05e..a07012250 100644 --- a/core/attributedef.class.inc.php +++ b/core/attributedef.class.inc.php @@ -7809,3 +7809,16 @@ class AttributeObsolescenceFlag extends AttributeBoolean } } +class AttributeObsolescenceDate extends AttributeDate +{ + public function GetLabel($sDefault = null) + { + $sDefault = Dict::S('Core:AttributeObsolescenceDate/Label', $sDefault); + return parent::GetLabel($sDefault); + } + public function GetDescription($sDefault = null) + { + $sDefault = Dict::S('Core:AttributeObsolescenceDate/Label+', $sDefault); + return parent::GetDescription($sDefault); + } +} diff --git a/core/metamodel.class.php b/core/metamodel.class.php index 42a4f3ffe..190a69863 100644 --- a/core/metamodel.class.php +++ b/core/metamodel.class.php @@ -1884,7 +1884,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"]) @@ -1907,7 +1907,7 @@ abstract class MetaModel if (self::$m_aRootClasses[$sClass] == $sClass) { - $oObsolescenceDate = new AttributeDate('obsolescence_date', array('magic' => true, "allowed_values" => null, "sql" => 'obsolescence_date', "default_value" => '', "is_null_allowed" => true, "depends_on" => array())); + $oObsolescenceDate = new AttributeObsolescenceDate('obsolescence_date', array('magic' => true, "allowed_values" => null, "sql" => 'obsolescence_date', "default_value" => '', "is_null_allowed" => true, "depends_on" => array())); self::AddMagicAttribute($oObsolescenceDate, $sClass); } else diff --git a/dictionaries/cs.dictionary.itop.core.php b/dictionaries/cs.dictionary.itop.core.php index bcb1f88e7..b238f2bca 100755 --- a/dictionaries/cs.dictionary.itop.core.php +++ b/dictionaries/cs.dictionary.itop.core.php @@ -66,6 +66,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'Core:AttributeObsolescenceFlag/Value:no' => 'No~~', 'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~', 'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~', + 'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~', + 'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~', '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 2e93adf27..0aee2a8b3 100644 --- a/dictionaries/da.dictionary.itop.core.php +++ b/dictionaries/da.dictionary.itop.core.php @@ -1414,6 +1414,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array( 'Core:AttributeObsolescenceFlag/Value:no' => 'No~~', 'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~', 'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~', + 'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~', + 'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~', '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 7c68dc327..966d8eed0 100644 --- a/dictionaries/de.dictionary.itop.core.php +++ b/dictionaries/de.dictionary.itop.core.php @@ -340,6 +340,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( 'Core:AttributeObsolescenceFlag/Value:no' => 'No~~', 'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~', 'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~', + 'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~', + 'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~', '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 c544e6192..90580134d 100644 --- a/dictionaries/dictionary.itop.core.php +++ b/dictionaries/dictionary.itop.core.php @@ -64,6 +64,8 @@ Dict::Add('EN US', 'English', 'English', array( 'Core:AttributeObsolescenceFlag/Value:no' => 'No', 'Core:AttributeObsolescenceFlag/Label' => 'Obsolete', 'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes', + 'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date', + 'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete', '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 de4a926cd..6c4a94eb9 100644 --- a/dictionaries/es_cr.dictionary.itop.core.php +++ b/dictionaries/es_cr.dictionary.itop.core.php @@ -64,6 +64,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array( 'Core:AttributeObsolescenceFlag/Value:no' => 'No~~', 'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~', 'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~', + 'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~', + 'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~', '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 11ef262f3..7da340dbf 100644 --- a/dictionaries/fr.dictionary.itop.core.php +++ b/dictionaries/fr.dictionary.itop.core.php @@ -449,6 +449,8 @@ Dict::Add('FR FR', 'French', 'Français', array( 'Core:AttributeObsolescenceFlag/Value:no' => 'Non', 'Core:AttributeObsolescenceFlag/Label' => 'Obsolète', 'Core:AttributeObsolescenceFlag/Label+' => 'Calculé dynamiquement en fonction d\'autres attributs de l\'objet', + 'Core:AttributeObsolescenceDate/Label' => 'Date obsolescence', + 'Core:AttributeObsolescenceDate/Label+' => 'Date approximative du jour où l\'objet est devenu obsolète', 'Core:AttributeString' => 'Chaîne de caractères', 'Core:AttributeString+' => 'Chaîne de caractères (limitée à une ligne)', @@ -693,7 +695,7 @@ Opérateurs :
'Core:BulkExport:CSVFormat' => 'Fichier CSV (*.csv)', 'Core:BulkExport:XLSXFormat' => 'Excel 2007 ou plus récent (*.xlsx)', 'Core:BulkExport:PDFFormat' => 'Document PDF (*.pdf)', - 'Core:BulkExport:DragAndDropHelp' => 'Faîtes glisser les en-têtes des colonnes pour modifier leur ordre. Aperçu de %1$s lignes sur un total de %2$s lignes à exporter.', + 'Core:BulkExport:DragAndDropHelp' => 'Faites glisser les en-têtes des colonnes pour modifier leur ordre. Aperçu de %1$s lignes sur un total de %2$s lignes à exporter.', 'Core:BulkExport:EmptyPreview' => 'Selectionnez les colonnes à exporter dans la liste ci-dessus...', 'Core:BulkExport:ColumnsOrder' => 'Ordre des colonnes', 'Core:BulkExport:AvailableColumnsFrom_Class' => 'Colonnes de la classe %1$s', diff --git a/dictionaries/hu.dictionary.itop.core.php b/dictionaries/hu.dictionary.itop.core.php index 7773b0bd4..c485e73a9 100755 --- a/dictionaries/hu.dictionary.itop.core.php +++ b/dictionaries/hu.dictionary.itop.core.php @@ -323,6 +323,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( 'Core:AttributeObsolescenceFlag/Value:no' => 'No~~', 'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~', 'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~', + 'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~', + 'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~', '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 e1e1f78e1..808d17ba4 100644 --- a/dictionaries/it.dictionary.itop.core.php +++ b/dictionaries/it.dictionary.itop.core.php @@ -58,6 +58,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( 'Core:AttributeObsolescenceFlag/Value:no' => 'No~~', 'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~', 'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~', + 'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~', + 'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~', 'Core:AttributeString' => 'Stringa', 'Core:AttributeString+' => 'Stringa alfanumerica', diff --git a/dictionaries/ja.dictionary.itop.core.php b/dictionaries/ja.dictionary.itop.core.php index dc44c99b7..0f4b0f1a4 100644 --- a/dictionaries/ja.dictionary.itop.core.php +++ b/dictionaries/ja.dictionary.itop.core.php @@ -342,6 +342,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( 'Core:AttributeObsolescenceFlag/Value:no' => 'No~~', 'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~', 'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~', + 'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~', + 'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~', 'Core:AttributeString' => '文字列', 'Core:AttributeString+' => '文字列', 'Core:AttributeClass' => 'クラス', diff --git a/dictionaries/nl.dictionary.itop.core.php b/dictionaries/nl.dictionary.itop.core.php index 7a45f5871..d4f76712e 100644 --- a/dictionaries/nl.dictionary.itop.core.php +++ b/dictionaries/nl.dictionary.itop.core.php @@ -69,6 +69,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'Core:AttributeObsolescenceFlag/Value:no' => 'No~~', 'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~', 'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~', + 'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~', + 'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~', '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 a2b20031b..1475e55e7 100644 --- a/dictionaries/pt_br.dictionary.itop.core.php +++ b/dictionaries/pt_br.dictionary.itop.core.php @@ -64,6 +64,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'Core:AttributeObsolescenceFlag/Value:no' => 'No~~', 'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~', 'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~', + 'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~', + 'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~', '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 b61a60d79..26852e94f 100644 --- a/dictionaries/ru.dictionary.itop.core.php +++ b/dictionaries/ru.dictionary.itop.core.php @@ -50,6 +50,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'Core:AttributeObsolescenceFlag/Value:no' => 'No~~', 'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~', 'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~', + 'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~', + 'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~', 'Core:AttributeString' => 'Строка', 'Core:AttributeString+' => 'Alphanumeric string', diff --git a/dictionaries/tr.dictionary.itop.core.php b/dictionaries/tr.dictionary.itop.core.php index e8b2ecc04..2a6912e46 100644 --- a/dictionaries/tr.dictionary.itop.core.php +++ b/dictionaries/tr.dictionary.itop.core.php @@ -430,6 +430,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array( 'Core:AttributeObsolescenceFlag/Value:no' => 'No~~', 'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~', 'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~', + 'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~', + 'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~', '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 5f54a3942..3ccff12d7 100644 --- a/dictionaries/zh.dictionary.itop.core.php +++ b/dictionaries/zh.dictionary.itop.core.php @@ -429,6 +429,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Core:AttributeObsolescenceFlag/Value:no' => 'No~~', 'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~', 'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~', + 'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~', + 'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~', 'Core:AttributeString' => 'String~~', 'Core:AttributeString+' => 'Alphanumeric string~~', 'Core:AttributeClass' => 'Class~~',