diff --git a/module/bug/lang/de.php b/module/bug/lang/de.php index 2378e62853..ae67b3dac0 100644 --- a/module/bug/lang/de.php +++ b/module/bug/lang/de.php @@ -176,6 +176,7 @@ $lang->bug->labelPostponed = 'Postponed'; $lang->bug->changed = 'Changed'; $lang->bug->storyChanged = 'Story Changed'; $lang->bug->linkMR = 'Related MRs'; +$lang->bug->duplicateTip = 'Please enter keyword search'; /* Page tags. */ $lang->bug->lblAssignedTo = 'Bearbeiter'; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 6834b13499..f29895386a 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -77,7 +77,7 @@ $lang->bug->deadlineAB = 'Deadline'; $lang->bug->plan = 'Plan'; $lang->bug->closedBy = 'ClosedBy'; $lang->bug->closedDate = 'ClosedDate'; -$lang->bug->duplicateBug = 'Duplicated Bug ID'; +$lang->bug->duplicateBug = 'Duplicated Bug'; $lang->bug->lastEditedBy = 'EditedBy'; $lang->bug->linkBug = 'Linked Bugs'; $lang->bug->linkBugs = 'Link Bug'; @@ -176,6 +176,7 @@ $lang->bug->labelPostponed = 'Postponed'; $lang->bug->changed = 'Changed'; $lang->bug->storyChanged = 'Story Changed'; $lang->bug->linkMR = 'Related MRs'; +$lang->bug->duplicateTip = 'Please enter keyword search'; /* Page tags. */ $lang->bug->lblAssignedTo = 'AssignTo'; diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php index 1fa2cf40b4..1d8df84e71 100644 --- a/module/bug/lang/fr.php +++ b/module/bug/lang/fr.php @@ -77,7 +77,7 @@ $lang->bug->deadlineAB = 'Butoir'; $lang->bug->plan = 'Plan'; $lang->bug->closedBy = 'Fermé par'; $lang->bug->closedDate = 'Date Fermeture'; -$lang->bug->duplicateBug = 'Bug ID en doublon'; +$lang->bug->duplicateBug = 'Bug en doublon'; $lang->bug->lastEditedBy = 'Edité par'; $lang->bug->linkBug = 'Bugs Liés'; $lang->bug->linkBugs = 'Associer Bug'; @@ -176,6 +176,7 @@ $lang->bug->labelPostponed = 'Postponed'; $lang->bug->changed = 'Changed'; $lang->bug->storyChanged = 'Story Changed'; $lang->bug->linkMR = 'Related MRs'; +$lang->bug->duplicateTip = 'Please enter keyword search'; /* Page tags. */ $lang->bug->lblAssignedTo = 'Affecté à'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index c92bee374c..9a6ad14c53 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -77,7 +77,7 @@ $lang->bug->deadlineAB = '截止'; $lang->bug->plan = '所属' . '计划'; $lang->bug->closedBy = '由谁关闭'; $lang->bug->closedDate = '关闭日期'; -$lang->bug->duplicateBug = '重复ID'; +$lang->bug->duplicateBug = '重复Bug'; $lang->bug->lastEditedBy = '最后修改者'; $lang->bug->linkBug = '相关Bug'; $lang->bug->linkBugs = '关联相关Bug'; @@ -176,6 +176,7 @@ $lang->bug->labelPostponed = '被延期'; $lang->bug->changed = '已变动'; $lang->bug->storyChanged = '需求变动'; $lang->bug->linkMR = '相关合并请求'; +$lang->bug->duplicateTip = '请输入关键字'; /* 页面标签。*/ $lang->bug->lblAssignedTo = '当前指派'; diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php index 924c1f8c05..f1e9c9c348 100644 --- a/module/bug/view/batchedit.html.php +++ b/module/bug/view/batchedit.html.php @@ -143,7 +143,7 @@ resolution, "class='form-control' onchange=setDuplicate(this.value,$bugID)");?> ' resolution != 'duplicate') echo "style='display:none'";?>> - product][$bug->branch], $bug->duplicateBug, "class='form-control' placeholder='{$lang->bug->duplicateBug}'");?> + product][$bug->branch], $bug->duplicateBug, "class='form-control' placeholder='{$lang->bug->duplicateTip}'");?> diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index b1d317dad4..ca71ef4b2d 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -265,7 +265,7 @@ if($this->app->tab == 'project') js::set('objectID', $bug->project); resolution != 'duplicate') echo "style='display:none'";?>> bug->duplicateBug;?> - duplicateBug, "class='form-control'");?> + duplicateBug, "class='form-control' placeholder='{$lang->bug->duplicateTip}'");?> bug->closedBy;?> diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php index a9d91cffb2..12e1e27e31 100644 --- a/module/bug/view/resolve.html.php +++ b/module/bug/view/resolve.html.php @@ -38,7 +38,7 @@ js::set('productID' , $bug->product); bug->duplicateBug;?> - + bug->duplicateTip}'");?> bug->resolvedBuild;?> diff --git a/module/story/control.php b/module/story/control.php index f5ec022331..f2ddb20508 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -26,6 +26,7 @@ class story extends control $this->loadModel('tree'); $this->loadModel('user'); $this->loadModel('action'); + } /** @@ -747,6 +748,7 @@ class story extends control */ public function edit($storyID, $kanbanGroup = 'default', $storyType = 'story') { + $this->app->loadLang('bug'); $story = $this->story->getById($storyID, 0, true); if(!empty($_POST)) @@ -1611,6 +1613,7 @@ class story extends control */ public function close($storyID, $from = '', $storyType = 'story') { + $this->app->loadLang('bug'); $story = $this->story->getById($storyID); if(!empty($_POST)) @@ -1712,6 +1715,7 @@ class story extends control */ public function batchClose($productID = 0, $executionID = 0, $storyType = 'story', $from = '') { + $this->app->loadLang('bug'); if(!$this->post->storyIdList) return print(js::locate($this->session->storyList, 'parent')); $storyIdList = $this->post->storyIdList; $storyIdList = array_unique($storyIdList); diff --git a/module/story/lang/de.php b/module/story/lang/de.php index 38beb03d80..d68a60cd42 100644 --- a/module/story/lang/de.php +++ b/module/story/lang/de.php @@ -155,7 +155,7 @@ $lang->story->childrenAB = "C"; $lang->story->linkStories = 'Story verknüpfen'; $lang->story->linkRequirements = "Linked {$lang->URCommon}"; $lang->story->childStories = 'Story aufteilen'; -$lang->story->duplicateStory = 'Story ID kopieren'; +$lang->story->duplicateStory = 'Story kopieren'; $lang->story->reviewResult = 'Ergbnis prüfen'; $lang->story->reviewResultAB = 'Bewertungsergebnisse'; $lang->story->preVersion = 'Frühere Version'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 0814bc98d0..8001b3e6e7 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -155,7 +155,7 @@ $lang->story->childrenAB = "C"; $lang->story->linkStories = 'Linked Story'; $lang->story->linkRequirements = "Linked {$lang->URCommon}"; $lang->story->childStories = 'Decomposed Story'; -$lang->story->duplicateStory = 'Duplicated Story ID'; +$lang->story->duplicateStory = 'Duplicated Story'; $lang->story->reviewResult = 'Review Result'; $lang->story->reviewResultAB = 'Assessment results'; $lang->story->preVersion = 'Last Version'; diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php index 6904949d10..573de4d391 100644 --- a/module/story/lang/fr.php +++ b/module/story/lang/fr.php @@ -155,7 +155,7 @@ $lang->story->childrenAB = "C"; $lang->story->linkStories = 'Stories Liées'; $lang->story->linkRequirements = "{$lang->URCommon} Lié es"; $lang->story->childStories = 'Stories Décomposées'; -$lang->story->duplicateStory = 'Story ID Dupliquées'; +$lang->story->duplicateStory = 'Story Dupliquées'; $lang->story->reviewResult = 'Résultat Validation'; $lang->story->reviewResultAB = 'Résultats de lévaluation'; $lang->story->preVersion = 'Dernière Version'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 9b854de29b..bf5f5b8528 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -155,7 +155,7 @@ $lang->story->childrenAB = "子"; $lang->story->linkStories = "相关{$lang->SRCommon}"; $lang->story->linkRequirements = "相关{$lang->URCommon}"; $lang->story->childStories = "细分需求"; -$lang->story->duplicateStory = "重复需求ID"; +$lang->story->duplicateStory = "重复需求"; $lang->story->reviewResult = '评审意见'; $lang->story->reviewResultAB = '评审结果'; $lang->story->preVersion = '之前版本'; diff --git a/module/story/view/batchclose.html.php b/module/story/view/batchclose.html.php index 3125507ffe..15d999f9fb 100755 --- a/module/story/view/batchclose.html.php +++ b/module/story/view/batchclose.html.php @@ -44,7 +44,7 @@ ' closedReason != 'duplicate') echo "style='display:none'";?>> - product][$story->branch], $story->duplicateStory, "class='form-control' placeholder='{$lang->idAB}'");?> + '') + $productStoryList[$story->product][$story->branch], $story->duplicateStory ? $story->duplicateStory : '', "class='form-control' placeholder='{$lang->bug->duplicateTip}'");?> ' closedReason != 'subdivided') echo "style='display:none'";?>> idAB}'");?> diff --git a/module/story/view/close.html.php b/module/story/view/close.html.php index 307352a5ba..8f09e2a651 100644 --- a/module/story/view/close.html.php +++ b/module/story/view/close.html.php @@ -30,7 +30,7 @@ story->duplicateStory;?> - + '') + $productStories, '', "class='form-control' placeholder='{$lang->bug->duplicateTip}'"); ?> story->childStories;?> diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index d8ddeac626..74043a0151 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -285,7 +285,7 @@ - +
story->duplicateStory;?>duplicateStory, 'class="form-control"'); ?> '') + $productStories, $story->duplicateStory ? $story->duplicateStory : '', "class='form-control' placeholder='{$lang->bug->duplicateTip}'"); ?>
type == 'story' ? $lang->requirement->linkStory : $lang->story->linkStory;?>