From 457842d17f4426f122bd9792b121d17884b3681c Mon Sep 17 00:00:00 2001 From: gloas <gloas@afi-sa.fr> Date: Thu, 3 May 2018 17:25:44 +0200 Subject: [PATCH] dev #74865 translate status --- library/Class/Album.php | 8 +++----- library/Class/Article.php | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/library/Class/Album.php b/library/Class/Album.php index 478a6d49f4b..10c2366f79c 100644 --- a/library/Class/Album.php +++ b/library/Class/Album.php @@ -151,10 +151,6 @@ class Class_Album extends Storm_Model_Abstract { protected $path_flash; - protected static $_knownStatus = - [self::STATUS_DRAFT => 'Brouillon', - self::STATUS_VALIDATED => 'Validé']; - public function __construct() { parent::__construct(); @@ -213,7 +209,9 @@ class Class_Album extends Storm_Model_Abstract { * @return array */ public static function getKnownStatus() { - return self::$_knownStatus; + $album = new Class_Album; + return [self::STATUS_DRAFT => $album->_('Brouillon'), + self::STATUS_VALIDATED => $album->_('Validé')]; } diff --git a/library/Class/Article.php b/library/Class/Article.php index 83eca94d958..6ab6b58392f 100644 --- a/library/Class/Article.php +++ b/library/Class/Article.php @@ -500,6 +500,7 @@ class ArticleLoader extends Storm_Model_Loader { class Class_Article extends Storm_Model_Abstract { use + Trait_Translator, Trait_TreeViewableItem, Trait_Indexable, Trait_HasManyDomaines, @@ -519,16 +520,6 @@ class Class_Article extends Storm_Model_Abstract { public $old_status = null; - /** - * @var array - */ - protected static $_knownStatus = - [self::STATUS_DRAFT => 'Brouillon', - self::STATUS_VALIDATION_PENDING => 'À valider', - self::STATUS_VALIDATED => 'Validé', - self::STATUS_REFUSED => 'Refusé', - self::STATUS_ARCHIVED => 'Archivé']; - protected $_loader_class = 'ArticleLoader'; protected $_table_name = 'cms_article'; protected $_table_primary = 'ID_ARTICLE'; @@ -1234,8 +1225,17 @@ class Class_Article extends Storm_Model_Abstract { * @return array */ public static function getKnownStatus($default = '') { - $statuses = $default ? [ 0 => $default ] : []; - foreach (self::$_knownStatus as $k => $v) { + $statuses = $default + ? [ 0 => $default ] + : []; + $article = new Class_Article; + $default_statuses = [self::STATUS_DRAFT => $article->_('Brouillon'), + self::STATUS_VALIDATION_PENDING => $article->_('À valider'), + self::STATUS_VALIDATED => $article->_('Validé'), + self::STATUS_REFUSED => $article->_('Refusé'), + self::STATUS_ARCHIVED => $article->_('Archivé')]; + + foreach ($default_statuses as $k => $v) { if (self::STATUS_VALIDATED == $k) self::_addDynamicStatuses($statuses); $statuses[$k] = $v; -- GitLab