Merge branch 'master' into 'sprint/master_tanghucheng_project'

# Conflicts:
#   module/programplan/lang/en.php
This commit is contained in:
孙广明
2021-12-07 00:38:58 +00:00
83 changed files with 907 additions and 683 deletions
+1 -1
View File
@@ -51,12 +51,12 @@ $lang->programplan->exporting = 'Exporting';
$lang->programplan->exportFail = 'Failed';
$lang->programplan->hideCriticalPath = 'Hide Critical Path';
$lang->programplan->showCriticalPath = 'Show Critical Path';
$lang->programplan->errorEnd = "Project end date: %s, end date should be <= project end date.";
$lang->programplan->errorBegin = "Project begin date: %s, begin date should be >= project begin date.";
$lang->programplan->emptyBegin = '『Begin』should not be blank';
$lang->programplan->emptyEnd = '『End』should not be blank';
$lang->programplan->checkBegin = '『Begin』should be valid date';
$lang->programplan->checkEnd = '『End』should be valid date';
$lang->programplan->errorEnd = "Project end date: %s, end date should be <= project end date.";
$lang->programplan->milestoneList[1] = 'Yes';
$lang->programplan->milestoneList[0] = 'No';