From 6e8a296ddae5e4a265701d94facbcc82fa0fec65 Mon Sep 17 00:00:00 2001 From: liyang Date: Fri, 7 Nov 2025 17:14:41 +0800 Subject: [PATCH] * [task#152208] fix bug for mr action lang. --- module/mr/lang/de.php | 13 +++++++------ module/mr/lang/en.php | 13 +++++++------ module/mr/lang/fr.php | 13 +++++++------ module/mr/lang/zh-cn.php | 13 +++++++------ module/mr/ui/link.html.php | 2 ++ 5 files changed, 30 insertions(+), 24 deletions(-) diff --git a/module/mr/lang/de.php b/module/mr/lang/de.php index e9723002ae..19618b509f 100644 --- a/module/mr/lang/de.php +++ b/module/mr/lang/de.php @@ -28,12 +28,13 @@ $lang->mr->action = new stdclass(); $lang->mr->action->synced = '$date, $actor synced this Merge Request.'; $lang->mr->action->imported = '$date, $actor 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"; diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php index 4213c6311b..5ce50a11ce 100644 --- a/module/mr/lang/en.php +++ b/module/mr/lang/en.php @@ -28,12 +28,13 @@ $lang->mr->action = new stdclass(); $lang->mr->action->synced = '$date, $actor synced this Merge Request.'; $lang->mr->action->imported = '$date, $actor 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"; diff --git a/module/mr/lang/fr.php b/module/mr/lang/fr.php index a606d49b3e..e02cbea0ce 100644 --- a/module/mr/lang/fr.php +++ b/module/mr/lang/fr.php @@ -28,12 +28,13 @@ $lang->mr->action = new stdclass(); $lang->mr->action->synced = '$date, $actor synced this Merge Request.'; $lang->mr->action->imported = '$date, $actor 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"; diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php index 8cfe945908..0a562c7e89 100644 --- a/module/mr/lang/zh-cn.php +++ b/module/mr/lang/zh-cn.php @@ -28,12 +28,13 @@ $lang->mr->action = new stdclass(); $lang->mr->action->synced = '$date, 由 $actor 同步了合并请求。'; $lang->mr->action->imported = '$date, 由 $actor 导入了合并请求。'; -$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"; diff --git a/module/mr/ui/link.html.php b/module/mr/ui/link.html.php index 087c273cf5..b0872c37df 100644 --- a/module/mr/ui/link.html.php +++ b/module/mr/ui/link.html.php @@ -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);