diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 487f50a0d4..ff292ae8d7 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -62,7 +62,7 @@ $lang->block->createdDocs = '创建的文档数'; $lang->block->allProject = '所有' . $lang->executionCommon; $lang->block->doingProject = '进行中的' . $lang->executionCommon; $lang->block->finishProject = '累积' . $lang->executionCommon; -$lang->block->estimatedHours = '预计工时'; +$lang->block->estimatedHours = '预计'; $lang->block->consumedHours = '已消耗'; $lang->block->time = '第'; $lang->block->week = '周'; diff --git a/module/block/view/scrumlistblock.html.php b/module/block/view/scrumlistblock.html.php index 1ef46160d8..eeb84d76c3 100644 --- a/module/block/view/scrumlistblock.html.php +++ b/module/block/view/scrumlistblock.html.php @@ -51,9 +51,9 @@ - hours->totalEstimate;?> - hours->totalConsumed;?> - hours->totalLeft;?> + hours->totalEstimate . ' ' . $config->hourUnit;?> + hours->totalConsumed . ' ' . $config->hourUnit;?> + hours->totalLeft . ' ' . $config->hourUnit;?>
diff --git a/module/block/view/scrumoverviewblock.html.php b/module/block/view/scrumoverviewblock.html.php index d5ac5ada73..40ebdfcb37 100644 --- a/module/block/view/scrumoverviewblock.html.php +++ b/module/block/view/scrumoverviewblock.html.php @@ -41,7 +41,7 @@ consumed ? html::a($this->createLink('project', 'index', 'locate=no'), $totalData[$projectID]->consumed) : 0;?>
- block->estimatedHours;?> estimate;?> + block->estimatedHours;?> estimate . ' ' . $config->hourUnit;?>
diff --git a/module/common/model.php b/module/common/model.php index ede6ac6fd4..bf672888f3 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -285,7 +285,7 @@ class commonModel extends model { $noRole = (!empty($app->user->role) && isset($lang->user->roleList[$app->user->role])) ? '' : ' no-role'; echo '
  • '; - echo "'; + echo "'; echo "
    "; echo $app->user->avatar ? html::image($app->user->avatar) : strtoupper($app->user->account[0]); echo "
    \n";