@@ -105,7 +107,9 @@
|
-
+
+
+ save, 'onclick="saveMemebers()" id="saveBtn"', 'btn btn-wide btn-primary') . html::backButton();?>
|
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index 96df6f4b10..9d938a30fd 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -104,7 +104,7 @@
echo $this->buildOperateMenu($project, 'view');
echo "";
- common::printIcon('project', 'edit', $params, $project, 'button', 'edit', '', '', '', '', $lang->edit);
+ common::printIcon('project', 'edit', $params . '&from=view', $project, 'button', 'edit', '', '', '', '', $lang->edit);
common::printIcon('project', 'delete', $params, $project, 'button', 'trash', 'hiddenwin', '', '', '', $lang->delete);
}
?>
diff --git a/module/projectstory/lang/de.php b/module/projectstory/lang/de.php
index 7b09c2ee11..76bcec4a00 100644
--- a/module/projectstory/lang/de.php
+++ b/module/projectstory/lang/de.php
@@ -14,7 +14,7 @@ $lang->projectstory->confirm = 'Confirm';
/* Notice. */
$lang->projectstory->whyNoStories = "No story can be linked. Please check whether there is any story in project which is linked to {$lang->productCommon} and make sure it has been reviewed.";
-$lang->projectstory->batchUnlinkTip = 'The following requirements are linked to Executions of this project, please remove them from the execution first.';
+$lang->projectstory->batchUnlinkTip = 'Other requirements are removed. The following requirements are linked to the execution of this project. Please remove them from the execution first.';
global $app;
$app->loadLang('product');
diff --git a/module/projectstory/lang/en.php b/module/projectstory/lang/en.php
index 63b23943d0..c6a62b731d 100644
--- a/module/projectstory/lang/en.php
+++ b/module/projectstory/lang/en.php
@@ -14,7 +14,7 @@ $lang->projectstory->confirm = 'Confirm';
/* Notice. */
$lang->projectstory->whyNoStories = "No story can be linked. Please check whether there is any story in project which is linked to {$lang->productCommon} and make sure it has been reviewed.";
-$lang->projectstory->batchUnlinkTip = 'The following requirements are linked to Executions of this project, please remove them from the execution first.';
+$lang->projectstory->batchUnlinkTip = 'Other requirements are removed. The following requirements are linked to the execution of this project. Please remove them from the execution first.';
global $app;
$app->loadLang('product');
diff --git a/module/projectstory/lang/fr.php b/module/projectstory/lang/fr.php
index 63b23943d0..c6a62b731d 100644
--- a/module/projectstory/lang/fr.php
+++ b/module/projectstory/lang/fr.php
@@ -14,7 +14,7 @@ $lang->projectstory->confirm = 'Confirm';
/* Notice. */
$lang->projectstory->whyNoStories = "No story can be linked. Please check whether there is any story in project which is linked to {$lang->productCommon} and make sure it has been reviewed.";
-$lang->projectstory->batchUnlinkTip = 'The following requirements are linked to Executions of this project, please remove them from the execution first.';
+$lang->projectstory->batchUnlinkTip = 'Other requirements are removed. The following requirements are linked to the execution of this project. Please remove them from the execution first.';
global $app;
$app->loadLang('product');
diff --git a/module/projectstory/lang/vi.php b/module/projectstory/lang/vi.php
index 63b23943d0..c6a62b731d 100644
--- a/module/projectstory/lang/vi.php
+++ b/module/projectstory/lang/vi.php
@@ -14,7 +14,7 @@ $lang->projectstory->confirm = 'Confirm';
/* Notice. */
$lang->projectstory->whyNoStories = "No story can be linked. Please check whether there is any story in project which is linked to {$lang->productCommon} and make sure it has been reviewed.";
-$lang->projectstory->batchUnlinkTip = 'The following requirements are linked to Executions of this project, please remove them from the execution first.';
+$lang->projectstory->batchUnlinkTip = 'Other requirements are removed. The following requirements are linked to the execution of this project. Please remove them from the execution first.';
global $app;
$app->loadLang('product');
diff --git a/module/projectstory/lang/zh-cn.php b/module/projectstory/lang/zh-cn.php
index c0f149bbff..e12901f18e 100644
--- a/module/projectstory/lang/zh-cn.php
+++ b/module/projectstory/lang/zh-cn.php
@@ -14,7 +14,7 @@ $lang->projectstory->confirm = '确定';
/* Notice. */
$lang->projectstory->whyNoStories = "看起来没有{$lang->SRCommon}可以关联。请检查下项目关联的{$lang->productCommon}中有没有{$lang->SRCommon}，而且要确保它们已经审核通过。";
-$lang->projectstory->batchUnlinkTip = '如下需求已与该项目下执行相关联，请从执行中移除后再操作。';
+$lang->projectstory->batchUnlinkTip = '其他需求已经移除，如下需求已与该项目下执行相关联，请从执行中移除后再操作。';
global $app;
$app->loadLang('product');
diff --git a/module/release/model.php b/module/release/model.php
index e0074e0cb1..6fd617dc8d 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -229,6 +229,7 @@ class releaseModel extends model
->join('mailto', ',')
->join('notify', ',')
->setIF(!$this->post->marker, 'marker', 0)
+ ->setIF(!$this->post->notify, 'notify', '')
->cleanInt('product')
->remove('files,labels,allchecker,uid')
->get();
@@ -271,14 +272,14 @@ class releaseModel extends model
/* Init vars. */
$notifyPersons = array();
- $managers = '';
- $notifyList = explode($notifyList, ',');
+ $managerFields = '';
+ $notifyList = explode(',', $notifyList);
foreach($notifyList as $notify)
{
if($notify == 'PO' or $notify == 'QD' or $notify == 'feedback')
{
- $managers .= $notify . ',';
+ $managerFields .= $notify . ',';
}
elseif($notify == 'SC' and !empty($buildID))
{
@@ -287,14 +288,14 @@ class releaseModel extends model
if(empty($stories)) continue;
- $createUsers = $this->dao->select('openedBy')->from(TABLE_STORY)->where('id')->in($stories)->fetchPairs();
- $notifyPersons += $createUsers;
+ $openedByList = $this->dao->select('openedBy')->from(TABLE_STORY)->where('id')->in($stories)->fetchPairs();
+ $notifyPersons += $openedByList;
}
elseif(($notify == 'ET' or $notify == 'PT') and !empty($buildID))
{
- $type = $notify == 'ET' ? 'execution' : 'project';
+ $type = $notify == 'ET' ? 'execution' : 'project';
$members = $this->dao->select('t2.account')->from(TABLE_BUILD)->alias('t1')
- ->leftJoin(TABLE_TEAM)->alias('t2')->on('t1.' . $type .'=t2.root')
+ ->leftJoin(TABLE_TEAM)->alias('t2')->on('t1.' . $type . '=t2.root')
->where('t2.type')->eq($type)
->fetchPairs();
@@ -304,13 +305,13 @@ class releaseModel extends model
}
}
- if(!empty($managers))
+ if(!empty($managerFields))
{
- $managers = trim($managers, ',');
- $managerUsers = $this->dao->select($managers)->from(TABLE_PRODUCT)->where('id')->eq($productID)->fetch();
+ $managerFields = trim($managerFields, ',');
+ $managerUsers = $this->dao->select($managerFields)->from(TABLE_PRODUCT)->where('id')->eq($productID)->fetch();
foreach($managerUsers as $account)
{
- if(!isset($notifyPersons[$account])) $notifyPersons += array($account => $account);
+ if(!isset($notifyPersons[$account])) $notifyPersons[$account] = $account;
}
}
diff --git a/module/repo/css/browse.css b/module/repo/css/browse.css
index bc556b5de1..6031a88317 100644
--- a/module/repo/css/browse.css
+++ b/module/repo/css/browse.css
@@ -2,4 +2,4 @@
#sidebar>.sidebar-toggle>.icon {right: -2px; left: auto;}
.main-row {width: 99%;}
.btn-toolbar > .last-sync-time {display: inline-block; float: left; margin-right: 10px;}
-.dropdown-menu>li.selected>a:after {content: '';}
+.dropdown-menu > li.selected > a:after {content: '';}
diff --git a/module/repo/model.php b/module/repo/model.php
index 8b4a83efcd..f7ac6b78e9 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -614,6 +614,7 @@ class repoModel extends model
{
$repo = $this->getRepoByID($repoID);
if(empty($repo)) return array();
+
return $this->dao->select('id,name')->from(TABLE_PRODUCT)
->where('id')->in($repo->product)
->andWhere('deleted')->eq(0)
@@ -1787,10 +1788,11 @@ class repoModel extends model
*/
public function processGitlab($repo)
{
- $gitlab = $this->loadModel('gitlab')->getByID($repo->client); // The $repo->client is gitlabID
+ $gitlab = $this->loadModel('gitlab')->getByID($repo->client); // The $repo->client is gitlabID.
if(!$gitlab) return $repo;
+
$repo->gitlab = $gitlab->id;
- $repo->project = $repo->path; // The projectID in gitlab
+ $repo->project = $repo->path; // The projectID in gitlab.
$repo->path = sprintf($this->config->repo->gitlab->apiPath, $gitlab->url, $repo->path);
$repo->client = $gitlab->url;
$repo->password = $gitlab->token;
diff --git a/module/search/js/buildindex.js b/module/search/js/buildindex.js
index 7f9fdc4f60..bc4aa989a2 100644
--- a/module/search/js/buildindex.js
+++ b/module/search/js/buildindex.js
@@ -13,7 +13,7 @@ $(document).ready(function()
}
else
{
- className = response.type + 'count';
+ className = response.type + 'count';
$typeCount = $('#resultBox .' + className)
if($typeCount.length == 0)
{
diff --git a/module/search/model.php b/module/search/model.php
index 30066bb0e6..737e7afc66 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -30,7 +30,7 @@ class searchModel extends model
if($module == 'projectStory') $flowModule = 'story';
if($module == 'projectBug') $flowModule = 'bug';
- $fields = $this->loadModel('workflowfield')->getList($flowModule);
+ $fields = $this->loadModel('workflowfield')->getList($flowModule);
$maxCount = $this->config->maxCount;
$this->config->maxCount = 0;
@@ -947,6 +947,8 @@ class searchModel extends model
{
$words = explode(' ', trim($keywords, ' '));
$markedWords = array();
+ $leftMark = '|0000';
+ $rightMark = '0000|';
foreach($words as $key => $word)
{
@@ -962,10 +964,11 @@ class searchModel extends model
{
$words[$key] = strlen($word) == 5 ? str_replace('_', '', $word) : $word;
}
- $markedWords[] = "" . $this->decode($word) . " ";
+ $markedWords[] = $leftMark . $this->decode($word) . $rightMark;
}
$content = str_replace($words, $markedWords, $content . ' ');
+ $content = str_replace(array($leftMark, $rightMark), array("", " "), $content);
$content = str_replace(" ", '', $content);
$content = str_replace("", '', $content);
diff --git a/module/story/model.php b/module/story/model.php
index 9512bdfe1e..41f7c3273b 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -792,36 +792,38 @@ class storyModel extends model
$_POST['reviewer'] = array_filter($_POST['reviewer']);
$oldReviewer = $this->getReviewerPairs($storyID, $oldStory->version);
$oldStory->reviewers = implode(',', array_keys($oldReviewer));
-
- /* Update story reviewer. */
- $this->dao->delete()->from(TABLE_STORYREVIEW)->where('story')->eq($storyID)->andWhere('version')->eq($oldStory->version)->andWhere('reviewer')->notin(implode(',', $_POST['reviewer']))->exec();
- foreach($_POST['reviewer'] as $reviewer)
+ if(array_diff($_POST['reviewer'], array_keys($oldReviewer)) or array_diff(array_keys($oldReviewer), $_POST['reviewer']))
{
- if(in_array($reviewer, array_keys($oldReviewer))) continue;
-
- $reviewData = new stdclass();
- $reviewData->story = $storyID;
- $reviewData->version = $oldStory->version;
- $reviewData->reviewer = $reviewer;
- $this->dao->insert(TABLE_STORYREVIEW)->data($reviewData)->exec();
- }
-
- /* Update the story status by review rules. */
- $reviewerList = $this->getReviewerPairs($storyID, $oldStory->version);
- $story->reviewers = implode(',', array_keys($reviewerList));
- $reviewedBy = explode(',', trim($oldStory->reviewedBy, ','));
- if(!array_diff(array_keys($reviewerList), $reviewedBy))
- {
- $status = $this->setStatusByReviewRules($reviewerList);
- $story->status = $status ? $status : $oldStory->status;
- if($story->status == 'closed')
+ /* Update story reviewer. */
+ $this->dao->delete()->from(TABLE_STORYREVIEW)->where('story')->eq($storyID)->andWhere('version')->eq($oldStory->version)->andWhere('reviewer')->notin(implode(',', $_POST['reviewer']))->exec();
+ foreach($_POST['reviewer'] as $reviewer)
{
- $story->closedBy = $this->app->user->account;
- $story->closedDate = $now;
- $story->assignedTo = 'closed';
- $story->assignedDate = $now;
- $story->stage = 'closed';
- if($this->post->closedReason == 'done') $story->stage = 'released';
+ if(in_array($reviewer, array_keys($oldReviewer))) continue;
+
+ $reviewData = new stdclass();
+ $reviewData->story = $storyID;
+ $reviewData->version = $oldStory->version;
+ $reviewData->reviewer = $reviewer;
+ $this->dao->insert(TABLE_STORYREVIEW)->data($reviewData)->exec();
+ }
+
+ /* Update the story status by review rules. */
+ $reviewerList = $this->getReviewerPairs($storyID, $oldStory->version);
+ $story->reviewers = implode(',', array_keys($reviewerList));
+ $reviewedBy = explode(',', trim($oldStory->reviewedBy, ','));
+ if(!array_diff(array_keys($reviewerList), $reviewedBy))
+ {
+ $status = $this->setStatusByReviewRules($reviewerList);
+ $story->status = $status ? $status : $oldStory->status;
+ if($story->status == 'closed')
+ {
+ $story->closedBy = $this->app->user->account;
+ $story->closedDate = $now;
+ $story->assignedTo = 'closed';
+ $story->assignedDate = $now;
+ $story->stage = 'closed';
+ if($this->post->closedReason == 'done') $story->stage = 'released';
+ }
}
}
}
@@ -3579,7 +3581,7 @@ class storyModel extends model
$canBatchChangeModule = common::hasPriv('story', 'batchChangeModule');
$canBatchChangePlan = common::hasPriv('story', 'batchChangePlan');
$canBatchAssignTo = common::hasPriv('story', 'batchAssignTo');
- $canBatchUnlinkStory = common::hasPriv('projectstory', 'unlinkStory');
+ $canBatchUnlinkStory = common::hasPriv('projectstory', 'batchUnlinkStory');
$canBatchAction = ($canBatchEdit or $canBatchClose or $canBatchReview or $canBatchChangeStage or $canBatchChangeBranch or $canBatchChangeModule or $canBatchChangePlan or $canBatchAssignTo or $canBatchUnlinkStory);
@@ -3797,11 +3799,11 @@ class storyModel extends model
break;
}
- common::printIcon('story', 'change', $vars . "&from=$story->from", $story, 'list', 'alter', '', '', false, "data-group=$story->from");
- common::printIcon('story', 'review', $vars . "&from=$story->from", $story, 'list', 'search', '', '', false, "data-group=$story->from");
+ common::printIcon('story', 'change', $vars . "&from=$story->from", $story, 'list', 'alter', '', '', false, "data-group=$story->from");
+ common::printIcon('story', 'review', $vars . "&from=$story->from", $story, 'list', 'search', '', '', false, "data-group=$story->from");
if($this->app->openApp != 'project') common::printIcon('story', 'recall', $vars, $story, 'list', 'back', 'hiddenwin', '', '', '', $this->lang->story->recall);
- common::printIcon('story', 'close', $vars, $story, 'list', '', '', 'iframe', true);
- common::printIcon('story', 'edit', $vars . "&from=$story->from", $story, 'list', '', '', '', false, "data-group=$story->from");
+ common::printIcon('story', 'close', $vars, $story, 'list', '', '', 'iframe', true);
+ common::printIcon('story', 'edit', $vars . "&from=$story->from", $story, 'list', '', '', '', false, "data-group=$story->from");
if($story->type != 'requirement') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap', '', '', false, "data-app='qa'");
common::printIcon('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&storyID=$story->id", $story, 'list', 'split', '', '', '', '', $this->lang->story->subdivide);
if($this->app->rawModule == 'projectstory') common::printIcon('projectstory', 'unlinkStory', "projectID={$this->session->project}&storyID=$story->id", '', 'list', 'unlink', 'hiddenwin');
@@ -4514,7 +4516,7 @@ class storyModel extends model
$comment = isset($_POST['comment']) ? $this->post->comment : '';
$actionID = !empty($result) ? $this->loadModel('action')->create('story', $story->id, 'Reviewed', $comment, ucfirst($result) . $reasonParam) : '';
- if(ucfirst($result) != 'Revert')
+ if(strtolower($result) != 'revert')
{
if($story->status == 'closed') $this->action->create('story', $story->id, 'ReviewClosed');
if($story->status == 'active') $this->action->create('story', $story->id, 'PassReviewed');
@@ -4523,5 +4525,4 @@ class storyModel extends model
return $actionID;
}
-
}
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 97152b0c4c..daf6031fdd 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -135,7 +135,7 @@ $lang->task->lblTestStory = 'Story Tested';
$lang->task->recordEstimateAction = 'Record Estimate';
$lang->task->ditto = 'Ditto';
-$lang->task->dittoNotice = "This Task is not linked to the %s as the previous one is!";
+$lang->task->dittoNotice = "This Task is not linked to %s like the last one!";
$lang->task->selectTestStory = 'Select Story Testd';
$lang->task->selectAllUser = 'All Users';
$lang->task->noStory = 'No Story Linked';
@@ -175,8 +175,8 @@ $lang->task->reasonList['done'] = 'Done';
$lang->task->reasonList['cancel'] = 'Cancelled';
$lang->task->afterChoices['continueAdding'] = ' Continue Adding Tasks';
-$lang->task->afterChoices['toTaskList'] = 'Go to Task List Page';
-$lang->task->afterChoices['toStoryList'] = 'Go to Story List Page';
+$lang->task->afterChoices['toTaskList'] = 'Go to Task List';
+$lang->task->afterChoices['toStoryList'] = 'Go to Story List';
$lang->task->legendBasic = 'Basic Info';
$lang->task->legendEffort = 'Effort';
@@ -202,7 +202,7 @@ $lang->task->deniedNotice = 'Only the %s can %s the task.';
$lang->task->noTask = 'No tasks yet. ';
$lang->task->createDenied = 'Create Task is denied in this project';
$lang->task->cannotDeleteParent = 'Cannot delete parent task';
-$lang->task->addChildTask = 'Because the task has already consumed consumption, to ensure data consistency, we will help you create a subtask with the same name to record the consumption.';
+$lang->task->addChildTask = 'Because the task has cost hours, ZenTao will create a child task with the same name to record the cost housrs to ensure data consistency.';
$lang->task->error = new stdclass();
$lang->task->error->totalNumber = '"Total Cost" must be numbers.';
diff --git a/module/task/model.php b/module/task/model.php
index 8fca1c4fa4..fcb66d5cfd 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2143,7 +2143,7 @@ class taskModel extends model
}
$projectList = array();
- foreach($tasks as $task) $projectList[] = $task->project;
+ foreach($tasks as $task) $projectList[$task->project] = $task->project;
$projectPairs = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->in($projectList)->fetchPairs('id');
foreach($tasks as $task) $task->projectName = zget($projectPairs, $task->project);
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index 83cc3912f9..46cebce8aa 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -201,7 +201,7 @@
| testcase->type;?> |
- testcase->typeList['unit']);?>
+ type != 'unit') unset($lang->testcase->typeList['unit']);?>
testcase->typeList, $case->type, "class='form-control chosen'");?> |
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 3c73baa53d..35c39caae2 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -48,12 +48,12 @@ $lang->testtask->allTasks = 'All Requests';
$lang->testtask->collapseAll = 'Collapse';
$lang->testtask->expandAll = 'Expand';
-$lang->testtask->viewAction = "View Testtask";
+$lang->testtask->viewAction = "View Request";
$lang->testtask->casesAction = 'View Case';
-$lang->testtask->activateAction = "Activate Testtask";
-$lang->testtask->blockAction = "Block Testtask";
-$lang->testtask->closeAction = "Close Testtask";
-$lang->testtask->startAction = "Start Testtask";
+$lang->testtask->activateAction = "Activate Request";
+$lang->testtask->blockAction = "Block Request";
+$lang->testtask->closeAction = "Close Request";
+$lang->testtask->startAction = "Start Request";
$lang->testtask->resultsAction = "Case Result";
$lang->testtask->reportAction = 'Report';
@@ -203,7 +203,7 @@ $lang->testtask->unitTag['lastWeek'] = 'Last week';
$lang->testtask->unitTag['thisMonth'] = 'This month';
$lang->testtask->unitTag['lastMonth'] = 'Last month';
-$lang->testtask->typeList['integrate'] = 'Integrate';
+$lang->testtask->typeList['integrate'] = 'Integration';
$lang->testtask->typeList['system'] = 'System';
$lang->testtask->typeList['acceptance'] = 'Acceptance';
$lang->testtask->typeList['performance'] = 'Performance';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 1adf76a8a1..cdc1909a6e 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -4702,9 +4702,9 @@ class upgradeModel extends model
$today = helper::today();
foreach($projectTeams as $projectID => $projectMember)
{
- unset($projectMember['']);
- $project = zget($projects, $projectID, '');
- $users = implode(',', $projectMember);
+ $projectMember = array_filter($projectMember);
+ $project = zget($projects, $projectID, '');
+ $users = implode(',', $projectMember);
$this->dao->update(TABLE_DOCLIB)
->set('users')->eq($users)
@@ -5251,7 +5251,7 @@ class upgradeModel extends model
if(empty($doc->content)) continue;
$this->dao->update(TABLE_DOC)
- ->set('tempContent')->eq($doc->content)
+ ->set('draft')->eq($doc->content)
->where('id')->eq($docID)
->exec();
}
diff --git a/module/user/config.php b/module/user/config.php
index 6530268885..bd1a602d98 100644
--- a/module/user/config.php
+++ b/module/user/config.php
@@ -17,3 +17,6 @@ $config->user->contactField = 'mobile,phone,qq,dingding,weixin,skype,whatsapp,sl
$config->user->failTimes = 6;
$config->user->lockMinutes = 10;
$config->user->batchCreate = 10;
+
+/* user detail fields for API against JIHU GitLab. */
+$config->user->detailFields = 'id,account,realname,avatar';
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index 142f8a787b..a69c3f2f51 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -11,8 +11,8 @@
*/
$lang->user->common = 'User';
$lang->user->id = 'ID';
-$lang->user->inside = 'Inside Members';
-$lang->user->outside = 'Outside Members';
+$lang->user->inside = 'Internal';
+$lang->user->outside = 'Outsiders';
$lang->user->company = 'Company';
$lang->user->dept = 'Department';
$lang->user->account = 'Account';
@@ -54,8 +54,8 @@ $lang->user->score = 'Score';
$lang->user->name = 'Name';
$lang->user->type = 'User Type';
$lang->user->cropAvatar = 'Crop Avatar';
-$lang->user->cropAvatarTip = 'Drag and drop the box to select the image clipping range.';
-$lang->user->cropImageTip = 'The image used is too small, the recommended image size is at least 48x48, the current image size is %s';
+$lang->user->cropAvatarTip = 'Drag and drop the box to crop the image.';
+$lang->user->cropImageTip = 'The image is too small. The recommended image size is at least 48x48. The current image size is %s';
$lang->user->captcha = 'Captcha';
$lang->user->legendBasic = 'Basic Information';
@@ -89,7 +89,7 @@ $lang->user->else = 'Else';
$lang->user->saveTemplate = 'Save as Template';
$lang->user->setPublic = 'Set as Public Template';
$lang->user->deleteTemplate = 'Delete Template';
-$lang->user->setTemplateTitle = 'Please enter the title of template.';
+$lang->user->setTemplateTitle = 'Please enter the title of the template.';
$lang->user->applyTemplate = 'Templates';
$lang->user->confirmDeleteTemplate = 'Do you want to delete this template?';
$lang->user->setPublicTemplate = 'Set as Public Template';
@@ -128,7 +128,7 @@ $lang->user->loginFailed = "Login failed. Please check your account and passwor
$lang->user->lockWarning = "You can try %s times.";
$lang->user->loginLocked = "Please contact the administrator to unlock your account or try %s minutes later.";
$lang->user->weakPassword = "Your password does not meet the requirements.";
-$lang->user->errorWeak = "Passwords cannot use [%s] these commonly used weak passwords.";
+$lang->user->errorWeak = "Passwords cannot use [%s] weak passwords.";
$lang->user->errorCaptcha = "Captcha Error";
$lang->user->roleList[''] = '';
@@ -199,10 +199,10 @@ $lang->user->error->account = "ID %s，account must be >= 3 letters, unde
$lang->user->error->accountDupl = "ID %s，account is used.";
$lang->user->error->realname = "ID %s，must be real name";
$lang->user->error->password = "ID %s，password must be >= 6 characters.";
-$lang->user->error->mail = "ID %s，please enter valid Email address";
+$lang->user->error->mail = "ID %s，enter valid Email address";
$lang->user->error->reserved = "ID %s，account is reserved.";
$lang->user->error->weakPassword = "ID %s，the password strength is less than the system setting.";
-$lang->user->error->dangerPassword = "ID %s，Passwords cannot be used with [%s] these commonly used if-passwords.";
+$lang->user->error->dangerPassword = "ID %s，passwords cannot be used with [%s] these commonly used if-passwords.";
$lang->user->error->verifyPassword = "Verification failed. Please enter your Login Password.";
$lang->user->error->originalPassword = "Old password is incorrect.";
@@ -247,13 +247,13 @@ $lang->user->noticeResetFile = "Contact the Administrator to reset your pas
If the file exists, remove it and create it again.
";
$lang->user->notice4Safe = "Warning: Weak password of one click package detected";
-$lang->user->process4DIR = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Delete or rename the %s directory. Visit: https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html";
-$lang->user->process4DB = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html";
+$lang->user->process4DIR = "It is detected that you might use the one-click installation package environment. Other sites in the environment are still using weak passwords. For security reasons, if you do not use other sites, please handle them in time. Delete or rename the %s directory. Visit: https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html";
+$lang->user->process4DB = "It is detected that you might use the one-click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html";
$lang->user->mkdirWin = <<
|
不能创建临时目录，请确认目录%s是否存在并有操作权限。
- Can't create tmp directory, make sure the directory %s exists and has permission to operate.
+ A tmp directory cannot be created. Make sure the directory %s exists and you have the right permission.
|