From 0c42a46b93362ed0b12c6de49354d030ad0b739f Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 6 Dec 2022 09:16:54 +0800
Subject: [PATCH 1/5] * Code for task#78669.

---
 module/productplan/control.php          | 31 +++++++++++++++++--------
 module/productplan/js/create.js         | 20 +++++++++-------
 module/productplan/js/edit.js           | 30 +++++++++++-------------
 module/productplan/view/create.html.php | 12 +++++-----
 module/productplan/view/edit.html.php   | 21 +++++++++--------
 5 files changed, 62 insertions(+), 52 deletions(-)

diff --git a/module/productplan/control.php b/module/productplan/control.php
index 91e31a77e2..389b366571 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -151,11 +151,19 @@ class productplan extends control
         $oldBranch = array($planID => $plan->branch);
 
         /* Get the parent plan pair exclusion itself. */
-        $parentPlanPairs = $this->productplan->getTopPlanPairs($plan->product, $plan->branch);
+        $parentPlanPairs = $this->productplan->getTopPlanPairs($plan->product);
         unset($parentPlanPairs[$planID]);
         $this->view->parentPlanPairs = $parentPlanPairs;
 
         $this->commonAction($plan->product, $plan->branch);
+
+        if($plan->parent)
+        {
+            $parentPlan  = $this->productplan->getByID($plan->parent);
+            $branchPairs = array();
+            foreach(explode(',', $parentPlan->branch) as $parentBranchID) $branchPairs[$parentBranchID] = $this->view->branchTagOption[$parentBranchID];
+            $this->view->branchTagOption = $branchPairs;
+        }
         $this->view->title           = $this->view->product->name . $this->lang->colon . $this->lang->productplan->edit;
         $this->view->position[]      = $this->lang->productplan->edit;
         $this->view->productID       = $plan->product;
@@ -1000,19 +1008,22 @@ class productplan extends control
     }
 
     /**
-     * AJAX: Get top plan.
+     * AJAX: Get parent branches.
      *
-     * @param  int    $productID
-     * @param  int    $branch
-     * @param  int    $planID
+     * @param  int $parentID
      * @access public
-     * @return object
+     * @return void
      */
-    public function ajaxGetTopPlan($productID, $branch = 0, $planID = 0)
+    public function ajaxGetParentBranches($productID = 0, $parentID = 0)
     {
-        $parentPlanPairs = $this->productplan->getTopPlanPairs($productID, $branch);
-        if(isset($parentPlanPairs[$planID])) unset($parentPlanPairs[$planID]);
-        return print(html::select('parent', array(0 => '') + $parentPlanPairs, 0, 'class="form-control"'));
+        $branchPairs = $this->loadModel('branch')->getPairs($productID, 'active');
+        if(!empty($parentID))
+        {
+            $parentBranches = array();
+            $parentPlan     = $this->productplan->getByID($parentID);
+            foreach(explode(',', $parentPlan->branch) as $parentBranchID) $parentBranches[$parentBranchID] = $branchPairs[$parentBranchID];
+        }
+        return print(html::select('branch[]', empty($parentID) ? $branchPairs : $parentBranches, '', "class='form-control chosen' multiple required"));
     }
 
     /**
diff --git a/module/productplan/js/create.js b/module/productplan/js/create.js
index 4c4be3f040..fdf7805e8f 100644
--- a/module/productplan/js/create.js
+++ b/module/productplan/js/create.js
@@ -63,6 +63,17 @@ $('#future').on('change', function()
     }
 });
 
+$('#parent').change(function()
+{
+    var parentID = $(this).val();
+    $.post(createLink('productplan', 'ajaxGetParentBranches', "productID=" + productID + "&parentID=" + parentID), function(data)
+    {
+        $('#branch').replaceWith(data);
+        $('#branch_chosen').remove();
+        $('#branch').chosen();
+    })
+})
+
 $('#branch').change(function()
 {
     if(parentPlanID) return;
@@ -72,21 +83,12 @@ $('#branch').change(function()
 
     var branchIdList = branchIdList.toString();
     var lastPlanLink = createLink('productplan', 'ajaxGetLast', "productID=" + productID + "&branch=" + branchIdList);
-    var topPlanLink  = createLink('productplan', 'ajaxGetTopPlan', "productID=" + productID + "&branch=" + branchIdList);
-
     $.post(lastPlanLink, function(data)
     {
         data = JSON.parse(data);
         var planTitle = data ? '(' + lastLang + ': ' + data.title + ')' : '';
         $('#title').parent().next('td').html(planTitle);
     })
-
-    $.post(topPlanLink, function(data)
-    {
-        $('#parent').replaceWith(data);
-        $('#parent_chosen').remove();
-        $('#parent').chosen();
-    })
 });
 
 $('#submit').click(function()
diff --git a/module/productplan/js/edit.js b/module/productplan/js/edit.js
index 402f42c589..6a6f6fd562 100644
--- a/module/productplan/js/edit.js
+++ b/module/productplan/js/edit.js
@@ -13,14 +13,7 @@ function convertStringToDate(dateString)
     return Date.parse(dateString);
 }
 
-/**
- * Get conflict stories.
- *
- * @param  int    $planID
- * @access public
- * @return void
- */
-function getConflictStories(planID)
+$('#branch').change(function()
 {
     var newBranch = $('#branch').val() ? $('#branch').val().toString() : '';
     $.get(createLink('productplan', 'ajaxGetConflict', 'planID=' + planID + '&newBranch=' + newBranch), function(conflictStories)
@@ -35,16 +28,8 @@ function getConflictStories(planID)
                 $('#branch').trigger("chosen:updated");
             }
         }
-
-        var link = createLink('productplan', 'ajaxGetTopPlan', "productID=" + productID + "&branch=" + newBranch + "&planID=" + planID);
-        $.post(link, function(data)
-        {
-            $('#parent').replaceWith(data);
-            $('#parent_chosen').remove();
-            $('#parent').chosen();
-        })
     });
-}
+});
 
 /**
  * Compute the end date for productplan.
@@ -72,6 +57,17 @@ function computeEndDate(delta)
     $('#end').val(endDate).datetimepicker('update');
 }
 
+$('#parent').change(function()
+{
+    var parentID = $(this).val();
+    $.post(createLink('productplan', 'ajaxGetParentBranches', "productID=" + productID + "&parentID=" + parentID), function(data)
+    {
+        $('#branch').replaceWith(data);
+        $('#branch_chosen').remove();
+        $('#branch').chosen();
+    })
+})
+
 $('#future').on('change', function()
 {
     if($(this).prop('checked'))
diff --git a/module/productplan/view/create.html.php b/module/productplan/view/create.html.php
index 01a0a00b82..c0534d69fc 100644
--- a/module/productplan/view/create.html.php
+++ b/module/productplan/view/create.html.php
@@ -37,6 +37,12 @@
             <td class='muted'><?php echo $product->name;?></td><td></td><td></td>
           </tr>
           <?php endif;?>
+          <?php if(!$parent):?>
+          <tr>
+            <th><?php echo $lang->productplan->parent;?></th>
+            <td><?php echo html::select('parent', array(0 => '') + $parentPlanPairs, 0, "class='form-control chosen'");?>
+          </tr>
+          <?php endif;?>
           <?php if($product->type != 'normal'):?>
           <tr>
             <th><?php echo $lang->product->branch;?></th>
@@ -57,12 +63,6 @@
             <td><?php echo html::input('title', '', "class='form-control' required");?></td>
             <td colspan='2' class='muted'><?php if($lastPlan) echo '(' . $lang->productplan->last . ': ' . $lastPlan->title . ')';?></td>
           </tr>
-          <?php if(!$parent):?>
-          <tr>
-            <th><?php echo $lang->productplan->parent;?></th>
-            <td><?php echo html::select('parent', array(0 => '') + $parentPlanPairs, 0, "class='form-control chosen'");?>
-          </tr>
-          <?php endif;?>
           <tr>
             <th><?php echo $lang->productplan->begin;?></th>
             <td><?php echo html::input('begin', formatTime($begin), "class='form-control form-date'");?></td>
diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php
index 469eb90018..cf8f677dc1 100644
--- a/module/productplan/view/edit.html.php
+++ b/module/productplan/view/edit.html.php
@@ -17,6 +17,7 @@
 <?php js::set('today', helper::today());?>
 <?php js::set('productID', $productID);?>
 <?php js::set('oldBranch', $oldBranch);?>
+<?php js::set('planID', $plan->id);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
@@ -30,17 +31,7 @@
             <th><?php echo $lang->productplan->product;?></th>
             <td class='muted'><?php echo $product->name;?></td><td></td><td></td>
           </tr>
-          <?php if($product->type != 'normal' and $plan->parent != '-1'):?>
-          <tr>
-            <th><?php echo $lang->product->branch;?></th>
-            <td><?php echo html::select('branch[]', $branchTagOption, $plan->branch, "onchange='getConflictStories($plan->id);' class='form-control chosen' multiple");?></td><td></td><td></td>
-          </tr>
           <?php endif;?>
-          <?php endif;?>
-          <tr>
-            <th><?php echo $lang->productplan->title;?></th>
-            <td><?php echo html::input('title', $plan->title, "class='form-control' required");?></td><td></td><td></td>
-          </tr>
           <?php if($plan->parent == '-1'):?>
               <?php echo html::hidden('parent', $plan->parent);?>
           <?php else:?>
@@ -49,6 +40,16 @@
             <td><?php echo html::select('parent', array(0 => '') + $parentPlanPairs, $plan->parent, "class='form-control chosen'");?>
           </tr>
           <?php endif;?>
+          <?php if(!$product->shadow and $product->type != 'normal' and $plan->parent != '-1'):?>
+          <tr>
+            <th><?php echo $lang->product->branch;?></th>
+            <td><?php echo html::select('branch[]', $branchTagOption, $plan->branch, "class='form-control chosen' multiple");?></td><td></td><td></td>
+          </tr>
+          <?php endif;?>
+          <tr>
+            <th><?php echo $lang->productplan->title;?></th>
+            <td><?php echo html::input('title', $plan->title, "class='form-control' required");?></td><td></td><td></td>
+          </tr>
           <tr>
             <th><?php echo $lang->productplan->status;?></th>
             <?php $disabled = $plan->parent == -1 ? "disabled='disabled'" : '' ;?>

From c1257aac6b00892f84929daafcf727b3b95ec9c7 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 6 Dec 2022 09:57:03 +0800
Subject: [PATCH 2/5] * Code for task#78669.

---
 module/productplan/control.php  | 2 --
 module/productplan/js/create.js | 2 +-
 module/productplan/js/edit.js   | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/module/productplan/control.php b/module/productplan/control.php
index 389b366571..d2b1ff27b6 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -956,8 +956,6 @@ class productplan extends control
      */
     public function ajaxGetConflict($planID, $newBranch)
     {
-        if($newBranch == '') return;
-
         $plan        = $this->productplan->getByID($planID);
         $oldBranch   = $plan->branch;
         $planStories = $this->loadModel('story')->getPlanStories($planID, 'all');
diff --git a/module/productplan/js/create.js b/module/productplan/js/create.js
index fdf7805e8f..6bfe71b4ba 100644
--- a/module/productplan/js/create.js
+++ b/module/productplan/js/create.js
@@ -74,7 +74,7 @@ $('#parent').change(function()
     })
 })
 
-$('#branch').change(function()
+$('#dataform').on('change', '#branch', function()
 {
     if(parentPlanID) return;
 
diff --git a/module/productplan/js/edit.js b/module/productplan/js/edit.js
index 6a6f6fd562..7e0541f621 100644
--- a/module/productplan/js/edit.js
+++ b/module/productplan/js/edit.js
@@ -13,7 +13,7 @@ function convertStringToDate(dateString)
     return Date.parse(dateString);
 }
 
-$('#branch').change(function()
+$('#dataform').on('change', '#branch', function()
 {
     var newBranch = $('#branch').val() ? $('#branch').val().toString() : '';
     $.get(createLink('productplan', 'ajaxGetConflict', 'planID=' + planID + '&newBranch=' + newBranch), function(conflictStories)

From c23d02ca73fd7459648d267798a40a99a187d054 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 6 Dec 2022 10:03:42 +0800
Subject: [PATCH 3/5] * Code for task#78669.

---
 module/productplan/control.php |  2 +-
 module/productplan/model.php   | 17 +----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/module/productplan/control.php b/module/productplan/control.php
index d2b1ff27b6..8ef3268a79 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -117,7 +117,7 @@ class productplan extends control
         $this->view->branches        = $branchPairs;
         $this->view->defaultBranch   = $defaultBranch;
         $this->view->parent          = $parent;
-        $this->view->parentPlanPairs = $this->productplan->getTopPlanPairs($productID, '', 'done,closed');
+        $this->view->parentPlanPairs = $this->productplan->getTopPlanPairs($productID, 'done,closed');
         $this->display();
     }
 
diff --git a/module/productplan/model.php b/module/productplan/model.php
index d378d62382..a5604badb9 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -222,29 +222,14 @@ class productplanModel extends model
      * Get top plan pairs.
      *
      * @param int    $productID
-     * @param int    $branch
      * @param int    $exclude
      * @access public
      * @return array
      */
-    public function getTopPlanPairs($productID, $branch = '', $exclude = '')
+    public function getTopPlanPairs($productID, $exclude = '')
     {
-        $branchQuery = '';
-        if($branch !== '')
-        {
-            $branchQuery .= '(';
-            $branchCount = count(explode(',', $branch));
-            foreach(explode(',', $branch) as $index => $branchID)
-            {
-                $branchQuery .= "CONCAT(',', branch, ',') LIKE '%,$branchID,%'";
-                if($index < $branchCount - 1) $branchQuery .= ' AND ';
-            }
-            $branchQuery .= ')';
-        }
-
         $planPairs = $this->dao->select("id,title")->from(TABLE_PRODUCTPLAN)
             ->where('product')->eq($productID)
-            ->beginIF($branch !== '' and !empty($branchQuery))->andWhere($branchQuery)->fi()
             ->andWhere('parent')->le(0)
             ->andWhere('deleted')->eq(0)
             ->beginIF($exclude)->andWhere('status')->notin($exclude)

From 62157bf79e43c1e6a991fdb90b33081f1e24378a Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 6 Dec 2022 10:24:11 +0800
Subject: [PATCH 4/5] * Code for task#78669.

---
 module/productplan/control.php  | 14 ++++++++++----
 module/productplan/js/create.js |  6 ++++--
 module/productplan/js/edit.js   |  6 +++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/module/productplan/control.php b/module/productplan/control.php
index 8ef3268a79..f2fad8c605 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -1008,20 +1008,26 @@ class productplan extends control
     /**
      * AJAX: Get parent branches.
      *
-     * @param  int $parentID
+     * @param  int    $productID
+     * @param  int    $parentID
+     * @param  string $currentBranches
      * @access public
      * @return void
      */
-    public function ajaxGetParentBranches($productID = 0, $parentID = 0)
+    public function ajaxGetParentBranches($productID = 0, $parentID = 0, $currentBranches = '')
     {
         $branchPairs = $this->loadModel('branch')->getPairs($productID, 'active');
         if(!empty($parentID))
         {
             $parentBranches = array();
             $parentPlan     = $this->productplan->getByID($parentID);
-            foreach(explode(',', $parentPlan->branch) as $parentBranchID) $parentBranches[$parentBranchID] = $branchPairs[$parentBranchID];
+            foreach(explode(',', $parentPlan->branch) as $parentBranchID)
+            {
+                $parentBranches[$parentBranchID] = $branchPairs[$parentBranchID];
+                if(!empty($currentBranches) and strpos(",$currentBranches,", ",$parentBranchID,") === false) $currentBranches = str_replace(",$parentBranchID,", ',', $currentBranches);
+            }
         }
-        return print(html::select('branch[]', empty($parentID) ? $branchPairs : $parentBranches, '', "class='form-control chosen' multiple required"));
+        return print(html::select('branch[]', empty($parentID) ? $branchPairs : $parentBranches, trim($currentBranches, ','), "class='form-control chosen' multiple required"));
     }
 
     /**
diff --git a/module/productplan/js/create.js b/module/productplan/js/create.js
index 6bfe71b4ba..dc43f76277 100644
--- a/module/productplan/js/create.js
+++ b/module/productplan/js/create.js
@@ -65,12 +65,14 @@ $('#future').on('change', function()
 
 $('#parent').change(function()
 {
-    var parentID = $(this).val();
-    $.post(createLink('productplan', 'ajaxGetParentBranches', "productID=" + productID + "&parentID=" + parentID), function(data)
+    var parentID        = $(this).val();
+    var currentBranches = $('#branch').val() ? $('#branch').val().toString() : '';
+    $.post(createLink('productplan', 'ajaxGetParentBranches', "productID=" + productID + "&parentID=" + parentID + "&currentBranches=" + currentBranches), function(data)
     {
         $('#branch').replaceWith(data);
         $('#branch_chosen').remove();
         $('#branch').chosen();
+        $('#branch').change();
     })
 })
 
diff --git a/module/productplan/js/edit.js b/module/productplan/js/edit.js
index 7e0541f621..9d3733f176 100644
--- a/module/productplan/js/edit.js
+++ b/module/productplan/js/edit.js
@@ -23,7 +23,6 @@ $('#dataform').on('change', '#branch', function()
             var result = confirm(conflictStories) ? true : false;
             if(!result)
             {
-                newBranch = oldBranch[planID];
                 $('#branch').val(oldBranch[planID].split(','));
                 $('#branch').trigger("chosen:updated");
             }
@@ -59,8 +58,9 @@ function computeEndDate(delta)
 
 $('#parent').change(function()
 {
-    var parentID = $(this).val();
-    $.post(createLink('productplan', 'ajaxGetParentBranches', "productID=" + productID + "&parentID=" + parentID), function(data)
+    var parentID        = $(this).val();
+    var currentBranches = $('#branch').val() ? $('#branch').val().toString() : '';
+    $.post(createLink('productplan', 'ajaxGetParentBranches', "productID=" + productID + "&parentID=" + parentID + "&currentBranches=" + currentBranches), function(data)
     {
         $('#branch').replaceWith(data);
         $('#branch_chosen').remove();

From 6f8dd9e186dff47b951a0220ba34ddc59de30954 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 6 Dec 2022 14:27:17 +0800
Subject: [PATCH 5/5] * Code for task#78669. Add branch name in tips.

---
 module/productplan/control.php    | 13 ++++++++++---
 module/productplan/lang/de.php    |  8 ++++----
 module/productplan/lang/en.php    |  8 ++++----
 module/productplan/lang/fr.php    |  8 ++++----
 module/productplan/lang/zh-cn.php |  8 ++++----
 5 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/module/productplan/control.php b/module/productplan/control.php
index f2fad8c605..3d34f90760 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -960,6 +960,13 @@ class productplan extends control
         $oldBranch   = $plan->branch;
         $planStories = $this->loadModel('story')->getPlanStories($planID, 'all');
         $planBugs    = $this->loadModel('bug')->getPlanBugs($planID, 'all');
+        $branchPairs = $this->loadModel('branch')->getPairs($plan->product);
+
+        $removeBranches = '';
+        foreach(explode(',', $oldBranch) as $oldBranchID)
+        {
+            if($oldBranchID and strpos(",$newBranch,", ",$oldBranchID,") === false) $removeBranches .= "{$branchPairs[$oldBranchID]},";
+        }
 
         $conflictStoryCounts = 0;
         $conflictBugCounts   = 0;
@@ -978,15 +985,15 @@ class productplan extends control
 
         if($conflictStoryCounts and $conflictBugCounts)
         {
-            printf($this->lang->productplan->confirmChangePlan, $conflictStoryCounts, $conflictBugCounts);
+            printf($this->lang->productplan->confirmChangePlan, trim($removeBranches, ','), $conflictStoryCounts, $conflictBugCounts);
         }
         elseif($conflictStoryCounts)
         {
-            printf($this->lang->productplan->confirmRemoveStory, $conflictStoryCounts);
+            printf($this->lang->productplan->confirmRemoveStory, trim($removeBranches, ','), $conflictStoryCounts);
         }
         elseif($conflictBugCounts)
         {
-            printf($this->lang->productplan->confirmRemoveBug, $conflictBugCounts);
+            printf($this->lang->productplan->confirmRemoveBug, trim($removeBranches, ','), $conflictBugCounts);
         }
     }
 
diff --git a/module/productplan/lang/de.php b/module/productplan/lang/de.php
index c402dd43ff..ac56c0aeec 100644
--- a/module/productplan/lang/de.php
+++ b/module/productplan/lang/de.php
@@ -75,9 +75,9 @@ $lang->productplan->projectNotEmpty    = 'Project cannot be empty.';
 $lang->productplan->nextStep           = "Next step";
 $lang->productplan->summary            = "Total: <strong>%s</strong>, Parents: <strong>%s</strong>, Children: <strong>%s</strong>，Independent: <strong>%s</strong>.";
 $lang->productplan->checkedSummary     = "Seleted: <strong>%total%</strong>, Parents: <strong>%parent%</strong>, Children: <strong>%child%</strong>, Independent: <strong>%independent%</strong>.";
-$lang->productplan->confirmChangePlan  = "After the branch is unlinked, %s {$lang->SRCommon} and %s bugs under the branch will be removed from the plan at the same time, so still want to unassociate?";
-$lang->productplan->confirmRemoveStory = "After the branch is unlinked, %s {$lang->SRCommon} under the branch will be removed from the plan at the same time, so still want to unassociate?";
-$lang->productplan->confirmRemoveBug   = "After the branch is unlinked, %s bugs under the branch will be removed from the plan at the same time, so still want to unassociate?";
+$lang->productplan->confirmChangePlan  = "After the branch of『%s』is unlinked, %s {$lang->SRCommon} and %s bugs under the branch will be removed from the plan at the same time, so still want to unassociate?";
+$lang->productplan->confirmRemoveStory = "After the branch of『%s』is unlinked, %s {$lang->SRCommon} under the branch will be removed from the plan at the same time, so still want to unassociate?";
+$lang->productplan->confirmRemoveBug   = "After the branch of『%s』is unlinked, %s bugs under the branch will be removed from the plan at the same time, so still want to unassociate?";
 
 $lang->productplan->id         = 'ID';
 $lang->productplan->product    = $lang->productCommon;
@@ -139,7 +139,7 @@ $lang->productplan->beginGreaterChildTip = "The start date of the parent plan[%s
 $lang->productplan->endLetterChildTip    = "The completion date of the parent plan[%s]: %s, cannot be less than the completion date of the child plan: %s.";
 $lang->productplan->beginLetterParentTip = "The start date of the child plan[%s]: %s, cannot be less than the start date of the parent plan: %s.";
 $lang->productplan->endGreaterParentTip  = "The completion date of the child plan[%s]: %s, cannot be greater than the completion date of the parent plan: %s.";
-$lang->productplan->diffBranchesTip      = "The @branch@ %s of parent plan is not linked with the child plan. @branch@'s stories and bugs whill be removed from the plan. Do you want to save?";
+$lang->productplan->diffBranchesTip      = "The @branch@『%s』 of parent plan is not linked with the child plan. @branch@'s stories and bugs whill be removed from the plan. Do you want to save?";
 
 $lang->productplan->featureBar['browse']['all']    = 'Alle';
 $lang->productplan->featureBar['browse']['undone'] = 'Undone';
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
index 3306bc5bdb..49a6bf5bd1 100644
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -75,9 +75,9 @@ $lang->productplan->projectNotEmpty    = 'Project cannot be empty.';
 $lang->productplan->nextStep           = "Next step";
 $lang->productplan->summary            = "Total: <strong>%s</strong>, Parents: <strong>%s</strong>, Children: <strong>%s</strong>，Independent: <strong>%s</strong>.";
 $lang->productplan->checkedSummary     = "Seleted: <strong>%total%</strong>, Parents: <strong>%parent%</strong>, Children: <strong>%child%</strong>, Independent: <strong>%independent%</strong>.";
-$lang->productplan->confirmChangePlan  = "After the branch is unlinked, %s {$lang->SRCommon} and %s bugs under the branch will be removed from the plan at the same time, so still want to unassociate?";
-$lang->productplan->confirmRemoveStory = "After the branch is unlinked, %s {$lang->SRCommon} under the branch will be removed from the plan at the same time, so still want to unassociate?";
-$lang->productplan->confirmRemoveBug   = "After the branch is unlinked, %s bugs under the branch will be removed from the plan at the same time, so still want to unassociate?";
+$lang->productplan->confirmChangePlan  = "After the branch of『%s』is unlinked, %s {$lang->SRCommon} and %s bugs under the branch will be removed from the plan at the same time, so still want to unassociate?";
+$lang->productplan->confirmRemoveStory = "After the branch of『%s』is unlinked, %s {$lang->SRCommon} under the branch will be removed from the plan at the same time, so still want to unassociate?";
+$lang->productplan->confirmRemoveBug   = "After the branch of『%s』is unlinked, %s bugs under the branch will be removed from the plan at the same time, so still want to unassociate?";
 
 $lang->productplan->id         = 'ID';
 $lang->productplan->product    = $lang->productCommon;
@@ -139,7 +139,7 @@ $lang->productplan->beginGreaterChildTip = "The start date of the parent plan[%s
 $lang->productplan->endLetterChildTip    = "The completion date of the parent plan[%s]: %s, cannot be less than the completion date of the child plan: %s.";
 $lang->productplan->beginLetterParentTip = "The start date of the child plan[%s]: %s, cannot be less than the start date of the parent plan: %s.";
 $lang->productplan->endGreaterParentTip  = "The completion date of the child plan[%s]: %s, cannot be greater than the completion date of the parent plan: %s.";
-$lang->productplan->diffBranchesTip      = "The @branch@ %s of parent plan is not linked with the child plan. @branch@'s stories and bugs whill be removed from the plan. Do you want to save?";
+$lang->productplan->diffBranchesTip      = "The @branch@『%s』of parent plan is not linked with the child plan. @branch@'s stories and bugs whill be removed from the plan. Do you want to save?";
 
 $lang->productplan->featureBar['browse']['all']    = 'All';
 $lang->productplan->featureBar['browse']['undone'] = 'Undone';
diff --git a/module/productplan/lang/fr.php b/module/productplan/lang/fr.php
index 46bfcaf196..5fd88247f3 100644
--- a/module/productplan/lang/fr.php
+++ b/module/productplan/lang/fr.php
@@ -75,9 +75,9 @@ $lang->productplan->projectNotEmpty    = 'Project cannot be empty.';
 $lang->productplan->nextStep           = "Next step";
 $lang->productplan->summary            = "Total: <strong>%s</strong>, Parents: <strong>%s</strong>, Children: <strong>%s</strong>，Independent: <strong>%s</strong>.";
 $lang->productplan->checkedSummary     = "Seleted: <strong>%total%</strong>, Parents: <strong>%parent%</strong>, Children: <strong>%child%</strong>, Independent: <strong>%independent%</strong>.";
-$lang->productplan->confirmChangePlan  = "After the branch is unlinked, %s {$lang->SRCommon} and %s bugs under the branch will be removed from the plan at the same time, so still want to unassociate?";
-$lang->productplan->confirmRemoveStory = "After the branch is unlinked, %s {$lang->SRCommon} under the branch will be removed from the plan at the same time, so still want to unassociate?";
-$lang->productplan->confirmRemoveBug   = "After the branch is unlinked, %s bugs under the branch will be removed from the plan at the same time, so still want to unassociate?";
+$lang->productplan->confirmChangePlan  = "After the branch of『%s』is unlinked, %s {$lang->SRCommon} and %s bugs under the branch will be removed from the plan at the same time, so still want to unassociate?";
+$lang->productplan->confirmRemoveStory = "After the branch of『%s』is unlinked, %s {$lang->SRCommon} under the branch will be removed from the plan at the same time, so still want to unassociate?";
+$lang->productplan->confirmRemoveBug   = "After the branch of『%s』is unlinked, %s bugs under the branch will be removed from the plan at the same time, so still want to unassociate?";
 
 $lang->productplan->id         = 'ID';
 $lang->productplan->product    = $lang->productCommon;
@@ -139,7 +139,7 @@ $lang->productplan->beginGreaterChildTip = "The start date of the parent plan[%s
 $lang->productplan->endLetterChildTip    = "The completion date of the parent plan[%s]: %s, cannot be less than the completion date of the child plan: %s.";
 $lang->productplan->beginLetterParentTip = "The start date of the child plan[%s]: %s, cannot be less than the start date of the parent plan: %s.";
 $lang->productplan->endGreaterParentTip  = "The completion date of the child plan[%s]: %s, cannot be greater than the completion date of the parent plan: %s.";
-$lang->productplan->diffBranchesTip      = "The @branch@ %s of parent plan is not linked with the child plan. @branch@'s stories and bugs whill be removed from the plan. Do you want to save?";
+$lang->productplan->diffBranchesTip      = "The @branch@『%s』of parent plan is not linked with the child plan. @branch@'s stories and bugs whill be removed from the plan. Do you want to save?";
 
 $lang->productplan->featureBar['browse']['all']    = 'Tous';
 $lang->productplan->featureBar['browse']['undone'] = 'Undone';
diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php
index b1765303ea..f756060d8e 100644
--- a/module/productplan/lang/zh-cn.php
+++ b/module/productplan/lang/zh-cn.php
@@ -75,9 +75,9 @@ $lang->productplan->projectNotEmpty    = '所属项目不能为空。';
 $lang->productplan->nextStep           = "下一步";
 $lang->productplan->summary            = "本页共 <strong>%s</strong> 个计划，父计划 <strong>%s</strong>，子计划 <strong>%s</strong>，独立计划 <strong>%s</strong>。";
 $lang->productplan->checkedSummary     = "共选中 <strong>%total%</strong> 个计划，父计划 <strong>%parent%</strong>，子计划 <strong>%child%</strong>，独立计划 <strong>%independent%</strong>。";
-$lang->productplan->confirmChangePlan  = "分支解除关联后，分支下的%s个{$lang->SRCommon}和%s个Bug将同步从计划中移除，是否解除？";
-$lang->productplan->confirmRemoveStory = "分支解除关联后，分支下的%s个{$lang->SRCommon}将同步从计划中移除，是否解除？";
-$lang->productplan->confirmRemoveBug   = "分支解除关联后，分支下的%s个Bug将同步从计划中移除，是否解除？";
+$lang->productplan->confirmChangePlan  = "分支『%s』解除关联后，分支下的%s个{$lang->SRCommon}和%s个Bug将同步从计划中移除，是否解除？";
+$lang->productplan->confirmRemoveStory = "分支『%s』解除关联后，分支下的%s个{$lang->SRCommon}将同步从计划中移除，是否解除？";
+$lang->productplan->confirmRemoveBug   = "分支『%s』解除关联后，分支下的%s个Bug将同步从计划中移除，是否解除？";
 
 $lang->productplan->id         = '编号';
 $lang->productplan->product    = $lang->productCommon;
@@ -139,7 +139,7 @@ $lang->productplan->beginGreaterChildTip = "父计划[%s]的开始日期：%s，
 $lang->productplan->endLetterChildTip    = "父计划[%s]的完成日期：%s，不能小于子计划的完成日期: %s";
 $lang->productplan->beginLetterParentTip = "子计划[%s]的开始日期：%s，不能小于父计划的开始日期: %s";
 $lang->productplan->endGreaterParentTip  = "子计划[%s]的完成日期：%s，不能大于父计划的完成日期: %s";
-$lang->productplan->diffBranchesTip      = "父计划的@branch@ %s 未被子计划关联，对应@branch@的需求和bug将自动从计划中移除，是否保存？";
+$lang->productplan->diffBranchesTip      = "父计划的@branch@『%s』未被子计划关联，对应@branch@的需求和bug将自动从计划中移除，是否保存？";
 
 $lang->productplan->featureBar['browse']['all']    = '全部';
 $lang->productplan->featureBar['browse']['undone'] = '未完成';