Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug#46269.

Browse Source
This commit is contained in:
xieqiyu
2024-03-29 10:18:09 +08:00
parent 9aac06d4e8
commit b341c66bc5
7 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/control.php
+4 -4
View File
@@ -904,8 +904,8 @@ class story extends control
continue;
}
if($story->parent == -1) $skippedStory[] = $story->id;
if($story->status == 'closed') $closedStory[] = $story->id;
if($story->parent == -1) $skippedStory[] = '#' . $story->id;
if($story->status == 'closed') $closedStory[] = '#' . $story->id;
if($story->parent == -1 || $story->status == 'closed') unset($stories[$story->id]);
if(!empty($story->twins))
@@ -922,8 +922,8 @@ class story extends control
if($storyCount == count($closedStory)) return $this->send(array('result' => 'fail', 'load' => array('alert' => $this->lang->story->notice->closed, 'locate' => $this->session->storyList)));
$errorTips = '';
if($closedStory) $errorTips .= sprintf($this->lang->story->closedStory, implode(',', $closedStory));
if($skippedStory) $errorTips .= sprintf($this->lang->story->skipStory, implode(',', $skippedStory));
if($closedStory) $errorTips .= sprintf($this->lang->story->closedStory, implode(' ', $closedStory));
if($skippedStory) $errorTips .= sprintf($this->lang->story->skipStory, implode(' ', $skippedStory));
$this->view->productID = $productID;
$this->view->stories = $stories;
module/story/lang/de.php
+2 -2
View File
@@ -96,8 +96,8 @@ $lang->story->deleteAction = "Delete Story";
$lang->story->exportAction = "Export Story";
$lang->story->reportAction = "Story Report";
$lang->story->skipStory = '%s is a parent story. It cannot be closed.';
$lang->story->closedStory = 'Story %s is closed and will not be closed.';
$lang->story->skipStory = "{$lang->SRCommon} %s is parent stories, and this operation has been filtered.";
$lang->story->closedStory = "{$lang->SRCommon} %s is closed, and this operation has been filtered.";
$lang->story->batchToTaskTips = "Only active {$lang->SRCommon} can be converted into tasks.";
$lang->story->successToTask = "Converted to task.";
$lang->story->storyRound = '%s time estimation';
module/story/lang/en.php
+2 -2
View File
@@ -96,8 +96,8 @@ $lang->story->deleteAction = "Delete {$lang->SRCommon}";
$lang->story->exportAction = "Export {$lang->SRCommon}";
$lang->story->reportAction = "Report";
$lang->story->skipStory = '%s is a parent story. It cannot be closed.';
$lang->story->closedStory = 'Story %s is closed and will not be closed.';
$lang->story->skipStory = "{$lang->SRCommon} %s is parent stories, and this operation has been filtered.";
$lang->story->closedStory = "{$lang->SRCommon} %s is closed, and this operation has been filtered.";
$lang->story->batchToTaskTips = "Only active {$lang->SRCommon} can be converted into tasks.";
$lang->story->successToTask = "Converted to task.";
$lang->story->storyRound = '%s time estimation';
module/story/lang/fr.php
+2 -2
View File
@@ -96,8 +96,8 @@ $lang->story->deleteAction = "Supprimer Story";
$lang->story->exportAction = "Exporter Story";
$lang->story->reportAction = "Rapport de Story";
$lang->story->skipStory = '%s is a parent story. It cannot be closed.';
$lang->story->closedStory = 'Story %s is closed and will not be closed.';
$lang->story->skipStory = "{$lang->SRCommon} %s is parent stories, and this operation has been filtered.";
$lang->story->closedStory = "{$lang->SRCommon} %s is closed, and this operation has been filtered.";
$lang->story->batchToTaskTips = "Only active {$lang->SRCommon} can be converted into tasks.";
$lang->story->successToTask = "Converted to task.";
$lang->story->storyRound = '%s time estimation';
module/story/lang/vi.php
+2 -2
View File
@@ -86,8 +86,8 @@ $lang->story->deleteAction = "Delete {$lang->SRCommon}";
$lang->story->exportAction = "Export {$lang->SRCommon}";
$lang->story->reportAction = "Report";
$lang->story->skipStory = '%s is a parent story. It cannot be closed.';
$lang->story->closedStory = 'Story %s is closed and will not be closed.';
$lang->story->skipStory = "{$lang->SRCommon} %s is parent stories, and this operation has been filtered.";
$lang->story->closedStory = "{$lang->SRCommon} %s is closed, and this operation has been filtered.";
$lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->SRCommon} and link {$lang->SRCommon} to the task. The closed {$lang->SRCommon} will not be converted into tasks.";
$lang->story->successToTask = "Converted to task.";
$lang->story->storyRound = '%s time estimation';
module/story/lang/zh-cn.php
+2 -2
View File
@@ -96,8 +96,8 @@ $lang->story->deleteAction = "删除{$lang->SRCommon}";
$lang->story->exportAction = "导出{$lang->SRCommon}";
$lang->story->reportAction = "统计报表";
$lang->story->skipStory = '需求：%s 为父需求，将不会被关闭。';
$lang->story->closedStory = '需求：%s 已关闭，将不会被关闭。';
$lang->story->skipStory = "{$lang->SRCommon} %s 为父需求，本次操作已被过滤。";
$lang->story->closedStory = "{$lang->SRCommon} %s 已关闭，本次操作已被过滤。";
$lang->story->batchToTaskTips = "只有激活状态的{$lang->SRCommon}才能转为任务。";
$lang->story->successToTask = '批量转任务成功';
$lang->story->storyRound = '第 %s 轮估算';
module/story/model.php
+2
View File
@@ -3761,6 +3761,8 @@ class storyModel extends model
$storyLang->notice->closed = str_replace($SRCommon, $URCommon, $storyLang->notice->closed);
$storyLang->notice->reviewerNotEmpty = str_replace($SRCommon, $URCommon, $storyLang->notice->reviewerNotEmpty);
$storyLang->skipStory = str_replace($SRCommon, $URCommon, $storyLang->skipStory);
$storyLang->closedStory = str_replace($SRCommon, $URCommon, $storyLang->closedStory);
$storyLang->report->charts['storiesPerProduct'] = str_replace($SRCommon, $URCommon, $storyLang->report->charts['storiesPerProduct']);
$storyLang->report->charts['storiesPerModule'] = str_replace($SRCommon, $URCommon, $storyLang->report->charts['storiesPerModule']);