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

* [task#152208] fix bug for mr action lang.

Browse Source
This commit is contained in:
liyang
2025-11-10 10:55:56 +08:00
parent 758730838e
commit 6e8a296dda
5 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/lang/de.php
+7 -6
View File
@@ -28,12 +28,13 @@ $lang->mr->action = new stdclass();
$lang->mr->action->synced = '$date, <strong>$actor</strong> synced this Merge Request.';
$lang->mr->action->imported = '$date, <strong>$actor</strong> imported this Merge Request.';
$lang->mr->linkList = 'Link List of stories,Bugs,tasks';
$lang->mr->linkStory = 'Link Stories';
$lang->mr->linkBug = 'Link Bugs';
$lang->mr->linkTask = 'Link Tasks';
$lang->mr->unlink = 'UnLink of stories,Bugs,tasks';
$lang->mr->addReview = 'Add Review';
$lang->mr->linkList = 'Link List of stories,Bugs,tasks';
$lang->mr->linkStory = 'Link Stories';
$lang->mr->linkBug = 'Link Bugs';
$lang->mr->linkTask = 'Link Tasks';
$lang->mr->unlinkTask = 'Unlink Tasks';
$lang->mr->unlink = 'UnLink of stories,Bugs,tasks';
$lang->mr->addReview = 'Add Review';
$lang->mr->id = 'ID';
$lang->mr->mriid = "raw MR ID";
module/mr/lang/en.php
+7 -6
View File
@@ -28,12 +28,13 @@ $lang->mr->action = new stdclass();
$lang->mr->action->synced = '$date, <strong>$actor</strong> synced this Merge Request.';
$lang->mr->action->imported = '$date, <strong>$actor</strong> imported this Merge Request.';
$lang->mr->linkList = 'Link List of stories,Bugs,tasks';
$lang->mr->linkStory = 'Link Stories';
$lang->mr->linkBug = 'Link Bugs';
$lang->mr->linkTask = 'Link Tasks';
$lang->mr->unlink = 'UnLink of stories,Bugs,tasks';
$lang->mr->addReview = 'Add Review';
$lang->mr->linkList = 'Link List of stories,Bugs,tasks';
$lang->mr->linkStory = 'Link Stories';
$lang->mr->linkBug = 'Link Bugs';
$lang->mr->linkTask = 'Link Tasks';
$lang->mr->unlinkTask = 'Remove Tasks';
$lang->mr->unlink = 'UnLink of stories,Bugs,tasks';
$lang->mr->addReview = 'Add Review';
$lang->mr->id = 'ID';
$lang->mr->mriid = "raw MR ID";
module/mr/lang/fr.php
+7 -6
View File
@@ -28,12 +28,13 @@ $lang->mr->action = new stdclass();
$lang->mr->action->synced = '$date, <strong>$actor</strong> synced this Merge Request.';
$lang->mr->action->imported = '$date, <strong>$actor</strong> imported this Merge Request.';
$lang->mr->linkList = 'Link List of stories,Bugs,tasks';
$lang->mr->linkStory = 'Link Stories';
$lang->mr->linkBug = 'Link Bugs';
$lang->mr->linkTask = 'Link Tasks';
$lang->mr->unlink = 'UnLink of stories,Bugs,tasks';
$lang->mr->addReview = 'Add Review';
$lang->mr->linkList = 'Link List of stories,Bugs,tasks';
$lang->mr->linkStory = 'Link Stories';
$lang->mr->linkBug = 'Link Bugs';
$lang->mr->linkTask = 'Link Tasks';
$lang->mr->unlinkTask = 'Unlink Task';
$lang->mr->unlink = 'UnLink of stories,Bugs,tasks';
$lang->mr->addReview = 'Add Review';
$lang->mr->id = 'ID';
$lang->mr->mriid = "raw MR ID";
module/mr/lang/zh-cn.php
+7 -6
View File
@@ -28,12 +28,13 @@ $lang->mr->action = new stdclass();
$lang->mr->action->synced = '$date, 由 <strong>$actor</strong> 同步了合并请求。';
$lang->mr->action->imported = '$date, 由 <strong>$actor</strong> 导入了合并请求。';
$lang->mr->linkList = '浏览关联需求、Bug、任务';
$lang->mr->linkStory = '关联需求';
$lang->mr->linkBug = '关联Bug';
$lang->mr->linkTask = '关联任务';
$lang->mr->unlink = '取消关联需求、Bug、任务';
$lang->mr->addReview = '添加评审';
$lang->mr->linkList = '浏览关联需求、Bug、任务';
$lang->mr->linkStory = '关联需求';
$lang->mr->linkBug = '关联Bug';
$lang->mr->linkTask = '关联任务';
$lang->mr->unlinkTask = '移除任务';
$lang->mr->unlink = '取消关联需求、Bug、任务';
$lang->mr->addReview = '添加评审';
$lang->mr->id = 'ID';
$lang->mr->mriid = "MR原始ID";
module/mr/ui/link.html.php
+2
View File
@@ -54,6 +54,7 @@ $bugCols['resolvedBuild']['map'] = $builds;
$bugCols['actions'] = $actionMenu;
$bugCols['actions']['list']['unlink']['data-confirm'] = $lang->productplan->confirmUnlinkBug;
$bugCols['actions']['list']['unlink']['url'] = $this->createLink($moduleName, 'unlink', "MRID=$MR->id&type=bug&linkID={id}&confirm=yes");
$bugCols['actions']['list']['unlink']['hint'] = $lang->productplan->unlinkBug;
$bugCols['id']['checkbox'] = false;
$bugCols['title']['data-toggle'] = 'modal';
@@ -67,6 +68,7 @@ $taskCols['assignedTo']['currentUser'] = $app->user->account;
$taskCols['actions'] = $actionMenu;
$taskCols['actions']['list']['unlink']['data-confirm'] = $lang->mr->confirmUnlinkTask;
$taskCols['actions']['list']['unlink']['url'] = $this->createLink($moduleName, 'unlink', "MRID=$MR->id&type=task&linkID={id}&confirm=yes");
$taskCols['actions']['list']['unlink']['hint'] = $lang->mr->unlinkTask;
$tasks = initTableData($tasks, $taskCols);