diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/AggregatorCategoryBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/AggregatorCategoryBlock.php index 05de0f1..fedabd4 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/AggregatorCategoryBlock.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/AggregatorCategoryBlock.php @@ -9,6 +9,7 @@ use Drupal\Core\Plugin\Discovery\ContainerDerivativeInterface; use Drupal\Core\Database\Connection; +use Drupal\Core\StringTranslation\Translator\TranslatorInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -33,16 +34,26 @@ class AggregatorCategoryBlock implements ContainerDerivativeInterface { protected $connection; /** + * The translation manager. + * + * @var \Drupal\Core\StringTranslation\Translator\TranslatorInterface + */ + protected $translationManager; + + /** * Constructs a AggregatorCategoryBlock object. * * @param string $base_plugin_id * The base plugin ID. * @param \Drupal\Core\Database\Connection $connection * The database connection. + * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager + * The translation manager. */ - public function __construct($base_plugin_id, Connection $connection) { + public function __construct($base_plugin_id, Connection $connection, TranslatorInterface $translation_manager) { $this->basePluginId = $base_plugin_id; $this->connection = $connection; + $this->translationManager = $translation_manager; } /** @@ -51,7 +62,8 @@ public function __construct($base_plugin_id, Connection $connection) { public static function create(ContainerInterface $container, $base_plugin_id) { return new static( $base_plugin_id, - $container->get('database') + $container->get('database'), + $container->get('string_translation') ); } @@ -65,7 +77,7 @@ public function getDerivativeDefinition($derivative_id, array $base_plugin_defin $result = $this->connection->query('SELECT cid, title FROM {aggregator_category} ORDER BY title WHERE cid = :cid', array(':cid' => $derivative_id))->fetchObject(); $this->derivatives[$derivative_id] = $base_plugin_definition; $this->derivatives[$derivative_id]['delta'] = $result->cid; - $this->derivatives[$derivative_id]['admin_label'] = t('@title category latest items', array('@title' => $result->title)); + $this->derivatives[$derivative_id]['admin_label'] = $this->translationManager->translate('@title category latest items', array('@title' => $result->title)); return $this->derivatives[$derivative_id]; } @@ -78,7 +90,7 @@ public function getDerivativeDefinitions(array $base_plugin_definition) { foreach ($result as $category) { $this->derivatives[$category->cid] = $base_plugin_definition; $this->derivatives[$category->cid]['delta'] = $category->cid; - $this->derivatives[$category->cid]['admin_label'] = t('@title category latest items', array('@title' => $category->title)); + $this->derivatives[$category->cid]['admin_label'] = $this->translationManager->translate('@title category latest items', array('@title' => $category->title)); } return $this->derivatives; }