diff --git a/module/common/lang/de.php b/module/common/lang/de.php index ad0b368951..04a8f57fd9 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -528,7 +528,7 @@ $lang->error->date = "『%s』should be valid date."; $lang->error->datetime = "『%s』should be valid date."; $lang->error->code = "『%s』should be letters or numbers."; $lang->error->account = "『%s』should be valid account."; -$lang->error->passwordsame = "Two passwords should be consistent."; +$lang->error->passwordsame = "The password input is inconsistent."; $lang->error->passwordrule = "Password should follow rules. It must be at least 6 characters."; $lang->error->accessDenied = 'Access is denied.'; $lang->error->pasteImg = 'Image is not allowed to be pasted in your browser!'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 01237576a5..86bac80496 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -528,7 +528,7 @@ $lang->error->date = "『%s』should be valid date."; $lang->error->datetime = "『%s』should be valid date."; $lang->error->code = "『%s』should be letters or numbers."; $lang->error->account = "『%s』should be >= 3 letters or numbers."; -$lang->error->passwordsame = "Passwords should be consistent."; +$lang->error->passwordsame = "The password input is inconsistent."; $lang->error->passwordrule = "Password should conform to rules. It should be >= 6 characters."; $lang->error->accessDenied = 'Access is denied.'; $lang->error->pasteImg = 'Images are not allowed to be pasted in your browser!'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 31d01e98ca..ca726018f9 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -528,7 +528,7 @@ $lang->error->date = "『%s』should be valid date."; $lang->error->datetime = "『 %s 』should be valid date."; $lang->error->code = "『 %s 』should be letters or numbers."; $lang->error->account = "『 %s 』should be >= 3 letters or numbers."; -$lang->error->passwordsame = "Passwords should be consistent."; +$lang->error->passwordsame = "The password input is inconsistent."; $lang->error->passwordrule = "Password should conform to rules. It should be >= 6 characters."; $lang->error->accessDenied = 'Access is denied.'; $lang->error->pasteImg = 'Images are not allowed to be pasted in your browser!'; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index c59c840b3b..443f355ece 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -528,7 +528,7 @@ $lang->error->date = "『%s』should be valid date."; $lang->error->datetime = "『%s』should be valid date."; $lang->error->code = "『%s』nên là chữ hoặc số."; $lang->error->account = "『%s』should be >= 3 letters or numbers."; -$lang->error->passwordsame = "Passwords should be consistent."; +$lang->error->passwordsame = "The password input is inconsistent."; $lang->error->passwordrule = "Password should conform to rules. It should be >= 6 characters."; $lang->error->accessDenied = 'Truy cập bị từ chối.'; $lang->error->pasteImg = 'Images are not allowed to be pasted in your browser!'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 373528c7ad..7acc235484 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -528,7 +528,7 @@ $lang->error->date = "『%s』应当为合法的日期。"; $lang->error->datetime = "『%s』应当为合法的日期。"; $lang->error->code = "『%s』应当为字母或数字的组合。"; $lang->error->account = "『%s』只能是字母和数字的组合三位以上。"; -$lang->error->passwordsame = "两次密码应当相等。"; +$lang->error->passwordsame = "密码输入不一致。"; $lang->error->passwordrule = "密码应该符合规则,长度至少为六位。"; $lang->error->accessDenied = '您没有访问权限'; $lang->error->pasteImg = '您的浏览器不支持粘贴图片!'; diff --git a/module/story/view/batchclose.html.php b/module/story/view/batchclose.html.php index f961c042dc..2815cf19f4 100755 --- a/module/story/view/batchclose.html.php +++ b/module/story/view/batchclose.html.php @@ -21,11 +21,11 @@
"> - + - + - + @@ -39,7 +39,7 @@
idAB;?> story->title;?>story->title;?> story->status;?>story->closedReason;?>story->closedReason;?> story->comment;?>
- story->reasonList, 'done', "class=form-control onchange=setDuplicateAndChild(this.value,$storyID) style='min-width: 70px'");?> + story->reasonList, 'done', "class=form-control onchange=setDuplicateAndChild(this.value,$storyID) style='min-width: 80px'");?> ' closedReason != 'duplicate') echo "style='display:none'";?>> idAB}'");?> diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 5c28c04036..1c8e9a873c 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -47,7 +47,7 @@ $lang->task->case = '相关用例'; $lang->task->confirmStoryChange = "确认{$lang->storyCommon}变动"; $lang->task->storyChange = "{$lang->storyCommon}变更"; $lang->task->progress = '进度'; -$lang->task->progressAB = '%'; +$lang->task->progressAB = '进度'; $lang->task->progressTips = '已消耗/(已消耗+剩余)'; $lang->task->copy = '复制任务'; $lang->task->waitTask = '未开始的任务'; diff --git a/module/task/model.php b/module/task/model.php index 6d228740d5..93e573fb50 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1420,6 +1420,7 @@ class taskModel extends model { $oldTask = $this->getById($taskID); $now = helper::now(); + $today = helper::today(); if(strpos($this->config->task->finish->requiredFields, 'comment') !== false and !$this->post->comment) { @@ -1429,6 +1430,7 @@ class taskModel extends model $task = fixer::input('post') ->setIF(is_numeric($this->post->consumed), 'consumed', (float)$this->post->consumed) + ->setIF($oldTask->realStarted == '0000-00-00', 'realStarted', $today) ->setDefault('left', 0) ->setDefault('assignedTo', $oldTask->openedBy) ->setDefault('assignedDate', $now) diff --git a/module/testtask/model.php b/module/testtask/model.php index 728195b8cd..6e66d463d3 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1446,7 +1446,7 @@ class testtaskModel extends model break; case 'title': if($run->branch) echo "{$branches[$run->branch]}"; - echo $canView ? html::a($caseLink, $run->title) : $run->title; + echo $canView ? html::a($caseLink, $run->title, null, "style='color: $run->color'") : $run->title; break; case 'branch': echo $branches[$run->branch];