Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8

This commit is contained in:
daitingting
2018-04-04 14:40:00 +08:00
13 changed files with 71 additions and 20 deletions
+1 -1
View File
@@ -109,7 +109,7 @@ $lang->task->parent = '父任务';
$lang->task->parentAB = '父';
$lang->task->lblPri = 'P';
$lang->task->lblHour = '(h)';
$lang->task->deniedNotice = '当前任务只有%s才可以 %s';
$lang->task->deniedNotice = '当前任务只有%s才可以%s';
$lang->task->ditto = '同上';
$lang->task->dittoNotice = "该任务与上一任务不属于同一项目!";
+1 -1
View File
@@ -19,7 +19,7 @@
<div class="alert with-icon">
<i class="icon-info-sign"></i>
<div class="content">
<p><?php echo sprintf($lang->task->deniedNotice, $task->assignedTo, $lang->task->start);?></p>
<p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->start);?></p>
</div>
</div>
<?php else:?>