Skip to content
Snippets Groups Projects
Commit 0e8cb7ed authored by Ankitha Shetty's avatar Ankitha Shetty Committed by Oleh Vehera
Browse files

Issue #3145600 by ankithashetty, mrinalini9, voleger: t() calls should be...

Issue #3145600 by ankithashetty, mrinalini9, voleger: t() calls should be avoided in classes, use \Drupal\Core\StringTranslation\StringTranslationTrait and $this->t() instead
parent c4d7d6ed
Branches
Tags
No related merge requests found
...@@ -79,7 +79,7 @@ class ConfirmClearForm extends ConfirmFormBase { ...@@ -79,7 +79,7 @@ class ConfirmClearForm extends ConfirmFormBase {
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getDescription() { public function getDescription() {
return t('All items in each queue will be deleted, regardless of if leases exist. This operation cannot be undone.'); return $this->t('All items in each queue will be deleted, regardless of if leases exist. This operation cannot be undone.');
} }
/** /**
......
...@@ -56,14 +56,14 @@ class ConfirmItemDeleteForm extends ConfirmFormBase { ...@@ -56,14 +56,14 @@ class ConfirmItemDeleteForm extends ConfirmFormBase {
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getQuestion() { public function getQuestion() {
return t('Are you sure you want to delete queue item %queue_item?', ['%queue_item' => $this->queue_item]); return $this->t('Are you sure you want to delete queue item %queue_item?', ['%queue_item' => $this->queue_item]);
} }
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getDescription() { public function getDescription() {
return t('This action cannot be undone and will force the deletion of the item even if it is currently being processed.'); return $this->t('This action cannot be undone and will force the deletion of the item even if it is currently being processed.');
} }
/** /**
......
...@@ -56,14 +56,14 @@ class ConfirmItemReleaseForm extends ConfirmFormBase { ...@@ -56,14 +56,14 @@ class ConfirmItemReleaseForm extends ConfirmFormBase {
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getQuestion() { public function getQuestion() {
return t('Are you sure you want to release queue item %queue_item?', ['%queue_item' => $this->queue_item]); return $this->t('Are you sure you want to release queue item %queue_item?', ['%queue_item' => $this->queue_item]);
} }
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getDescription() { public function getDescription() {
return t('This action cannot be undone and will force the release of the item even if it is currently being processed.'); return $this->t('This action cannot be undone and will force the release of the item even if it is currently being processed.');
} }
/** /**
......
...@@ -78,10 +78,10 @@ class InspectForm extends FormBase { ...@@ -78,10 +78,10 @@ class InspectForm extends FormBase {
'table' => [ 'table' => [
'#type' => 'table', '#type' => 'table',
'#header' => [ '#header' => [
'id' => t('Item ID'), 'id' => $this->t('Item ID'),
'expires' => t('Expires'), 'expires' => $this->t('Expires'),
'created' => t('Created'), 'created' => $this->t('Created'),
'operations' => t('Operations'), 'operations' => $this->t('Operations'),
], ],
'#rows' => $rows '#rows' => $rows
], ],
......
...@@ -65,31 +65,31 @@ class ItemDetailForm extends FormBase { ...@@ -65,31 +65,31 @@ class ItemDetailForm extends FormBase {
$rows = [ $rows = [
'id' => [ 'id' => [
'data' => [ 'data' => [
'header' => t('Item ID'), 'header' => $this->t('Item ID'),
'data' => $queue_item->item_id, 'data' => $queue_item->item_id,
], ],
], ],
'queue_name' => [ 'queue_name' => [
'data' => [ 'data' => [
'header' => t('Queue name'), 'header' => $this->t('Queue name'),
'data' => $queue_item->name, 'data' => $queue_item->name,
], ],
], ],
'expire' => [ 'expire' => [
'data' => [ 'data' => [
'header' => t('Expire'), 'header' => $this->t('Expire'),
'data' => ($queue_item->expire ? date(DATE_RSS, $queue_item->expire) : $queue_item->expire), 'data' => ($queue_item->expire ? date(DATE_RSS, $queue_item->expire) : $queue_item->expire),
] ]
], ],
'created' => [ 'created' => [
'data' => [ 'data' => [
'header' => t('Created'), 'header' => $this->t('Created'),
'data' => date(DATE_RSS, $queue_item->created), 'data' => date(DATE_RSS, $queue_item->created),
], ],
], ],
'data' => [ 'data' => [
'data' => [ 'data' => [
'header' => ['data' => t('Data'), 'style' => 'vertical-align:top'], 'header' => ['data' => $this->t('Data'), 'style' => 'vertical-align:top'],
'data' => $data, 'data' => $data,
], ],
], ],
......
...@@ -132,11 +132,11 @@ class OverviewForm extends FormBase { ...@@ -132,11 +132,11 @@ class OverviewForm extends FormBase {
$form['top'] = [ $form['top'] = [
'operation' => [ 'operation' => [
'#type' => 'select', '#type' => 'select',
'#title' => t('Action'), '#title' => $this->t('Action'),
'#options' => [ '#options' => [
'submitBatch' => t('Batch process'), 'submitBatch' => $this->t('Batch process'),
'submitRelease' => t('Remove leases'), 'submitRelease' => $this->t('Remove leases'),
'submitClear' => t('Clear'), 'submitClear' => $this->t('Clear'),
], ],
], ],
'actions' => [ 'actions' => [
...@@ -148,7 +148,7 @@ class OverviewForm extends FormBase { ...@@ -148,7 +148,7 @@ class OverviewForm extends FormBase {
'#type' => 'submit', '#type' => 'submit',
'#tableselect' => TRUE, '#tableselect' => TRUE,
'#submit' => ['::submitBulkForm'], '#submit' => ['::submitBulkForm'],
'#value' => t('Apply to selected items'), '#value' => $this->t('Apply to selected items'),
], ],
], ],
]; ];
...@@ -157,13 +157,13 @@ class OverviewForm extends FormBase { ...@@ -157,13 +157,13 @@ class OverviewForm extends FormBase {
'#type' => 'table', '#type' => 'table',
'#tableselect' => TRUE, '#tableselect' => TRUE,
'#header' => [ '#header' => [
'title' => t('Title'), 'title' => $this->t('Title'),
'items' => t('Number of items'), 'items' => $this->t('Number of items'),
'class' => t('Class'), 'class' => $this->t('Class'),
'cron' => t('Cron time limit (seconds)'), 'cron' => $this->t('Cron time limit (seconds)'),
'operations' => t('Operations'), 'operations' => $this->t('Operations'),
], ],
'#empty' => t('No queues defined'), '#empty' => $this->t('No queues defined'),
]; ];
$queue_order_installed = $this->moduleHandler->moduleExists('queue_order'); $queue_order_installed = $this->moduleHandler->moduleExists('queue_order');
...@@ -193,7 +193,7 @@ class OverviewForm extends FormBase { ...@@ -193,7 +193,7 @@ class OverviewForm extends FormBase {
// If queue inspection is enabled for this implementation. // If queue inspection is enabled for this implementation.
if ($queue_ui = $this->queueUIManager->fromQueueName($name)) { if ($queue_ui = $this->queueUIManager->fromQueueName($name)) {
$operations['inspect'] = [ $operations['inspect'] = [
'title' => t('Inspect'), 'title' => $this->t('Inspect'),
'url' => Url::fromRoute('queue_ui.inspect', ['queue_name' => $name]), 'url' => Url::fromRoute('queue_ui.inspect', ['queue_name' => $name]),
]; ];
} }
...@@ -210,9 +210,9 @@ class OverviewForm extends FormBase { ...@@ -210,9 +210,9 @@ class OverviewForm extends FormBase {
], ],
'cron' => [ 'cron' => [
'#type' => 'number', '#type' => 'number',
'#title' => t('Cron Time'), '#title' => $this->t('Cron Time'),
'#title_display' => 'hidden', '#title_display' => 'hidden',
'#placeholder' => t('Cron disabled'), '#placeholder' => $this->t('Cron disabled'),
'#value' => (isset($queue_definition['cron']['time']) ? $queue_definition['cron']['time'] : ''), '#value' => (isset($queue_definition['cron']['time']) ? $queue_definition['cron']['time'] : ''),
'#parents' => [], '#parents' => [],
'#name' => 'cron[' . $name . ']', '#name' => 'cron[' . $name . ']',
...@@ -230,7 +230,7 @@ class OverviewForm extends FormBase { ...@@ -230,7 +230,7 @@ class OverviewForm extends FormBase {
$row['#weight'] = $weight; $row['#weight'] = $weight;
$row['weight'] = [ $row['weight'] = [
'#type' => 'weight', '#type' => 'weight',
'#title' => t('Weight for @title', ['@title' => $name]), '#title' => $this->t('Weight for @title', ['@title' => $name]),
'#title_display' => 'invisible', '#title_display' => 'invisible',
'#default_value' => $weight, '#default_value' => $weight,
'#name' => 'weight[' . $name . ']', '#name' => 'weight[' . $name . ']',
...@@ -256,11 +256,11 @@ class OverviewForm extends FormBase { ...@@ -256,11 +256,11 @@ class OverviewForm extends FormBase {
'#type' => 'submit', '#type' => 'submit',
'#tableselect' => TRUE, '#tableselect' => TRUE,
'#submit' => ['::submitBulkForm'], '#submit' => ['::submitBulkForm'],
'#value' => t('Apply to selected items'), '#value' => $this->t('Apply to selected items'),
], ],
'save' => [ 'save' => [
'#type' => 'submit', '#type' => 'submit',
'#value' => t('Save changes'), '#value' => $this->t('Save changes'),
], ],
], ],
]; ];
...@@ -345,7 +345,7 @@ class OverviewForm extends FormBase { ...@@ -345,7 +345,7 @@ class OverviewForm extends FormBase {
if ($queue_ui = $this->queueUIManager->fromQueueName($queue_name)) { if ($queue_ui = $this->queueUIManager->fromQueueName($queue_name)) {
$num_updated = $queue_ui->releaseItems($queue_name); $num_updated = $queue_ui->releaseItems($queue_name);
$this->messenger->addMessage(t('@count lease reset in queue @name', [ $this->messenger->addMessage($this->t('@count lease reset in queue @name', [
'@count' => $num_updated, '@count' => $num_updated,
'@name' => $queue_name '@name' => $queue_name
])); ]));
......
...@@ -4,6 +4,7 @@ namespace Drupal\queue_ui\Plugin\QueueUI; ...@@ -4,6 +4,7 @@ namespace Drupal\queue_ui\Plugin\QueueUI;
use Drupal\Core\Database\Connection; use Drupal\Core\Database\Connection;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\StringTranslation\StringTranslationTrait;
use Drupal\queue_ui\QueueUIBase; use Drupal\queue_ui\QueueUIBase;
use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\ContainerInterface;
...@@ -16,6 +17,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; ...@@ -16,6 +17,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
* ) * )
*/ */
class DatabaseQueue extends QueueUIBase implements ContainerFactoryPluginInterface { class DatabaseQueue extends QueueUIBase implements ContainerFactoryPluginInterface {
use StringTranslationTrait;
/** /**
* @var \Drupal\Core\Database\Database * @var \Drupal\Core\Database\Database
...@@ -60,9 +62,9 @@ class DatabaseQueue extends QueueUIBase implements ContainerFactoryPluginInterfa ...@@ -60,9 +62,9 @@ class DatabaseQueue extends QueueUIBase implements ContainerFactoryPluginInterfa
*/ */
public function getOperations() { public function getOperations() {
return [ return [
'view' => t('View'), 'view' => $this->t('View'),
'release' => t('Release'), 'release' => $this->t('Release'),
'delete' => t('Delete'), 'delete' => $this->t('Delete'),
]; ];
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment