From 9461d0fc1dc9c41b90dba9b59d7668f04fedd292 Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Wed, 3 Aug 2022 09:26:18 +0800
Subject: [PATCH] * Adjust release menu.

---
 module/release/lang/de.php          |  6 +++---
 module/release/lang/en.php          |  6 +++---
 module/release/lang/fr.php          |  6 +++---
 module/release/lang/vi.php          |  6 +++---
 module/release/lang/zh-cn.php       |  6 +++---
 module/release/view/browse.html.php | 15 +++++++++------
 6 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/module/release/lang/de.php b/module/release/lang/de.php
index e14dd51605..ff088942e6 100644
--- a/module/release/lang/de.php
+++ b/module/release/lang/de.php
@@ -92,6 +92,6 @@ $lang->release->notifyList['PT'] = "Project Team Members";
 $lang->release->notifyList['CT'] = "Copy To";
 
 $lang->release->featureBar = array();
-$lang->release->featureBar['all']       = 'All|release|browse|type=all';
-$lang->release->featureBar['normal']    = 'Active|release|browse|type=normal';
-$lang->release->featureBar['terminate'] = 'Terminated|release|browse|type=terminate';
+$lang->release->featureBar['browse']['all']       = $lang->release->all;
+$lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
+$lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index 78dfb192e4..c6db859ba9 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -92,6 +92,6 @@ $lang->release->notifyList['PT'] = "Project Team Members";
 $lang->release->notifyList['CT'] = "Copy To";
 
 $lang->release->featureBar = array();
-$lang->release->featureBar['all']       = 'All|release|browse|type=all';
-$lang->release->featureBar['normal']    = 'Active|release|browse|type=normal';
-$lang->release->featureBar['terminate'] = 'Terminated|release|browse|type=terminate';
+$lang->release->featureBar['browse']['all']       = $lang->release->all;
+$lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
+$lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
diff --git a/module/release/lang/fr.php b/module/release/lang/fr.php
index 047191d466..aa7021e2d4 100644
--- a/module/release/lang/fr.php
+++ b/module/release/lang/fr.php
@@ -92,6 +92,6 @@ $lang->release->notifyList['PT'] = "Project Team Members";
 $lang->release->notifyList['CT'] = "Copy To";
 
 $lang->release->featureBar = array();
-$lang->release->featureBar['all']       = 'All|release|browse|type=all';
-$lang->release->featureBar['normal']    = 'Active|release|browse|type=normal';
-$lang->release->featureBar['terminate'] = 'Terminated|release|browse|type=terminate';
+$lang->release->featureBar['browse']['all']       = $lang->release->all;
+$lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
+$lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
diff --git a/module/release/lang/vi.php b/module/release/lang/vi.php
index 4c90db3c6c..55167422eb 100644
--- a/module/release/lang/vi.php
+++ b/module/release/lang/vi.php
@@ -86,6 +86,6 @@ $lang->release->notifyList['ET'] = "{$lang->execution->common} Team Members";
 $lang->release->notifyList['PT'] = "Project Team Members";
 
 $lang->release->featureBar = array();
-$lang->release->featureBar['all']       = 'All|release|browse|type=all';
-$lang->release->featureBar['normal']    = 'Active|release|browse|type=normal';
-$lang->release->featureBar['terminate'] = 'Terminated|release|browse|type=terminate';
+$lang->release->featureBar['browse']['all']       = $lang->release->all;
+$lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
+$lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index 8e75b787f3..7df64996b2 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -92,6 +92,6 @@ $lang->release->notifyList['PT'] = "所在项目团队成员";
 $lang->release->notifyList['CT'] = "抄送给";
 
 $lang->release->featureBar = array();
-$lang->release->featureBar['all']       = '所有|release|browse|type=all';
-$lang->release->featureBar['normal']    = '正常|release|browse|type=normal';
-$lang->release->featureBar['terminate'] = '停止维护|release|browse|type=terminate';
+$lang->release->featureBar['browse']['all']       = $lang->release->all;
+$lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
+$lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index 9bfd4c46cf..3a39a0265b 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -15,12 +15,15 @@
 <?php js::set('confirmDelete', $lang->release->confirmDelete)?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php foreach($lang->release->featureBar as $featureType => $link):?>
-    <?php $count       = $type == $featureType ? '<span class="label label-light label-badge">' . $pager->recTotal . '</span>' : '';?>
-    <?php $activeClass = $type == $featureType ? 'btn-active-text' : '';?>
-    <?php list($label, $module, $method, $params) = explode('|', $link);?>
-    <?php echo html::a($this->createLink($module, $method, "productID={$product->id}&branch=$branch&$params"), "<span class='text'>{$label}</span> " . $count, '', "id='{$type}Tab' class='btn btn-link $activeClass'");?>
-    <?php endforeach;?>
+  <?php 
+  foreach($lang->release->featureBar['browse'] as $featureType => $label)
+  {
+      $active = $type == $featureType ? 'btn-active-text' : '';
+      $label  = "<span class='text'>$label</span>";
+      if($type == $featureType) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
+      echo html::a(inlink('browse', "productID={$product->id}&branch=$branch&type=$featureType"), $label, '', "id='{$featureType}Tab' class='btn btn-link $active'");
+  }
+  ?>
   </div>
   <div class="btn-toolbar pull-right">
     <?php if(common::canModify('product', $product)):?>