diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 69692b6a35..87de0512cc 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -168,7 +168,7 @@ $lang->project->aboveAllProject = "All the above {$lang->projectCommon}"; $lang->project->selectProject = "Select {$lang->projectCommon}"; $lang->project->beginAndEnd = 'Time Frame'; $lang->project->lblStats = 'Man-Hour Report'; -$lang->project->stats = 'Available %s man-hour
Estimated total %s man-hour
Consumed %s man-hour
Estimated remained %s man-hour'; +$lang->project->stats = 'Available %s man-hour, Estimated total %s man-hour, Consumed %s man-hour, Estimated remained %s man-hour'; $lang->project->taskSummary = " %s Tasks on this page, Pending %s Doing %s Total estimated %s man-hour Consumed %s man-hour remained %s man-hour"; $lang->project->memberHours = "%s has %s man-hour available "; $lang->project->groupSummary = "%s Tasks in this group Pending %s Doing %s Total estimated %s man-hour Consumed %s man-hour remained %s man-hour"; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 3f063e3fa4..364a37ab7d 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -168,7 +168,7 @@ $lang->project->aboveAllProject = "以上所有{$lang->projectCommon}"; $lang->project->selectProject = "请选择{$lang->projectCommon}"; $lang->project->beginAndEnd = '起止时间'; $lang->project->lblStats = '工时统计'; -$lang->project->stats = '可用工时%s工时
总共预计%s工时
已经消耗%s工时
预计剩余%s工时'; +$lang->project->stats = '可用工时%s工时,总共预计%s工时,已经消耗%s工时,预计剩余%s工时'; $lang->project->taskSummary = "本页共 %s 个任务,未开始 %s,进行中 %s,总预计%s工时,已消耗%s工时,剩余%s工时。"; $lang->project->memberHours = "%s共有 %s 个可用工时,"; $lang->project->groupSummary = "本组共 %s 个任务,未开始 %s,进行中 %s,总预计%s工时,已消耗%s工时,剩余%s工时。"; diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index 5971fd778d..a722fe4457 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -56,16 +56,13 @@
project->desc;?> -
desc;?>
-
-
- project->otherInfo?> - - - - - -
project->lblStats;?>project->stats, $project->totalHours, $project->totalEstimate, $project->totalConsumed, $project->totalLeft, 10)?>
+
+ desc;?> +
+ + project->stats, $project->totalHours, $project->totalEstimate, $project->totalConsumed, $project->totalLeft, 10)?> +
+
deleted) echo $actionLinks;?>