Commit 2344c651 authored by Ana Júlia Gomes Przsiczny's avatar Ana Júlia Gomes Przsiczny Committed by Tim Rohaly
Browse files

Issue #3124369 by sanjayk, Pooja Ganjage, anagomes, Deepak Goyal,... 

Issue #3124369 by sanjayk, Pooja Ganjage, anagomes, Deepak Goyal, swatichouhan012, TR, Berdir: t() calls should be avoided in classes, use \Drupal\Core\StringTranslation\StringTranslationTrait and $this->t() instead
parent b0b8b763

src/EntityViewsData.php

+2 −2
Changes for src/EntityViewsData.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -204,8 +204,8 @@ class EntityViewsData extends CoreEntityViewsData { 
      $label = $field_definition->getLabel();



      $table_data['delta'] = [

        'title' => t('@label (@name:delta)', ['@label' => $label, '@name' => $field_name]),

        'title short' => t('@label:delta', ['@label' => $label]),

        'title' => $this->t('@label (@name:delta)', ['@label' => $label, '@name' => $field_name]),

        'title short' => $this->t('@label:delta', ['@label' => $label]),

      ];

      $table_data['delta']['field'] = [

        'id' => 'numeric',

src/Form/RevisionRevertForm.php

+2 −2
Changes for src/Form/RevisionRevertForm.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -119,14 +119,14 @@ class RevisionRevertForm extends ConfirmFormBase { 
      $original_revision_timestamp = $this->revision->getRevisionCreationTime();



      $this->revision->setRevisionLogMessage($this->t('Copy of the revision from %date.', ['%date' => $this->dateFormatter->format($original_revision_timestamp)]));

      $this->messenger()->addStatus(t('@type %title has been reverted to the revision from %revision-date.', [

      $this->messenger()->addStatus($this->t('@type %title has been reverted to the revision from %revision-date.', [

        '@type' => $this->getBundleLabel($this->revision),

        '%title' => $this->revision->label(),

        '%revision-date' => $this->dateFormatter->format($original_revision_timestamp),

      ]));

    }

    else {

      $this->messenger()->addStatus(t('@type %title has been reverted', [

      $this->messenger()->addStatus($this->t('@type %title has been reverted', [

        '@type' => $this->getBundleLabel($this->revision),

        '%title' => $this->revision->label(),

      ]));

src/Plugin/Action/Derivative/DeleteActionDeriver.php

+4 −1
Changes for src/Plugin/Action/Derivative/DeleteActionDeriver.php: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface; 
use Drupal\Core\Entity\EntityTypeInterface;

use Drupal\Core\Entity\EntityTypeManagerInterface;

use Symfony\Component\DependencyInjection\ContainerInterface;

use Drupal\Core\StringTranslation\StringTranslationTrait;



/**

 * Provides a delete action for each content entity type.
@@ -15,6 +16,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface; 
 */

class DeleteActionDeriver extends DeriverBase implements ContainerDeriverInterface {



  use StringTranslationTrait;



  /**

   * The entity type manager.

   *
@@ -47,7 +50,7 @@ class DeleteActionDeriver extends DeriverBase implements ContainerDeriverInterfa 
      $definitions = [];

      foreach ($this->getParticipatingEntityTypes() as $entity_type_id => $entity_type) {

        $definition = $base_plugin_definition;

        $definition['label'] = t('Delete @entity_type (Deprecated)', ['@entity_type' => $entity_type->getSingularLabel()]);

        $definition['label'] = $this->t('Delete @entity_type (Deprecated)', ['@entity_type' => $entity_type->getSingularLabel()]);

        $definition['type'] = $entity_type_id;

        $definition['confirm_form_route_name'] = 'entity.' . $entity_type_id . '.delete_multiple_form';

        $definitions[$entity_type_id] = $definition;

tests/modules/entity_module_bundle_plugin_examples_test/src/Plugin/BundlePluginTest/Second.php

+1 −1
Changes for tests/modules/entity_module_bundle_plugin_examples_test/src/Plugin/BundlePluginTest/Second.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ class Second extends PluginBase implements BundlePluginTestInterface { 
  public function buildFieldDefinitions() {

    $fields = [];

    $fields['second_mail'] = BundleFieldDefinition::create('email')

      ->setLabel(t('Email'))

      ->setLabel($this->t('Email'))

      ->setRequired(TRUE);



    return $fields;

tests/modules/entity_module_bundle_plugin_test/src/Plugin/BundlePluginTest/First.php

+1 −1
Changes for tests/modules/entity_module_bundle_plugin_test/src/Plugin/BundlePluginTest/First.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ class First extends PluginBase implements BundlePluginTestInterface { 
  public function buildFieldDefinitions() {

    $fields = [];

    $fields['first_mail'] = BundleFieldDefinition::create('email')

      ->setLabel(t('Email'))

      ->setLabel($this->t('Email'))

      ->setRequired(TRUE);



    return $fields;