From 9ef211ef57a0782847a7549c6fbebda91b9efcae Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 21 Feb 2023 15:32:37 +0800
Subject: [PATCH]  * code for task #84544.

---
 merge.sh                                 |  9 ---------
 module/project/lang/de.php               | 18 ++++++++++++++++++
 module/project/lang/en.php               | 18 ++++++++++++++++++
 module/project/lang/fr.php               | 18 ++++++++++++++++++
 module/project/lang/zh-cn.php            | 18 ++++++++++++++++++
 module/project/view/bug.html.php         |  9 +++++++--
 module/project/view/execution.html.php   |  4 ++--
 module/testcase/view/caseheader.html.php | 13 +++++++++++--
 8 files changed, 92 insertions(+), 15 deletions(-)
 delete mode 100755 merge.sh

diff --git a/merge.sh b/merge.sh
deleted file mode 100755
index adf6a97447..0000000000
--- a/merge.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-vim  extension/lite/common/ext/lang/de/lite.php
-vim  extension/lite/common/ext/lang/en/lite.php
-vim  extension/lite/common/ext/lang/fr/lite.php
-vim  extension/lite/common/ext/lang/zh-cn/lite.php
-vim  module/common/lang/de.php
-vim  module/common/lang/en.php
-vim  module/common/lang/fr.php
-vim  module/common/lang/menu.php
-vim  module/common/lang/zh-cn.php
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index dfd375a94d..5355bbaee8 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -281,6 +281,24 @@ $lang->project->featureBar['browse']['doing']     = 'Doing';
 $lang->project->featureBar['browse']['suspended'] = 'Suspended';
 $lang->project->featureBar['browse']['closed']    = 'Closed';
 
+$lang->project->featureBar['execution']['all']       = 'Alle';
+$lang->project->featureBar['execution']['undone']    = 'Geschlossen';
+$lang->project->featureBar['execution']['wait']      = 'Wartend';
+$lang->project->featureBar['execution']['doing']     = 'In Arbeit';
+$lang->project->featureBar['execution']['suspended'] = 'Ausgesetzt';
+$lang->project->featureBar['execution']['closed']    = 'Geschlossen';
+
+$lang->project->featureBar['bug']['all']        = 'All';
+$lang->project->featureBar['bug']['unresolved'] = 'Unresolved';
+
+$lang->project->featureBar['testcase']['all']         = 'Alle';
+$lang->project->featureBar['testcase']['wait']        = 'Wartend';
+$lang->project->featureBar['testcase']['needconfirm'] = "Story geändert";
+$lang->project->featureBar['testcase']['group']       = 'Group View';
+$lang->project->featureBar['testcase']['zerocase']    = "Zero Case Story";
+$lang->project->featureBar['testcase']['suite']       = 'Suite';
+$lang->project->featureBar['testcase']['autocase']    = 'Automated';
+
 $lang->project->featureBar['build']['all'] = 'Build List';
 
 $lang->project->aclList['private'] = 'Private (For team members and stakeholders only)';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index d25999685f..61728d5485 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -281,6 +281,24 @@ $lang->project->featureBar['browse']['doing']     = 'Doing';
 $lang->project->featureBar['browse']['suspended'] = 'Suspended';
 $lang->project->featureBar['browse']['closed']    = 'Closed';
 
+$lang->project->featureBar['execution']['all']       = 'All';
+$lang->project->featureBar['execution']['undone']    = 'Unfinished';
+$lang->project->featureBar['execution']['wait']      = 'Waiting';
+$lang->project->featureBar['execution']['doing']     = 'Doing';
+$lang->project->featureBar['execution']['suspended'] = 'Suspended';
+$lang->project->featureBar['execution']['closed']    = 'Closed';
+
+$lang->project->featureBar['bug']['all']        = 'All';
+$lang->project->featureBar['bug']['unresolved'] = 'Unresolved';
+
+$lang->project->featureBar['testcase']['all']         = 'All';
+$lang->project->featureBar['testcase']['wait']        = 'Waiting';
+$lang->project->featureBar['testcase']['needconfirm'] = "Story Changed";
+$lang->project->featureBar['testcase']['group']       = 'Group View';
+$lang->project->featureBar['testcase']['zerocase']    = "Zero Case Story";
+$lang->project->featureBar['testcase']['suite']       = 'Suite';
+$lang->project->featureBar['testcase']['autocase']    = 'Automated';
+
 $lang->project->featureBar['build']['all'] = 'Build List';
 
 $lang->project->aclList['private'] = 'Private (For the project leader, team members and stakeholders only)';
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index 5e82bde244..7b3879e08a 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -281,6 +281,24 @@ $lang->project->featureBar['browse']['doing']     = 'En Cours';
 $lang->project->featureBar['browse']['suspended'] = 'Suspendues';
 $lang->project->featureBar['browse']['closed']    = 'Fermées';
 
+$lang->project->featureBar['execution']['all']       = "Tous les {$lang->executionCommon}s";
+$lang->project->featureBar['execution']['undone']    = 'Non Terminé';
+$lang->project->featureBar['execution']['wait']      = 'En attente';
+$lang->project->featureBar['execution']['doing']     = 'En cours';
+$lang->project->featureBar['execution']['suspended'] = 'Suspendu';
+$lang->project->featureBar['execution']['closed']    = 'Fermé';
+
+$lang->project->featureBar['bug']['all']        = 'All';
+$lang->project->featureBar['bug']['unresolved'] = 'Unresolved';
+
+$lang->project->featureBar['testcase']['all']         = 'Tous';
+$lang->project->featureBar['testcase']['wait']        = 'En Attente';
+$lang->project->featureBar['testcase']['needconfirm'] = "Story Changée";
+$lang->project->featureBar['testcase']['group']       = 'Group View';
+$lang->project->featureBar['testcase']['zerocase']    = "Zero Case Story";
+$lang->project->featureBar['testcase']['suite']       = 'Suite';
+$lang->project->featureBar['testcase']['autocase']    = 'Automated';
+
 $lang->project->featureBar['build']['all'] = 'Build List';
 
 $lang->project->aclList['private'] = 'Private (For team members and stakeholders only)';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index be8f261079..e80fc6c19f 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -281,6 +281,24 @@ $lang->project->featureBar['browse']['doing']     = '进行中';
 $lang->project->featureBar['browse']['suspended'] = '已挂起';
 $lang->project->featureBar['browse']['closed']    = '已关闭';
 
+$lang->project->featureBar['execution']['all']       = '全部';
+$lang->project->featureBar['execution']['undone']    = '未完成';
+$lang->project->featureBar['execution']['wait']      = '未开始';
+$lang->project->featureBar['execution']['doing']     = '进行中';
+$lang->project->featureBar['execution']['suspended'] = '已挂起';
+$lang->project->featureBar['execution']['closed']    = '已关闭';
+
+$lang->project->featureBar['bug']['all']        = '全部';
+$lang->project->featureBar['bug']['unresolved'] = '未解决';
+
+$lang->project->featureBar['testcase']['all']         = '所有';
+$lang->project->featureBar['testcase']['wait']        = '待评审';
+$lang->project->featureBar['testcase']['needconfirm'] = "需求变动";
+$lang->project->featureBar['testcase']['group']       = '分组查看';
+$lang->project->featureBar['testcase']['zerocase']    = "零用例需求";
+$lang->project->featureBar['testcase']['suite']       = '套件';
+$lang->project->featureBar['testcase']['autocase']    = '自动化';
+
 $lang->project->featureBar['build']['all'] = '全部版本';
 
 $lang->project->aclList['private'] = "私有 (只有项目负责人、团队成员和干系人可访问)";
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 117edf7df0..4c7143392c 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -36,8 +36,13 @@
     <?php
     $buildName = $build ? " <span class='label label-danger'>Build:{$build->name}</span>" : '';
     $module    = $type != 'bysearch' ?  "&param=$param" : '';
-    echo html::a($this->inlink('bug', "projectID={$project->id}&productID={$productID}&branch=$branchID&orderBy=status,id_desc&build=$buildID&type=all$module"), "<span class='text'>{$lang->bug->featureBar['browse']['all']}</span>" . ($type == 'all' ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>$buildName" : ''), '', "id='allTab' class='btn btn-link" . ('all' == $type ? ' btn-active-text' : '') . "'");
-    echo html::a($this->inlink('bug', "projectID={$project->id}&productID={$productID}&branch=$branchID&orderBy=status,id_desc&build=$buildID&type=unresolved$module"), "<span class='text'>{$lang->bug->unResolved}</span>" . ($type == 'unresolved' ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>$buildName" : ''), '', "id='unresolvedTab' class='btn btn-link" . ('unresolved' == $type ? ' btn-active-text' : '') . "'");
+    foreach($lang->project->featureBar['bug'] as $key => $label)
+    {
+        $activeClass = $key == $type ? 'btn-active-text' : '';
+        $label       = "<span class='text'>{$label}</span>";
+        if($type == $key) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>$buildName";
+        echo html::a($this->inlink('bug', "projectID={$project->id}&productID={$productID}&branch=$branchID&orderBy=status,id_desc&build=$buildID&type={$key}$module"), $label, '', "id='{$key}Tab' class='btn btn-link {$activeClass}'");
+    }
     ?>
     <a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> <?php echo $lang->bug->search;?></a>
   </div>
diff --git a/module/project/view/execution.html.php b/module/project/view/execution.html.php
index 8ed16b257d..93d32adccf 100644
--- a/module/project/view/execution.html.php
+++ b/module/project/view/execution.html.php
@@ -34,8 +34,8 @@
       </ul>
     </div>
     <?php endif;?>
-    <?php common::sortFeatureMenu('execution', 'all');?>
-    <?php foreach($lang->execution->featureBar['all'] as $key => $label):?>
+    <?php common::sortFeatureMenu();?>
+    <?php foreach($lang->project->featureBar['execution'] as $key => $label):?>
     <?php $label = "<span class='text'>$label</span>";?>
     <?php if($status == $key) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";?>
     <?php echo html::a($this->createLink('project', 'execution', "status=$key&projectID=$projectID&orderBy=$orderBy&productID=$productID"), $label, '', "class='btn btn-link' id='{$key}Tab'");?>
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index e7820cb408..91a8b52a71 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -79,7 +79,16 @@
     <?php echo html::a(inlink('browseUnits', "productID=$productID&browseType=$key&orderBy=$orderBy"), "<span class='text'>$label</span>", '', "id='{$key}UnitTab' class='btn btn-link' data-app='{$this->app->tab}'");?>
     <?php endforeach;?>
     <?php else:?>
-    <?php foreach(customModel::getFeatureMenu('testcase', 'browse') as $menuItem):?>
+    <?php
+    $rawModule = $this->app->rawModule;
+    $rawMethod = $this->app->rawMethod;
+    if(!isset($lang->{$rawModule}->featureBar[$rawMethod]))
+    {
+        $rawModule = 'testcase';
+        $rawMethod = 'browse';
+    }
+    ?>
+    <?php foreach(customModel::getFeatureMenu($rawModule, $rawMethod) as $menuItem):?>
     <?php
     if(isset($menuItem->hidden)) continue;
     $menuType = $menuItem->name;
@@ -196,7 +205,7 @@
     <?php if(!empty($productID)): ?>
     <div class='btn-group'>
       <button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown'>
-        <i class='icon icon-export muted'></i> 
+        <i class='icon icon-export muted'></i>
         <span class='caret'></span>
       </button>
       <ul class='dropdown-menu pull-right' id='exportActionMenu'>