*Finish task #45148.

This commit is contained in:
zhengrunyu
2021-11-29 09:29:44 +08:00
parent 9dac5358e3
commit b3c8ee7ccb
8 changed files with 25 additions and 17 deletions

View File

@@ -31,15 +31,17 @@ $lang->execution->canceledDate = 'CanceledDate';
$lang->execution->begin = 'Begin';
$lang->execution->end = 'End';
$lang->execution->dateRange = 'Duration';
$lang->execution->realBegan = 'Actual start';
$lang->execution->realEnd = 'Actual end';
$lang->execution->realBegan = 'Actual Begin';
$lang->execution->realBeganDate = 'Actual Begin';
$lang->execution->realEnd = 'Actual End';
$lang->execution->realEndDate = 'Actual End';
$lang->execution->to = 'To';
$lang->execution->days = 'Available Days';
$lang->execution->days = ' Days';
$lang->execution->day = ' Days';
$lang->execution->workHour = ' Hours';
$lang->execution->workHourUnit = 'H';
$lang->execution->totalHours = 'Available Hours';
$lang->execution->totalDays = 'Available Days';
$lang->execution->totalHours = ' Hours';
$lang->execution->totalDays = ' Days';
$lang->execution->status = $lang->executionCommon . 'Status';
$lang->execution->execStatus = 'Status';
$lang->execution->subStatus = 'Sub Status';
@@ -351,10 +353,10 @@ $lang->execution->unfinishedExecution = "This {$lang->executionCommon} h
$lang->execution->unfinishedTask = "[%s] unfinished tasks. ";
$lang->execution->unresolvedBug = "[%s] unresolved bugs. ";
$lang->execution->projectNotEmpty = 'Project cannot be empty.';
$lang->execution->realBeganNotEmpty = 'Real Began should not be empty.';
$lang->execution->realBeganNotFuture = 'Real Began should not be a feture date.';
$lang->execution->realEndNotEmpty = 'Real End should not be empty.';
$lang->execution->realEndNotFuture = 'Real End should not be a feture date.';
$lang->execution->realBeganNotEmpty = 'Actual begin should not be empty.';
$lang->execution->realBeganNotFuture = 'Actual begin should not be a future date.';
$lang->execution->realEndNotEmpty = 'Actual end should not be empty.';
$lang->execution->realEndNotFuture = 'Actual end should not be a future date.';
/* Statistics. */
$lang->execution->charts = new stdclass();

View File

@@ -33,6 +33,8 @@ $lang->execution->end = '计划完成';
$lang->execution->dateRange = '起始日期';
$lang->execution->realBegan = '实际开始';
$lang->execution->realEnd = '实际完成';
$lang->execution->realBeganDate = '实际开始日期';
$lang->execution->realEndDate = '实际完成日期';
$lang->execution->to = '至';
$lang->execution->days = '可用工作日';
$lang->execution->day = '天';

View File

@@ -31,7 +31,7 @@
</tr>
<?php $this->printExtendFields($execution, 'table');?>
<tr>
<th><?php echo $lang->execution->realEnd;?></th>
<th><?php echo $lang->execution->realEndDate;?></th>
<td>
<div class='w-150px'>
<?php echo html::input('realEnd',(!empty($execution->realEnd) && $execution->realEnd != '0000-00-00' ? $execution->realEnd : date('Y-m-d')), "class='form-control form-date' required");?>

View File

@@ -30,7 +30,7 @@
<th><?php echo $lang->execution->realBegan;?></th>
<td>
<div class = 'w-150px'>
<?php echo html::input('realBegan',(!empty($execution->realBegan) && $execution->realBegan != '0000-00-00' ? $execution->realBegan : date('Y-m-d')), "class='form-control form-date' required");?>
<?php echo html::input('realBegan',(!empty($execution->realBeganDate) && $execution->realBegan != '0000-00-00' ? $execution->realBegan : date('Y-m-d')), "class='form-control form-date' required");?>
</div>
</td>
</tr>

View File

@@ -24,7 +24,7 @@ $lang->program->canceledBy = 'CanceledBy';
$lang->program->canceledDate = 'CanceledDate';
$lang->program->team = 'Team';
$lang->program->order = 'Rank';
$lang->program->days = 'Available Days';
$lang->program->days = 'Days';
$lang->program->acl = 'Access Control';
$lang->program->whitelist = 'WhiteList';
$lang->program->deleted = 'Deleted';

View File

@@ -109,7 +109,9 @@ $lang->project->progress = 'Progress';
$lang->project->dateRange = 'Duration';
$lang->project->to = ' to ';
$lang->project->realEnd = 'Actual End';
$lang->project->realBegan = 'Actual Began';
$lang->project->realBegan = 'Actual Begin';
$lang->project->realEndDate = 'Actual End';
$lang->project->realBeganDate = 'Actual Begin';
$lang->project->bygrid = 'Kanban';
$lang->project->bylist = 'List';
$lang->project->bycard = 'Card';
@@ -146,7 +148,7 @@ $lang->project->teamSumCount = '%s people in total';
$lang->project->longTime = 'Long-Term Program';
$lang->project->future = 'TBD';
$lang->project->moreProject = 'More Project';
$lang->project->days = 'Available Days';
$lang->project->days = 'Days';
$lang->project->mailto = 'Mailto';
$lang->project->etc = " , etc";
$lang->project->product = 'Product';
@@ -177,8 +179,8 @@ $lang->project->createExecution = "There is no {$lang->executionCommon} u
$lang->project->unlinkExecutionMember = "The user participated in %s executions such as %s%s. Do you want to remove the user from those executions as well? (The data related to this user will not be deleted.)";
$lang->project->unlinkExecutionMembers = "The team members you are removing are also in the execution team of this project. Do you want to remove them from the execution team too?";
$lang->project->realEndNotEmpty = 'Real End should not be empty.';
$lang->project->realEndNotFuture = 'Real End should not be a feture date.';
$lang->project->realEndNotEmpty = 'Actual End should not be empty.';
$lang->project->realEndNotFuture = 'Actual End should not be a future date.';
$lang->project->tenThousand = '';

View File

@@ -110,6 +110,8 @@ $lang->project->dateRange = '起止日期';
$lang->project->to = '至';
$lang->project->realEnd = '实际完成';
$lang->project->realBegan = '实际开始';
$lang->project->realEndDate = '实际完成日期';
$lang->project->realBeganDate = '实际开始日期';
$lang->project->bygrid = '看板';
$lang->project->bylist = '列表';
$lang->project->bycard = '卡片';

View File

@@ -31,7 +31,7 @@
</tr>
<?php $this->printExtendFields($project, 'table');?>
<tr>
<th><?php echo $lang->project->realEnd;?></th>
<th><?php echo $lang->project->realEndDate;?></th>
<td>
<div class='w-150px'>
<?php echo html::input('realEnd',(!empty($project->realEnd) && $project->realEnd != '0000-00-00' ? $project->realEnd : date('Y-m-d')), "class='form-control form-date' required");?>