Translate subtask status on demand

Fixes #4476
This commit is contained in:
Jack Williams
2022-07-12 13:45:06 +10:00
committed by GitHub
parent 6308ac41cd
commit c53bee4a08
5 changed files with 8 additions and 8 deletions

View File

@@ -24,8 +24,8 @@ class SubtaskRestrictionController extends BaseController
$this->response->html($this->template->render('subtask_restriction/show', array( $this->response->html($this->template->render('subtask_restriction/show', array(
'status_list' => array( 'status_list' => array(
SubtaskModel::STATUS_TODO => t('Todo'), SubtaskModel::STATUS_TODO => 'Todo',
SubtaskModel::STATUS_DONE => t('Done'), SubtaskModel::STATUS_DONE => 'Done',
), ),
'subtask_inprogress' => $this->subtaskStatusModel->getSubtaskInProgress($this->userSession->getId()), 'subtask_inprogress' => $this->subtaskStatusModel->getSubtaskInProgress($this->userSession->getId()),
'subtask' => $subtask, 'subtask' => $subtask,

View File

@@ -77,7 +77,7 @@ class SubtaskExport extends Base
$values = array(); $values = array();
$values[] = $subtask['id']; $values[] = $subtask['id'];
$values[] = $subtask['title']; $values[] = $subtask['title'];
$values[] = $this->subtask_status[$subtask['status']]; $values[] = t($this->subtask_status[$subtask['status']]);
$values[] = $subtask['assignee_name'] ?: $subtask['assignee_username']; $values[] = $subtask['assignee_name'] ?: $subtask['assignee_username'];
$values[] = $subtask['time_estimated']; $values[] = $subtask['time_estimated'];
$values[] = $subtask['time_spent']; $values[] = $subtask['time_spent'];

View File

@@ -64,9 +64,9 @@ class SubtaskModel extends Base
public function getStatusList() public function getStatusList()
{ {
return array( return array(
self::STATUS_TODO => t('Todo'), self::STATUS_TODO => 'Todo',
self::STATUS_INPROGRESS => t('In progress'), self::STATUS_INPROGRESS => 'In progress',
self::STATUS_DONE => t('Done'), self::STATUS_DONE => 'Done',
); );
} }

View File

@@ -10,7 +10,7 @@
<ul> <ul>
<li> <li>
<?= $this->text->e($subtask['title']) ?> (<strong><?= $this->text->e($subtask['status_name']) ?></strong>) <?= $this->text->e($subtask['title']) ?> (<strong><?= t($subtask['status_name']) ?></strong>)
</li> </li>
<li> <li>
<?php if ($subtask['username']): ?> <?php if ($subtask['username']): ?>

View File

@@ -10,7 +10,7 @@
<ul> <ul>
<li> <li>
<?= $this->text->e($subtask['title']) ?> (<strong><?= $this->text->e($subtask['status_name']) ?></strong>) <?= $this->text->e($subtask['title']) ?> (<strong><?= t($subtask['status_name']) ?></strong>)
</li> </li>
<li> <li>
<?php if ($subtask['username']): ?> <?php if ($subtask['username']): ?>