From 3dda133a928ee05ba17bd31eb41febfa8b0aa2d2 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 28 Jun 2022 11:08:30 +0800
Subject: [PATCH] * Finish task #58561.

---
 module/program/control.php    | 3 ++-
 module/program/lang/de.php    | 7 ++++++-
 module/program/lang/en.php    | 7 ++++++-
 module/program/lang/fr.php    | 7 ++++++-
 module/program/lang/zh-cn.php | 7 ++++++-
 module/project/lang/de.php    | 3 ++-
 module/project/lang/en.php    | 3 ++-
 module/project/lang/fr.php    | 9 +++++----
 module/project/lang/zh-cn.php | 3 ++-
 9 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/module/program/control.php b/module/program/control.php
index 1fea082ba7..2ffb89c3ae 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -28,6 +28,7 @@ class program extends control
      */
     public function browse($status = 'all', $orderBy = 'order_asc', $recTotal = 0, $recPerPage = 10, $pageID = 1, $param = 0)
     {
+        $this->lang->program->featureBar = array('all' => $this->lang->program->featureBar['all']);
         if(common::hasPriv('program', 'create')) $this->lang->pageActions = html::a($this->createLink('program', 'create'), "<i class='icon icon-plus'></i> " . $this->lang->program->create, '', "class='btn btn-primary create-program-btn'");
 
         $this->session->set('programList', $this->app->getURI(true), 'program');
@@ -449,7 +450,7 @@ class program extends control
      * @access public
      * @return void
      */
-    public function project($programID = 0, $browseType = 'all', $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
+    public function project($programID = 0, $browseType = 'doing', $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
     {
         $programID = $this->program->saveState($programID, $this->program->getPairs());
         setCookie("lastProgram", $programID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
diff --git a/module/program/lang/de.php b/module/program/lang/de.php
index a1cba5ed7f..86fcbcd233 100644
--- a/module/program/lang/de.php
+++ b/module/program/lang/de.php
@@ -138,7 +138,12 @@ $lang->program->statusList['doing']     = 'Doing';
 $lang->program->statusList['suspended'] = 'Suspended';
 $lang->program->statusList['closed']    = 'Closed';
 
-$lang->program->featureBar['all'] = 'All';
+$lang->program->featureBar['all']       = 'All';
+$lang->program->featureBar['undone']    = 'Unfinished';
+$lang->program->featureBar['wait']      = 'Waiting';
+$lang->program->featureBar['doing']     = 'Doing';
+$lang->program->featureBar['suspended'] = 'Suspended';
+$lang->program->featureBar['closed']    = 'Closed';
 
 $lang->program->kanban = new stdclass();
 $lang->program->kanban->common             = 'Program Kanban';
diff --git a/module/program/lang/en.php b/module/program/lang/en.php
index 0faba8cc93..44a8f7ac5d 100644
--- a/module/program/lang/en.php
+++ b/module/program/lang/en.php
@@ -138,7 +138,12 @@ $lang->program->statusList['doing']     = 'Doing';
 $lang->program->statusList['suspended'] = 'Suspended';
 $lang->program->statusList['closed']    = 'Closed';
 
-$lang->program->featureBar['all'] = 'All';
+$lang->program->featureBar['all']       = 'All';
+$lang->program->featureBar['undone']    = 'Unfinished';
+$lang->program->featureBar['wait']      = 'Waiting';
+$lang->program->featureBar['doing']     = 'Doing';
+$lang->program->featureBar['suspended'] = 'Suspended';
+$lang->program->featureBar['closed']    = 'Closed';
 
 $lang->program->kanban = new stdclass();
 $lang->program->kanban->common             = 'Program Kanban';
diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php
index 87392e2578..aac9e38cc5 100644
--- a/module/program/lang/fr.php
+++ b/module/program/lang/fr.php
@@ -138,7 +138,12 @@ $lang->program->statusList['doing']     = 'Doing';
 $lang->program->statusList['suspended'] = 'Suspended';
 $lang->program->statusList['closed']    = 'Closed';
 
-$lang->program->featureBar['all'] = 'All';
+$lang->program->featureBar['all']       = 'All';
+$lang->program->featureBar['undone']    = 'Non Terminées';
+$lang->program->featureBar['wait']      = 'En Attente';
+$lang->program->featureBar['doing']     = 'En Cours';
+$lang->program->featureBar['suspended'] = 'Suspendues';
+$lang->program->featureBar['closed']    = 'Fermées';
 
 $lang->program->kanban = new stdclass();
 $lang->program->kanban->common             = 'Program Kanban';
diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index 152c4ccf67..91c20bc491 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -138,7 +138,12 @@ $lang->program->statusList['doing']     = '进行中';
 $lang->program->statusList['suspended'] = '已挂起';
 $lang->program->statusList['closed']    = '已关闭';
 
-$lang->program->featureBar['all'] = '所有';
+$lang->program->featureBar['all']       = '所有';
+$lang->program->featureBar['undone']    = '未完成';
+$lang->program->featureBar['wait']      = '未开始';
+$lang->program->featureBar['doing']     = '进行中';
+$lang->program->featureBar['suspended'] = '已挂起';
+$lang->program->featureBar['closed']    = '已关闭';
 
 $lang->program->kanban = new stdclass();
 $lang->program->kanban->common             = '项目集看板';
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index 29b42f427f..37f289fddd 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -241,8 +241,9 @@ $lang->project->modelList['waterfall'] = "CMMI";
 $lang->project->modelList['kanban']    = "Kanban";
 
 $lang->project->featureBar['all']       = 'All';
-$lang->project->featureBar['doing']     = 'Doing';
+$lang->project->featureBar['undone']    = 'Unfinished';
 $lang->project->featureBar['wait']      = 'Waiting';
+$lang->project->featureBar['doing']     = 'Doing';
 $lang->project->featureBar['suspended'] = 'Suspended';
 $lang->project->featureBar['closed']    = 'Closed';
 
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index c914ed3dfb..f50941c77c 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -241,8 +241,9 @@ $lang->project->modelList['waterfall'] = "CMMI";
 $lang->project->modelList['kanban']    = "Kanban";
 
 $lang->project->featureBar['all']       = 'All';
-$lang->project->featureBar['doing']     = 'Doing';
+$lang->project->featureBar['undone']    = 'Unfinished';
 $lang->project->featureBar['wait']      = 'Waiting';
+$lang->project->featureBar['doing']     = 'Doing';
 $lang->project->featureBar['suspended'] = 'Suspended';
 $lang->project->featureBar['closed']    = 'Closed';
 
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index c9cae434e2..62d9a731db 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -241,10 +241,11 @@ $lang->project->modelList['waterfall'] = "CMMI";
 $lang->project->modelList['kanban']    = "Kanban";
 
 $lang->project->featureBar['all']       = 'All';
-$lang->project->featureBar['doing']     = 'Doing';
-$lang->project->featureBar['wait']      = 'Waiting';
-$lang->project->featureBar['suspended'] = 'Suspended';
-$lang->project->featureBar['closed']    = 'Closed';
+$lang->project->featureBar['undone']    = 'Non Terminées';
+$lang->project->featureBar['wait']      = 'En Attente';
+$lang->project->featureBar['doing']     = 'En Cours';
+$lang->project->featureBar['suspended'] = 'Suspendues';
+$lang->project->featureBar['closed']    = 'Fermées';
 
 $lang->project->aclList['private'] = 'Private (For team members and stakeholders only)';
 $lang->project->aclList['open']    = "Open (accessible with project view permissions)";
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 5cb3eb071a..04edb713da 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -241,8 +241,9 @@ $lang->project->modelList['waterfall'] = "瀑布";
 $lang->project->modelList['kanban']    = "看板";
 
 $lang->project->featureBar['all']       = '所有';
-$lang->project->featureBar['doing']     = '进行中';
+$lang->project->featureBar['undone']    = '未完成';
 $lang->project->featureBar['wait']      = '未开始';
+$lang->project->featureBar['doing']     = '进行中';
 $lang->project->featureBar['suspended'] = '已挂起';
 $lang->project->featureBar['closed']    = '已关闭';