t() calls should be avoided in classes, use \Drupal\Core\StringTranslation\StringTranslationTrait and $this->t() instead

I have reviewed above patch and it's working fine but still need to replace t() with $this->t() in some files. I have created a patch for that.

+++ b/tests/modules/entity_module_test/entity_module_test.module
@@ -4,12 +4,12 @@
  */
 function entity_module_test_entity_bundle_info() {
-  $bundles['entity_test_enhanced']['default']['label'] = t('Default');
-  $bundles['entity_test_enhanced']['first']['label'] = t('First');
-  $bundles['entity_test_enhanced']['second']['label'] = t('Second');
-  $bundles['entity_test_enhanced_with_owner']['default']['label'] = t('Default');
-  $bundles['entity_test_enhanced_with_owner']['first']['label'] = t('First');
-  $bundles['entity_test_enhanced_with_owner']['second']['label'] = t('Second');
+  $bundles['entity_test_enhanced']['default']['label'] = $this->t('Default');
+  $bundles['entity_test_enhanced']['first']['label'] = $this->t('First');
+  $bundles['entity_test_enhanced']['second']['label'] = $this->t('Second');
+  $bundles['entity_test_enhanced_with_owner']['default']['label'] = $this->t('Default');

this is not a class.

Hi, @Berdir
Updated patch please review.

Hi,

I am applying patch with using \Drupal\Core\StringTranslation\StringTranslationTrait class.

Please review once.

The patch doesn't apply.

1. +++ b/modules/contrib/entity/src/Form/RevisionRevertForm.php
   @@ -41,10 +52,14 @@ class RevisionRevertForm extends ConfirmFormBase {
       */
   -  public function __construct(DateFormatterInterface $date_formatter, EntityTypeBundleInfoInterface $bundle_information) {
   +  ¶
   +  public function __construct(DateFormatterInterface $date_formatter, EntityTypeBundleInfoInterface $bundle_information, TranslationInterface $string_translation) {
        $this->dateFormatter = $date_formatter;
        $this->bundleInformation = $bundle_information;
   +    $this->stringTranslation = $string_translation;
   

   this seems to add an extra empty line with spaces.

2. +++ b/modules/contrib/entity/src/UncacheableEntityPermissionProvider.php
   @@ -42,6 +45,35 @@
   +      $container->get('string_translation')
   +    );
   +  }
   +  ¶
      /**
   

   here too.

   changes to this class seem to be unecessary/out of scope, it already has the StringTranslationTrait from the parent class.

   Injecting the service is optional and core isn't doing it most of the time, the trait offers a setter that could be used for unit testing if really necessary.

Hi,

Attached updated patch.

Kindly review this patch once.

Thanks.

@Pooja Ganjage have same issues "No such file or directory" in both #8 and #12 please fixed it.

Hi,

Attached updated patch.

Kindly review once.

Let me know for any correction.

Thanks.

Needs Review

@Pooja still two files are not found please follow the instruction here under "More Git Commands" https://www.drupal.org/node/707484 and add files in patch.

Uploading correct patch.

Sorry by mistake uploaded wrong patch

@Berdir by mistake added test for D9.1 but test cases pass for D8.

Please ignore #21 attached interdiff.

This is getting further and further away from where it should be.

Both EntityViewsData and ConfirmFormBase already have StringTranslationTrait, so that is inherited by the Entity classes. All you have to do is use $this->t() instead of t().

The patch in #2 is essentially correct. There may be a few other places that should use $this->t(), but subsequent patches added out-of-scope changes and shadowed properties and methods by overriding the inherited properties and methods of the parent classes. You can inject string_translation or not (it's not technically wrong but there's really no reason to do it), however you shouldn't be shadowing the parent properties and methods. @Berdir already said this in #10.

I'm uploading a patch based on the one in #2, with some small changes, which I believe are in the scope of this issue and solves the problem. Running phpcs, there are no warnings about this matter anyway.

Uploading a new patch with small corrections, since the last one didn't pass the tests.

Note that the Entity API currently has 14 failing tests - any patch you submit will be "Waiting for branch to pass" until you click through and select "Don't wait". I have done that now to get your patch tested.

Best case, you should have 14 failing tests.

The patch looks pretty good to me. Let's see what happens with the tests.

Core Entity API tests have now been fixed. I retested the patch in #28 and as you can see there are no problems with it.

Committed #28. Thanks for working on this.