From 93e753b39e66ada40ab1c3c2d7e73c75f36cfa43 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Tue, 31 May 2022 06:03:37 +0000
Subject: [PATCH] * Finish task #55619 #55626.

---
 module/execution/view/team.html.php | 2 +-
 module/project/lang/en.php          | 2 +-
 module/project/lang/zh-cn.php       | 2 +-
 module/project/view/team.html.php   | 7 +++++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/module/execution/view/team.html.php b/module/execution/view/team.html.php
index 0b5e4c46d0..679ca3b027 100644
--- a/module/execution/view/team.html.php
+++ b/module/execution/view/team.html.php
@@ -105,7 +105,7 @@
       </tbody>
     </table>
     <div class='table-footer'>
-      <div class='table-statistic'><?php echo $lang->team->totalHours . '：' .  "<strong>$totalHours{$lang->execution->workHour}" . ', ' . sprintf($lang->project->teamMembersCount, count($teamMembers)) . "</strong>";?></div>
+      <div class='table-statistic'><?php echo $lang->team->totalHours . '：' .  "<strong>$totalHours{$lang->execution->workHour}" . sprintf($lang->project->teamMembersCount, count($teamMembers)) . "</strong>";?></div>
     </div>
   </form>
   <?php endif;?>
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 555ec61a7a..d1a16a3a96 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -59,7 +59,7 @@ $lang->project->copyTeamTitle      = 'Select a project team to copy';
 $lang->project->daysGreaterProject = 'Days cannot be greater than days of project『%s』';
 $lang->project->errorHours         = 'Hours/Day cannot be greater than『24』';
 $lang->project->workdaysExceed     = 'No more than『%s』working days';
-$lang->project->teamMembersCount   = 'there are %s team members.';
+$lang->project->teamMembersCount   = ', there are %s team members.';
 
 /* Fields. */
 $lang->project->common             = 'Project';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 960a824387..239bc43e71 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -59,7 +59,7 @@ $lang->project->copyTeamTitle      = '选择一个项目团队来复制';
 $lang->project->daysGreaterProject = '可用工日不能大于项目的可用工日『%s』';
 $lang->project->errorHours         = '可用工时/天不能大于『24』';
 $lang->project->workdaysExceed     = '可用工作日不能超过『%s』天';
-$lang->project->teamMembersCount   = '团队成员共%s人。';
+$lang->project->teamMembersCount   = '，团队成员共%s人。';
 
 /* Fields. */
 $lang->project->common             = '项目';
diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php
index cca560b7bb..527dac4e7f 100644
--- a/module/project/view/team.html.php
+++ b/module/project/view/team.html.php
@@ -15,7 +15,10 @@
 <?php js::set('noAccess', $lang->user->error->noAccess)?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->project->teamMember;?><span class="label label-light label-badge"><?php echo count($teamMembers);?></span></span></span>
+    <span class='btn btn-link btn-active-text'>
+      <span class='text'><?php echo $lang->project->teamMember;?></span>
+      <span class="label label-light label-badge"><?php echo count($teamMembers);?></span>
+    </span>
   </div>
   <div class='btn-toolbar pull-right'>
     <?php
@@ -101,7 +104,7 @@
       </tbody>
     </table>
     <div class='table-footer'>
-      <div class='table-statistic'><?php echo $lang->team->totalHours . '：' .  "<strong>$totalHours{$lang->execution->workHour}" . ', ' . sprintf($lang->project->teamMembersCount, count($teamMembers)) . "</strong>";?></div>
+      <div class='table-statistic'><?php echo $lang->team->totalHours . '：' .  "<strong>$totalHours{$lang->execution->workHour}" . sprintf($lang->project->teamMembersCount, count($teamMembers)) . "</strong>";?></div>
     </div>
   </form>
   <?php endif;?>