From 5812bb99cb6d66b5d1f6f341334a1e12a9d97572 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Wed, 30 Mar 2022 11:35:15 +0800
Subject: [PATCH 1/3] *Fixbug #19687

---
 module/program/lang/zh-cn.php            | 5 +++++
 module/program/view/stakeholder.html.php | 2 +-
 module/stakeholder/lang/zh-cn.php        | 4 ++--
 module/stakeholder/view/browse.html.php  | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index c38753ce88..e5e0208c18 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -13,6 +13,7 @@ $lang->program->begin        = '计划开始';
 $lang->program->end          = '计划完成';
 $lang->program->stage        = '阶段';
 $lang->program->type         = '类型';
+$lang->program->from         = '干系人类型';
 $lang->program->pri          = '优先级';
 $lang->program->parent       = '父项目集';
 $lang->program->exchangeRate = '汇率';
@@ -75,6 +76,10 @@ $lang->program->isStakeholderKey = '关键干系人';
 $lang->program->stakeholderTypeList['inside']  = '内部';
 $lang->program->stakeholderTypeList['outside'] = '外部';
 
+$lang->program->stakeholderFromList['team']    = '项目团队成员';
+$lang->program->stakeholderFromList['company'] = '公司同事';
+$lang->program->stakeholderFromList['outside'] = '外部人员';
+
 $lang->program->noProgram          = '暂时没有项目集';
 $lang->program->showClosed         = '显示已关闭';
 $lang->program->tips               = '选择了父项目集，则可关联该父项目集下的产品。如果项目未选择任何项目集，则系统会默认创建一个和该项目同名的产品并关联该项目。';
diff --git a/module/program/view/stakeholder.html.php b/module/program/view/stakeholder.html.php
index 74b51fbcbf..5601f29230 100644
--- a/module/program/view/stakeholder.html.php
+++ b/module/program/view/stakeholder.html.php
@@ -51,7 +51,7 @@
           <?php $isKey = $stakeholder->key ? " <i class='icon icon-star-empty'></i>" : '';?>
           <?php $title = $stakeholder->key ? $lang->program->isStakeholderKey : '';?>
           <td title="<?php echo $title;?>"><?php echo $stakeholder->realname . $isKey;?></td>
-          <td title='<?php echo zget($lang->program->stakeholderTypeList, $stakeholder->type, '');?>'><?php echo zget($lang->program->stakeholderTypeList, $stakeholder->type, '');?></td>
+          <td title='<?php echo zget($lang->program->stakeholderFromList, $stakeholder->from, '');?>'><?php echo zget($lang->program->stakeholderFromList, $stakeholder->from, '');?></td>
           <td><?php echo zget($lang->user->roleList, $stakeholder->role, '');?></td>
           <td title="<?php echo $stakeholder->phone;?>"><?php echo $stakeholder->phone;?></td>
           <td title="<?php echo $stakeholder->qq;?>"><?php echo $stakeholder->qq;?></td>
diff --git a/module/stakeholder/lang/zh-cn.php b/module/stakeholder/lang/zh-cn.php
index e59da0129a..8e5b132015 100644
--- a/module/stakeholder/lang/zh-cn.php
+++ b/module/stakeholder/lang/zh-cn.php
@@ -33,7 +33,7 @@ $lang->stakeholder->viewIssueAction = '问题列表';
 /* Fields. */
 $lang->stakeholder->id          = '编号';
 $lang->stakeholder->user        = '用户';
-$lang->stakeholder->type        = '类型';
+$lang->stakeholder->type        = '用户类型';
 $lang->stakeholder->name        = '姓名';
 $lang->stakeholder->phone       = '手机';
 $lang->stakeholder->qq          = 'QQ';
@@ -42,7 +42,7 @@ $lang->stakeholder->email       = '邮箱';
 $lang->stakeholder->isKey       = '关键干系人';
 $lang->stakeholder->inside      = '内部干系人';
 $lang->stakeholder->outside     = '外部干系人';
-$lang->stakeholder->from        = '类型';
+$lang->stakeholder->from        = '干系人类型';
 $lang->stakeholder->company     = '所属公司';
 $lang->stakeholder->nature      = '性格特征';
 $lang->stakeholder->analysis    = '影响分析';
diff --git a/module/stakeholder/view/browse.html.php b/module/stakeholder/view/browse.html.php
index 9647151380..f51394f4b6 100644
--- a/module/stakeholder/view/browse.html.php
+++ b/module/stakeholder/view/browse.html.php
@@ -47,7 +47,7 @@
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
           <th class="c-name"><?php echo $lang->stakeholder->name;?></th>
-          <th class="c-type"><?php echo $lang->stakeholder->common . $lang->stakeholder->type;?></th>
+          <th class="c-type"><?php echo $lang->stakeholder->from;?></th>
           <th class="c-phone"><?php echo $lang->stakeholder->phone;?></th>
           <th class="c-qq"><?php echo $lang->stakeholder->qq;?></th>
           <th class="c-weixin"><?php echo $lang->stakeholder->weixin;?></th>
@@ -69,7 +69,7 @@
           <?php else:?>
           <td title='<?php echo $stakeholder->name;?>'><?php echo $stakeholder->name . $isKey;?></td>
           <?php endif;?>
-          <td title='<?php echo zget($lang->stakeholder->typeList, $stakeholder->type, '');?>'><?php echo zget($lang->stakeholder->typeList, $stakeholder->type, '');?></td>
+          <td title='<?php echo zget($lang->stakeholder->fromList, $stakeholder->from, '');?>'><?php echo zget($lang->stakeholder->fromList, $stakeholder->from, '');?></td>
           <td title="<?php echo $stakeholder->phone;?>"><?php echo $stakeholder->phone;?></td>
           <td title="<?php echo $stakeholder->qq;?>"><?php echo $stakeholder->qq;?></td>
           <td title="<?php echo $stakeholder->weixin;?>"><?php echo $stakeholder->weixin;?></td>

From 6fa5c475a81b41c8442d636bb130b7588af864b7 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Wed, 30 Mar 2022 15:27:20 +0800
Subject: [PATCH 2/3] *Fixbug #19687

---
 module/program/lang/en.php     | 5 +++++
 module/stakeholder/lang/en.php | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/module/program/lang/en.php b/module/program/lang/en.php
index 31568de285..90b93fee24 100644
--- a/module/program/lang/en.php
+++ b/module/program/lang/en.php
@@ -13,6 +13,7 @@ $lang->program->begin        = 'Begin';
 $lang->program->end          = 'End';
 $lang->program->stage        = 'Stage';
 $lang->program->type         = 'Type';
+$lang->program->from         = 'Stakeholder Type';
 $lang->program->pri          = 'Priority';
 $lang->program->parent       = 'Parent';
 $lang->program->exchangeRate = 'Exchange Rate';
@@ -75,6 +76,10 @@ $lang->program->isStakeholderKey = 'Key stakeholder';
 $lang->program->stakeholderTypeList['inside']  = 'Inside';
 $lang->program->stakeholderTypeList['outside'] = 'Outside';
 
+$lang->program->stakeholderFromList['team']    = 'Project Team';
+$lang->program->stakeholderFromList['company'] = 'Internal';
+$lang->program->stakeholderFromList['outside'] = 'External';
+
 $lang->program->noProgram          = 'No program.';
 $lang->program->showClosed         = 'Closed';
 $lang->program->tips               = 'If a parent program is selected, the products under the parent program can be associated. If no program is selected for the project, a product with the same name as the project is created and associated with the project by default.';
diff --git a/module/stakeholder/lang/en.php b/module/stakeholder/lang/en.php
index ebe2002d9f..6909e0f42c 100644
--- a/module/stakeholder/lang/en.php
+++ b/module/stakeholder/lang/en.php
@@ -33,7 +33,7 @@ $lang->stakeholder->viewIssueAction = 'Issue List';
 /* Fields. */
 $lang->stakeholder->id          = 'ID';
 $lang->stakeholder->user        = 'User';
-$lang->stakeholder->type        = 'Type';
+$lang->stakeholder->type        = 'User Type';
 $lang->stakeholder->name        = 'Name';
 $lang->stakeholder->phone       = 'Mobile';
 $lang->stakeholder->qq          = 'QQ';
@@ -42,7 +42,7 @@ $lang->stakeholder->email       = 'EMail';
 $lang->stakeholder->isKey       = 'Key Stakeholder';
 $lang->stakeholder->inside      = 'Internal Stakeholder';
 $lang->stakeholder->outside     = 'External Stakeholder';
-$lang->stakeholder->from        = 'Type';
+$lang->stakeholder->from        = 'Stakeholder Type';
 $lang->stakeholder->company     = 'Company';
 $lang->stakeholder->nature      = 'Personality';
 $lang->stakeholder->analysis    = 'Impact Analysis';

From 83507debe86fc6c736370cef74baab42018a8d83 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Wed, 30 Mar 2022 20:15:16 +0800
Subject: [PATCH 3/3] *Fixbug #19687

---
 module/program/control.php               | 1 +
 module/program/lang/en.php               | 5 -----
 module/program/lang/zh-cn.php            | 5 -----
 module/program/view/stakeholder.html.php | 2 +-
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/module/program/control.php b/module/program/control.php
index 72f7c663dc..4292c2ca37 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -464,6 +464,7 @@ class program extends control
      */
     public function stakeholder($programID = 0, $orderBy = 't1.id_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
     {
+        $this->app->loadLang('stakeholder');
         $this->program->setMenu($programID);
 
         /* Load pager and get tasks. */
diff --git a/module/program/lang/en.php b/module/program/lang/en.php
index 90b93fee24..31568de285 100644
--- a/module/program/lang/en.php
+++ b/module/program/lang/en.php
@@ -13,7 +13,6 @@ $lang->program->begin        = 'Begin';
 $lang->program->end          = 'End';
 $lang->program->stage        = 'Stage';
 $lang->program->type         = 'Type';
-$lang->program->from         = 'Stakeholder Type';
 $lang->program->pri          = 'Priority';
 $lang->program->parent       = 'Parent';
 $lang->program->exchangeRate = 'Exchange Rate';
@@ -76,10 +75,6 @@ $lang->program->isStakeholderKey = 'Key stakeholder';
 $lang->program->stakeholderTypeList['inside']  = 'Inside';
 $lang->program->stakeholderTypeList['outside'] = 'Outside';
 
-$lang->program->stakeholderFromList['team']    = 'Project Team';
-$lang->program->stakeholderFromList['company'] = 'Internal';
-$lang->program->stakeholderFromList['outside'] = 'External';
-
 $lang->program->noProgram          = 'No program.';
 $lang->program->showClosed         = 'Closed';
 $lang->program->tips               = 'If a parent program is selected, the products under the parent program can be associated. If no program is selected for the project, a product with the same name as the project is created and associated with the project by default.';
diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index e5e0208c18..c38753ce88 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -13,7 +13,6 @@ $lang->program->begin        = '计划开始';
 $lang->program->end          = '计划完成';
 $lang->program->stage        = '阶段';
 $lang->program->type         = '类型';
-$lang->program->from         = '干系人类型';
 $lang->program->pri          = '优先级';
 $lang->program->parent       = '父项目集';
 $lang->program->exchangeRate = '汇率';
@@ -76,10 +75,6 @@ $lang->program->isStakeholderKey = '关键干系人';
 $lang->program->stakeholderTypeList['inside']  = '内部';
 $lang->program->stakeholderTypeList['outside'] = '外部';
 
-$lang->program->stakeholderFromList['team']    = '项目团队成员';
-$lang->program->stakeholderFromList['company'] = '公司同事';
-$lang->program->stakeholderFromList['outside'] = '外部人员';
-
 $lang->program->noProgram          = '暂时没有项目集';
 $lang->program->showClosed         = '显示已关闭';
 $lang->program->tips               = '选择了父项目集，则可关联该父项目集下的产品。如果项目未选择任何项目集，则系统会默认创建一个和该项目同名的产品并关联该项目。';
diff --git a/module/program/view/stakeholder.html.php b/module/program/view/stakeholder.html.php
index 5601f29230..86a6ebe8d4 100644
--- a/module/program/view/stakeholder.html.php
+++ b/module/program/view/stakeholder.html.php
@@ -51,7 +51,7 @@
           <?php $isKey = $stakeholder->key ? " <i class='icon icon-star-empty'></i>" : '';?>
           <?php $title = $stakeholder->key ? $lang->program->isStakeholderKey : '';?>
           <td title="<?php echo $title;?>"><?php echo $stakeholder->realname . $isKey;?></td>
-          <td title='<?php echo zget($lang->program->stakeholderFromList, $stakeholder->from, '');?>'><?php echo zget($lang->program->stakeholderFromList, $stakeholder->from, '');?></td>
+          <td title='<?php echo zget($lang->stakeholder->fromList, $stakeholder->from, '');?>'><?php echo zget($lang->stakeholder->fromList, $stakeholder->from, '');?></td>
           <td><?php echo zget($lang->user->roleList, $stakeholder->role, '');?></td>
           <td title="<?php echo $stakeholder->phone;?>"><?php echo $stakeholder->phone;?></td>
           <td title="<?php echo $stakeholder->qq;?>"><?php echo $stakeholder->qq;?></td>