| 1) echo "rowspan='$rowspan'"?>>time);?> |
|
- = 1024 ? round($size / 1024 / 1024 / 1024, 2) . 'GB' : ($size / 1024 >= 1024 ? round($size / 1024 / 1024, 2) . 'MB' : round($size / 1024, 2) . 'KB');?> |
+ |
+ |
+
+ backup->processFileSize($size);
+ ?>
+ |
+
+
+ backup->statusList[$status];?>
+
+ backup->statusList[$status];?>
+
+ |
1) echo "rowspan='$rowspan'"?>>
-
+
backup->waitting?>
diff --git a/module/block/control.php b/module/block/control.php
index c70cfc6292..00bc827ba8 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -902,6 +902,7 @@ class block extends control
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
->where('t1.product')->in($productIdList)
->andWhere('t2.deleted')->eq(0)
+ ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->projects)->fi()
->fetchGroup('product');
foreach($projects as $product => $productProjects)
{
@@ -989,25 +990,40 @@ class block extends control
$projectIdList = array_keys($projects);
-
/* Get tasks. Fix bug #2918.*/
- $yesterday = date('Y-m-d', strtotime('-1 day'));
- $tasks = $this->dao->select("project, count(id) as totalTasks, count(status in ('wait','doing','pause') or null) as undoneTasks, count(finishedDate like '{$yesterday}%' or null) as yesterdayFinished, sum(if(status != 'cancel', estimate, 0)) as totalEstimate, sum(consumed) as totalConsumed, sum(if(status != 'cancel' and status != 'closed', `left`, 0)) as totalLeft")->from(TABLE_TASK)
+ $yesterday = date('Y-m-d', strtotime('-1 day'));
+ $taskGroups = $this->dao->select("id,parent,project,status,finishedDate,estimate,consumed,`left`")->from(TABLE_TASK)
->where('project')->in($projectIdList)
->andWhere('deleted')->eq(0)
- ->andWhere('parent')->lt(1)
- ->groupBy('project')
- ->fetchAll('project');
- foreach($tasks as $projectID => $task)
+ ->fetchGroup('project', 'id');
+
+ $tasks = array();
+ foreach($taskGroups as $projectID => $taskGroup)
{
- $task->totalEstimate = round($task->totalEstimate, 2);
- $task->totalConsumed = round($task->totalConsumed, 2);
- $task->totalLeft = round($task->totalLeft, 2);
- foreach($task as $key => $value)
+ $undoneTasks = 0;
+ $yesterdayFinished = 0;
+ $totalEstimate = 0;
+ $totalConsumed = 0;
+ $totalLeft = 0;
+
+ foreach($taskGroup as $taskID => $task)
{
- if($key == 'project') continue;
- $projects[$projectID]->$key = $value;
+ if(strpos('wait|doing|pause', $task->status) !== false) $undoneTasks ++;
+ if(strpos($task->finishedDate, $yesterday) !== false) $yesterdayFinished ++;
+
+ if($task->parent == '-1') continue;
+
+ $totalConsumed += $task->consumed;
+ if($task->status != 'cancel') $totalEstimate += $task->estimate;
+ if($task->status != 'cancel' and $task->status != 'closed') $totalLeft += $task->left;
}
+
+ $projects[$projectID]->totalTasks = count($taskGroup);
+ $projects[$projectID]->undoneTasks = $undoneTasks;
+ $projects[$projectID]->yesterdayFinished = $yesterdayFinished;
+ $projects[$projectID]->totalEstimate = $totalEstimate;
+ $projects[$projectID]->totalConsumed = $totalConsumed;
+ $projects[$projectID]->totalLeft = $totalLeft;
}
/* Get stories. */
diff --git a/module/block/js/dashboard.js b/module/block/js/dashboard.js
index 8eafeb9f3d..ef725d9191 100644
--- a/module/block/js/dashboard.js
+++ b/module/block/js/dashboard.js
@@ -66,6 +66,7 @@ function refreshBlock($panel, afterRefresh)
{
$panel.children('.panel-move-handler,style,script').remove();
$panel.find('.panel-body,.empty-tip').first().replaceWith($data);
+ $panel.find('.iframe').initIframeModal();
}
$panel.find('.progress-pie').progressPie();
if($.isFunction(afterRefresh))
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index a15f108193..d28e2f8fb1 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -210,7 +210,7 @@ $lang->block->default['project']['4']['params']['num'] = 15;
$lang->block->default['project']['4']['params']['orderBy'] = 'id_desc';
$lang->block->default['project']['4']['params']['type'] = 'assignedTo';
-$lang->block->default['qa']['1']['title'] = 'Testing Report';
+$lang->block->default['qa']['1']['title'] = 'Test Report';
$lang->block->default['qa']['1']['block'] = 'statistic';
$lang->block->default['qa']['1']['grid'] = 8;
@@ -318,7 +318,7 @@ $lang->block->availableBlocks->risk = 'My Risks';
$lang->block->moduleList['program'] = $lang->projectCommon;
$lang->block->moduleList['product'] = $lang->productCommon;
$lang->block->moduleList['project'] = $lang->projectCommon;
-$lang->block->moduleList['qa'] = 'QA';
+$lang->block->moduleList['qa'] = 'Test';
$lang->block->moduleList['todo'] = 'Todo';
$lang->block->modules['program'] = new stdclass();
@@ -362,7 +362,7 @@ $lang->block->modules['project']->availableBlocks->task = 'Task';
$lang->block->modules['project']->availableBlocks->build = 'Build';
$lang->block->modules['qa'] = new stdclass();
$lang->block->modules['qa']->availableBlocks = new stdclass();
-$lang->block->modules['qa']->availableBlocks->statistic = 'Testing Report';
+$lang->block->modules['qa']->availableBlocks->statistic = 'Test Report';
//$lang->block->modules['qa']->availableBlocks->overview = 'Testcase Overview';
$lang->block->modules['qa']->availableBlocks->bug = 'Bug';
$lang->block->modules['qa']->availableBlocks->case = 'Case';
@@ -512,8 +512,8 @@ $lang->block->gridOptions[8] = 'Left';
$lang->block->gridOptions[4] = 'Right';
$lang->block->flowchart = array();
-$lang->block->flowchart['admin'] = array('Administrator', 'Add Department', 'Add User', 'Maintain Privileges');
+$lang->block->flowchart['admin'] = array('Administrator', 'Add Departments', 'Add Users', 'Maintain Privileges');
$lang->block->flowchart['product'] = array($lang->productCommon . ' Owner', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Releases');
-$lang->block->flowchart['project'] = array('Scrum Master', 'Add ' . $lang->projectCommon, 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Create Tasks');
+$lang->block->flowchart['project'] = array('Scrum Master', 'Add ' . $lang->projectCommon . 's', 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Create Tasks');
$lang->block->flowchart['dev'] = array('Dev Team', 'Claim Tasks/Bugs', 'Update Status', 'Finish Tasks/Bugs');
-$lang->block->flowchart['tester'] = array('QA Team', 'Write Cases', 'Run Cases', 'Report Bugs', 'Verify Bugs', 'Close Bugs');
+$lang->block->flowchart['tester'] = array('Test Team', 'Write Cases', 'Run Cases', 'Report Bugs', 'Verify Bugs', 'Close Bugs');
diff --git a/module/block/model.php b/module/block/model.php
index 52afe72590..f4e3baa884 100644
--- a/module/block/model.php
+++ b/module/block/model.php
@@ -137,6 +137,7 @@ class blockModel extends model
->andWhere('module')->eq($module)
->andWhere('hidden')->eq(0)
->beginIF($type)->andWhere('type')->eq($type)->fi()
+ ->beginIF($this->config->global->flow != 'full')->andWhere('block')->notin('flowchart')->fi()
->beginIF($this->config->global->flow == 'onlyStory')->andWhere('source')->notin('project,qa')->fi()
->beginIF($this->config->global->flow == 'onlyTask')->andWhere('source')->notin('product,qa')->fi()
->beginIF($this->config->global->flow == 'onlyTest')->andWhere('source')->notin('product,project')->fi()
diff --git a/module/block/view/flowchart.html.php b/module/block/view/flowchart.html.php
index fb32e6c06f..05dc751bc0 100644
--- a/module/block/view/flowchart.html.php
+++ b/module/block/view/flowchart.html.php
@@ -1,7 +1,7 @@
-block->flowchart as $rowIndex => $flow):?>
+block->flowchart as $flowName => $flow):?>
-
+
@@ -44,4 +44,4 @@
.block-sm .flow-item > div:before, .block-sm .flow-item > div:after {border-width: 15px 0 15px 6px;}
.block-sm .row-3 .flow-item-1, .block-sm .row-3 .flow-item-3 {width: 25%}
.block-sm .flow-item > div:after {right: -6px;}
-
\ No newline at end of file
+
diff --git a/module/block/view/productstatisticblock.html.php b/module/block/view/productstatisticblock.html.php
index a884807f70..3a8cddc586 100644
--- a/module/block/view/productstatisticblock.html.php
+++ b/module/block/view/productstatisticblock.html.php
@@ -108,7 +108,8 @@ $(function()
+ config->global->flow != 'onlyTask'): ?>
story->released;?> releasedStories;?>
@@ -194,6 +196,7 @@ $(function()
+
diff --git a/module/block/view/qastatisticblock.html.php b/module/block/view/qastatisticblock.html.php
index 1dcd0e9b51..855b0cac26 100644
--- a/module/block/view/qastatisticblock.html.php
+++ b/module/block/view/qastatisticblock.html.php
@@ -92,7 +92,7 @@ $(function()
productID='id;?>'>
name;?>
- id"), "", '', "class='btn-view' title={$lang->product->browse}");?>
+ id"), " ", '', "class='btn-view' title={$lang->bug->browse}");?>
diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php
index 81015c928e..0b2d1d9b4e 100644
--- a/module/block/view/taskblock.html.php
+++ b/module/block/view/taskblock.html.php
@@ -16,6 +16,7 @@
-
+ $this->config->file->maxImport):?>
caselib->import;?>
+ file->importSummary, $allCount, html::input('maxImport', $config->file->maxImport, "style='width:50px'"), ceil($allCount / $config->file->maxImport));?>
+ import, "id='import'", 'btn btn-primary');?>
+
+
+
+
-
+
diff --git a/module/ci/lang/fr.php b/module/ci/lang/fr.php
index a4decff03f..12b86a1894 100644
--- a/module/ci/lang/fr.php
+++ b/module/ci/lang/fr.php
@@ -1,7 +1,7 @@
ci->common = 'CI';
-$lang->ci->commitResult = 'Interface: Commit Test Result.';
+$lang->ci->commitResult = 'Interface validation des r閟ultats de tests.';
$lang->ci->job = 'Construction';
-$lang->ci->task = 'Task';
-$lang->ci->history = 'History';
+$lang->ci->task = 'T鈉he';
+$lang->ci->history = 'Historique';
diff --git a/module/ci/model.php b/module/ci/model.php
index 981947e6fc..e8ca89aa97 100644
--- a/module/ci/model.php
+++ b/module/ci/model.php
@@ -36,7 +36,7 @@ class ciModel extends model
->leftJoin(TABLE_JOB)->alias('t2')->on('t1.job=t2.id')
->leftJoin(TABLE_JENKINS)->alias('t3')->on('t2.jkHost=t3.id')
->where('t1.status')->ne('success')
- ->andWhere('t1.status')->ne('fail')
+ ->andWhere('t1.status')->ne('failure')
->andWhere('t1.status')->ne('create_fail')
->andWhere('t1.status')->ne('timeout')
->andWhere('t1.createdDate')->gt(date(DT_DATETIME1, strtotime("-1 day")))
@@ -54,28 +54,36 @@ class ciModel extends model
*/
public function syncCompileStatus($compile)
{
+ if($compile->times >= 3)
+ {
+ $this->dao->update(TABLE_COMPILE)->set('status')->eq('failure')->where('id')->eq($compile->id)->exec();
+ return false;
+ }
+
$jenkinsServer = $compile->url;
$jenkinsUser = $compile->account;
$jenkinsPassword = $compile->token ? $compile->token : base64_decode($compile->password);
+ $userPWD = "$jenkinsUser:$jenkinsPassword";
+ $queueUrl = sprintf('%s/queue/item/%s/api/json', $jenkinsServer, $compile->queue);
- $jenkinsAuth = '://' . $jenkinsUser . ':' . $jenkinsPassword . '@';
- $jenkinsServer = str_replace('://', $jenkinsAuth, $jenkinsServer);
- $queueUrl = sprintf('%s/queue/item/%s/api/json', $jenkinsServer, $compile->queue);
+ $response = common::http($queueUrl, '', false, $userPWD);
- $response = common::http($queueUrl);
+ $this->dao->update(TABLE_COMPILE)->set('times = times + 1')->where('id')->eq($compile->id)->exec();
if(strripos($response, "404") > -1)
{
$infoUrl = sprintf("%s/job/%s/api/xml?tree=builds[id,number,result,queueId]&xpath=//build[queueId=%s]", $jenkinsServer, $compile->jkJob, $compile->queue);
- $response = common::http($infoUrl);
+ $response = common::http($infoUrl, '', false, $userPWD);
if($response)
{
$buildInfo = simplexml_load_string($response);
$buildNumber = strtolower($buildInfo->number);
- $result = strtolower($buildInfo->result);
+ if(empty($buildNumber)) return false;
+
+ $result = strtolower($buildInfo->result);
$this->updateBuildStatus($compile, $result);
$logUrl = sprintf('%s/job/%s/%s/consoleText', $jenkinsServer, $compile->jkJob, $buildNumber);
- $response = common::http($logUrl);
+ $response = common::http($logUrl, '', false, $userPWD);
$this->dao->update(TABLE_COMPILE)->set('logs')->eq($response)->where('id')->eq($compile->id)->exec();
}
}
@@ -84,10 +92,8 @@ class ciModel extends model
$queueInfo = json_decode($response);
if(!empty($queueInfo->executable))
{
- $buildUrl = $queueInfo->executable->url . 'api/json?pretty=true';
- $buildUrl = str_replace('://', $jenkinsAuth, $buildUrl);
-
- $response = common::http($buildUrl);
+ $buildUrl = $queueInfo->executable->url . 'api/json?pretty=true';
+ $response = common::http($buildUrl, '', false, $userPWD);
$buildInfo = json_decode($response);
if($buildInfo->building)
@@ -100,8 +106,7 @@ class ciModel extends model
$this->updateBuildStatus($compile, $result);
$logUrl = $buildInfo->url . 'logText/progressiveText/api/json';
- $logUrl = str_replace('://', $jenkinsAuth, $logUrl);
- $response = common::http($logUrl);
+ $response = common::http($logUrl, '', false, $userPWD);
$this->dao->update(TABLE_COMPILE)->set('logs')->eq($response)->where('id')->eq($compile->id)->exec();
}
}
@@ -125,16 +130,16 @@ class ciModel extends model
/**
* Send request.
*
- * @param string $url
- * @param object $data
+ * @param string $url
+ * @param object $data
+ * @param string $userPWD
* @access public
* @return int
*/
- public function sendRequest($url, $data)
+ public function sendRequest($url, $data, $userPWD = '')
{
if(!empty($data->PARAM_TAG)) $data->PARAM_REVISION = '';
-
- $response = common::http($url, $data, true);
+ $response = common::http($url, $data, true, $userPWD);
if(preg_match("!Location: .*item/(.*)/!", $response, $matches)) return $matches[1];
return 0;
}
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 6b0f6ec825..183c1afaf8 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -58,6 +58,8 @@ $lang->trunk = 'Trunk';
$lang->sort = 'Sortieren';
$lang->required = 'Pflicht';
$lang->noData = 'Kein Datensatz';
+$lang->fullscreen = 'Fullscreen';
+$lang->retrack = 'Retrack';
$lang->actions = 'Aktionen';
$lang->restore = 'Wiederherstellen';
@@ -84,7 +86,6 @@ $lang->homepage = 'Als Startseite setzen';
$lang->noviceTutorial = 'Anleitung';
$lang->changeLog = 'Änderungsprotokoll';
$lang->manual = 'Handbuch';
-$lang->manualUrl = 'http://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao';
$lang->customMenu = 'Benutzer Menü';
$lang->customField = 'Individualfeld';
$lang->lineNumber = 'Zeile Nr.';
@@ -335,7 +336,6 @@ $lang->testreport->menu->caselib = array('link' => 'Bibliothek|caselib|browse'
$lang->caselib = new stdclass();
$lang->caselib->menu = new stdclass();
-$lang->caselib->subMenu = $lang->qa->subMenu;
$lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|');
$lang->caselib->menu->testcase = array('link' => 'Fälle|testcase|browse|', 'class' => 'dropdown dropdown-hover');
$lang->caselib->menu->testtask = array('link' => 'Build|testtask|browse|');
@@ -343,6 +343,11 @@ $lang->caselib->menu->testsuite = array('link' => 'Suite|testsuite|browse|');
$lang->caselib->menu->report = array('link' => 'Berichte|testreport|browse|');
$lang->caselib->menu->caselib = array('link' => 'Bibliothek|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase');
+$lang->caselib->subMenu = new stdclass();
+$lang->caselib->subMenu->testcase = new stdclass();
+$lang->caselib->subMenu->testcase->feature = array('link' => 'Functional Test|testcase|browse|', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story');
+$lang->caselib->subMenu->testcase->unit = array('link' => 'Unit Test|testtask|browseUnits|');
+
$lang->ci = new stdclass();
$lang->ci->menu = new stdclass();
$lang->ci->menu->code = array('link' => 'Code|repo|browse|repoID=%s', 'alias' => 'diff,view,revision,log,blame,showsynccomment');
@@ -405,7 +410,7 @@ $lang->admin->menu->index = array('link' => 'Home|admin|index', 'alias' => '
$lang->admin->menu->message = array('link' => 'Notification|message|index', 'subModule' => 'message,mail,webhook');
$lang->admin->menu->custom = array('link' => 'Custom|custom|set', 'subModule' => 'custom');
$lang->admin->menu->sso = array('link' => 'Integration|admin|sso');
-
+$lang->admin->menu->extension = array('link' => 'Extension|extension|browse', 'subModule' => 'extension');
$lang->admin->menu->dev = array('link' => 'Entwicklung|dev|api', 'alias' => 'db', 'subModule' => 'dev,entry');
$lang->admin->menu->translate = array('link' => 'Translate|dev|translate');
$lang->admin->menu->data = array('link' => 'Data|backup|index', 'subModule' => 'backup,action');
@@ -522,7 +527,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 two passwords should be the same.";
$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!';
@@ -576,7 +581,6 @@ $lang->importAndInsert = "New Insertion";
$lang->noResultsMatch = "Keine weiteren Treffer!";
$lang->searchMore = "Weitere Treffer：";
$lang->chooseUsersToMail = "Choose users that will be notified.";
-$lang->browserNotice = 'Your current browser might not show the best effect. Please use Chrome, Firefox, IE9+, Opera or Safari.';
$lang->noticePasteImg = "Paste images here";
$lang->pasteImgFail = "Failed to paste images. Try again later.";
$lang->pasteImgUploading = "Uploading...";
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 8a36808ddd..770c3e01ec 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -58,6 +58,8 @@ $lang->trunk = 'Trunk';
$lang->sort = 'Order';
$lang->required = 'Required';
$lang->noData = 'No data.';
+$lang->fullscreen = 'Fullscreen';
+$lang->retrack = 'Retrack';
$lang->actions = 'Action';
$lang->restore = 'Reset';
@@ -84,7 +86,6 @@ $lang->homepage = 'Set Home';
$lang->noviceTutorial = 'ZenTao Tutorial';
$lang->changeLog = 'Change Log';
$lang->manual = 'User Manual';
-$lang->manualUrl = 'https://www.zentao.pm/book/zentaomanual/zentao-installation-11.html';
$lang->customMenu = 'Custom Menu';
$lang->customField = 'Custom Field';
$lang->lineNumber = 'Line No.';
@@ -378,7 +379,6 @@ $lang->testreport->menu->caselib = array('link' => 'Case Library|caselib|brows
$lang->caselib = new stdclass();
$lang->caselib->menu = new stdclass();
-$lang->caselib->subMenu = $lang->qa->subMenu;
$lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|');
$lang->caselib->menu->testcase = array('link' => 'Case|testcase|browse|', 'class' => 'dropdown dropdown-hover');
$lang->caselib->menu->testtask = array('link' => 'Request|testtask|browse|');
@@ -386,6 +386,11 @@ $lang->caselib->menu->testsuite = array('link' => 'Suite|testsuite|browse|');
$lang->caselib->menu->report = array('link' => 'Report|testreport|browse|');
$lang->caselib->menu->caselib = array('link' => 'Case Library|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase');
+$lang->caselib->subMenu = new stdclass();
+$lang->caselib->subMenu->testcase = new stdclass();
+$lang->caselib->subMenu->testcase->feature = array('link' => 'Functional Test|testcase|browse|', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story');
+$lang->caselib->subMenu->testcase->unit = array('link' => 'Unit Test|testtask|browseUnits|');
+
$lang->ci = new stdclass();
$lang->ci->menu = new stdclass();
$lang->ci->menu->code = array('link' => 'Code|repo|browse|repoID=%s', 'alias' => 'diff,view,revision,log,blame,showsynccomment');
@@ -645,7 +650,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 two passwords should be the same.";
$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!';
@@ -699,7 +704,6 @@ $lang->importAndInsert = "Insert";
$lang->noResultsMatch = "No results match found!";
$lang->searchMore = "More results：";
$lang->chooseUsersToMail = "Choose users that will be notified.";
-$lang->browserNotice = 'The browser you currently use might not get the best browsing results. It is recommended that you use Chrome, Firefox, IE9+, Opera or Safari.';
$lang->noticePasteImg = "You can paste images into the editor.";
$lang->pasteImgFail = "Failed to paste images. Try again later.";
$lang->pasteImgUploading = "Uploading...";
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index e8176db270..2aa2d6c23d 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -30,7 +30,7 @@ $lang->aboutZenTao = 'A Propos';
$lang->profile = 'Profil';
$lang->changePassword = 'Mot de Passe';
$lang->runInfo = " Time %s MS, Memory %s KB, Query %s. ";
-$lang->agreement = "I have read and agreed to the terms and conditions of Z PUBLIC LICENSE 1.2 . Without authorization, I should not remove, hide or cover any logos/links of ZenTao.";
+$lang->agreement = "J'ai lu et j'accepte les termes et conditions de la Z PUBLIC LICENSE 1.2 . Sans autorisation, je ne dois pas supprimer, masquer ou couvrir les logos / liens de ZenTao.";
$lang->designedByAIUX = " Designed by AIUX";
$lang->reset = 'Réinitialiser';
@@ -58,6 +58,8 @@ $lang->trunk = 'Tronc';
$lang->sort = 'Ordre';
$lang->required = 'Obligatoire';
$lang->noData = 'No data.';
+$lang->fullscreen = 'Plein Ecran';
+$lang->retrack = 'Réduire';
$lang->actions = 'Action';
$lang->restore = 'Réinitialiser';
@@ -80,15 +82,14 @@ $lang->duplicate = '%s a le même titre que le fichier existant.';
$lang->ipLimited = " Sorry, your current IP is restricted. PLease contact your Administer to grant your permissions.";
$lang->unfold = '+';
$lang->fold = '-';
-$lang->homepage = 'Set Home';
+$lang->homepage = 'Accueil';
$lang->noviceTutorial = 'Tutoriel ZenTao';
$lang->changeLog = 'Change Log';
-$lang->manual = 'User Manual';
-$lang->manualUrl = 'https://www.zentao.pm/book/zentaomanual/zentao-installation-11.html';
+$lang->manual = 'Manuel Utilisateur';
$lang->customMenu = 'Personnalisation Menu';
$lang->customField = 'Personnalisation Champ';
$lang->lineNumber = 'Ligne No.';
-$lang->tutorialConfirm = 'You are using ZenTao tutorial. Do you want to quit right now？';
+$lang->tutorialConfirm = 'Vous utilisez le didacticiel ZenTao. Voulez-vous quitter maintenant ？';
$lang->preShortcutKey = '[Shortcut:←]';
$lang->nextShortcutKey = '[Shortcut:→]';
@@ -98,10 +99,10 @@ $lang->select = 'Sélectionner';
$lang->selectAll = 'Tout sélectionner';
$lang->selectReverse = "Sélectionner l'inverse";
$lang->loading = 'Chargement...';
-$lang->notFound = 'Not found !';
+$lang->notFound = 'Non trouvé !';
$lang->notPage = 'Désolé, la fonctionnalité que vous souhaitez utiliser est encore en développement !';
$lang->showAll = '[[Voir Tout]]';
-$lang->selectedItems = 'Seleted {0} items';
+$lang->selectedItems = ' {0} items sélectionnés';
$lang->future = 'En Attente';
$lang->year = 'Année';
@@ -335,7 +336,6 @@ $lang->testreport->menu->caselib = array('link' => 'Library Recette|caselib|br
$lang->caselib = new stdclass();
$lang->caselib->menu = new stdclass();
-$lang->caselib->subMenu = $lang->qa->subMenu;
$lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|');
$lang->caselib->menu->testcase = array('link' => 'CasTest|testcase|browse|', 'class' => 'dropdown dropdown-hover');
$lang->caselib->menu->testtask = array('link' => 'Recette|testtask|browse|');
@@ -343,6 +343,11 @@ $lang->caselib->menu->testsuite = array('link' => 'Cahier Recette|testsuite|brow
$lang->caselib->menu->report = array('link' => 'Rapport|testreport|browse|');
$lang->caselib->menu->caselib = array('link' => 'Library Recette|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase');
+$lang->caselib->subMenu = new stdclass();
+$lang->caselib->subMenu->testcase = new stdclass();
+$lang->caselib->subMenu->testcase->feature = array('link' => 'Functional Test|testcase|browse|', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story');
+$lang->caselib->subMenu->testcase->unit = array('link' => 'Unit Test|testtask|browseUnits|');
+
$lang->ci = new stdclass();
$lang->ci->menu = new stdclass();
$lang->ci->menu->code = array('link' => 'Code|repo|browse|repoID=%s', 'alias' => 'diff,view,revision,log,blame,showsynccomment');
@@ -405,7 +410,7 @@ $lang->admin->menu->index = array('link' => 'Accueil|admin|index', 'alias' =
$lang->admin->menu->message = array('link' => 'Notification|message|index', 'subModule' => 'message,mail,webhook');
$lang->admin->menu->custom = array('link' => 'Personnalisation|custom|set', 'subModule' => 'custom');
$lang->admin->menu->sso = array('link' => 'Intégration|admin|sso');
-
+$lang->admin->menu->extension = array('link' => 'Extension|extension|browse', 'subModule' => 'extension');
$lang->admin->menu->dev = array('link' => 'Dévelop.|dev|api', 'alias' => 'db', 'subModule' => 'dev,entry');
$lang->admin->menu->translate = array('link' => 'Traduire|dev|translate');
$lang->admin->menu->data = array('link' => 'Données|backup|index', 'subModule' => 'backup,action');
@@ -505,31 +510,31 @@ $lang->menugroup->job = 'ci';
/* Error info. */
$lang->error = new stdclass();
-$lang->error->companyNotFound = "The domain %s cannot be found!";
-$lang->error->length = array("『 %s 』length error. It should be『%s』", "『%s』length should be <=『%s』and >『%s』.");
-$lang->error->reg = "『 %s 』format error. It should be『%s』.";
-$lang->error->unique = "『 %s 』『 %s 』exists. Go to Admin->Recycle Bin to restore it, if you are sure it is deleted.";
-$lang->error->gt = "『 %s 』should be > 『 %s 』.";
-$lang->error->ge = "『 %s 』should be >= 『 %s 』.";
-$lang->error->notempty = "『 %s 』should not be blank.";
-$lang->error->empty = "『 %s 』should be null.";
-$lang->error->equal = "『 %s 』has to be 『 %s 』.";
-$lang->error->int = array("『 %s 』should be numbers", "『 %s 』should be 『 %s-%s 』.");
-$lang->error->float = "『 %s 』should have numbers, or decimals.";
-$lang->error->email = "『 %s 』should be valid Email.";
-$lang->error->URL = "『 %s 』should be url.";
-$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->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!';
+$lang->error->companyNotFound = "Le domaine %s ne peut être trouvé !";
+$lang->error->length = array("『 %s 』erreur de longueur. Il devrait être『%s』", "La longueur de 『%s』devrait être <=『%s』et >『%s』.");
+$lang->error->reg = "『 %s 』erreur de format. Il devrait être『%s』.";
+$lang->error->unique = "『 %s 』『 %s 』existes. Allez à Admin->Recycle Bin pour le restaurer, si vous êtes sûr qu'il est supprimé.";
+$lang->error->gt = "『 %s 』devrait être > 『 %s 』.";
+$lang->error->ge = "『 %s 』devrait être >= 『 %s 』.";
+$lang->error->notempty = "『 %s 』ne devrait pas être à blanc.";
+$lang->error->empty = "『 %s 』devrait être nul.";
+$lang->error->equal = "『 %s 』doit être 『 %s 』.";
+$lang->error->int = array("『 %s 』devrait être des nombres", "『 %s 』devrait être 『 %s-%s 』.");
+$lang->error->float = "『 %s 』devrait avoir des nombres ou des décimales.";
+$lang->error->email = "『 %s 』doit être une adresse mail valide.";
+$lang->error->URL = "『 %s 』doit être une url.";
+$lang->error->date = "『%s』doit être une date valide.";
+$lang->error->datetime = "『 %s 』doit être une date valide.";
+$lang->error->code = "『 %s 』doit être des lettres ou des chiffres.";
+$lang->error->account = "『 %s 』doit être >= 3 lettres ou chiffres.";
+$lang->error->passwordsame = "Les mots de passe doivent être cohérents.";
+$lang->error->passwordrule = "Le mot de passe doit être conforme aux règles. Il devrait être >= 6 caractères.";
+$lang->error->accessDenied = 'Accès refusé.';
+$lang->error->pasteImg = 'Les images ne peuvent pas être collées dans votre navigateur !';
$lang->error->noData = 'No data.';
-$lang->error->editedByOther = 'This record might have been changed. Please refresh and try to edit again!';
-$lang->error->tutorialData = 'No data can be imported in tutorial mode. Please quit tutorial first!';
-$lang->error->noCurlExt = 'No Curl module installed';
+$lang->error->editedByOther = 'Cet enregistrement a peut-être été modifié. Veuillez actualiser et réessayer !';
+$lang->error->tutorialData = "Aucune donnée ne peut être importée en mode tutoriel. Veuillez d'abord quitter le didacticiel !";
+$lang->error->noCurlExt = 'Aucun module Curl installé';
/* Page info. */
$lang->pager = new stdclass();
@@ -559,24 +564,23 @@ $lang->colorPicker = new stdclass();
$lang->colorPicker->errorTip = "Ce n'est pas une valeur de couleur valide";
$lang->proVersion = " ZenTao Pro ";
-$lang->downNotify = "Download Desktop Notification";
-$lang->downloadClient = "Download ZenTao Desktop";
-$lang->clientHelp = "Client Help";
+$lang->downNotify = "Télécharger la notification sur le bureau";
+$lang->downloadClient = "Télécharger ZenTao Desktop";
+$lang->clientHelp = "Aide Client";
$lang->clientHelpLink = "https://www.zentao.pm/book/zentaomanual/scrum-tool-im-integration-206.html";
$lang->website = "https://www.zentao.pm";
-$lang->suhosinInfo = "Warning ! Data is reaching the limit. Please change sohusin.post.max_vars and sohusin.request.max_vars (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved.";
-$lang->maxVarsInfo = "Warning ! Data is reaching the limit. Please change max_input_vars (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved.";
+$lang->suhosinInfo = "Avertissement ! Les données atteignent la limite. Veuillez changer sohusin.post.max_vars et sohusin.request.max_vars (set larger %s value) dans php.ini, puis relancez Apache ou php-fpm, ou des données ne seront pas sauvegardées.";
+$lang->maxVarsInfo = "Avertissement ! Les données atteignent la limite. Veuillez changer max_input_vars (set larger %s value) dans php.ini, puis relancez Apache ou php-fpm, ou des données ne seront pas sauvegardées.";
$lang->pasteTextInfo = "Collez le texte ici. Chaque ligne sera un titre. ";
$lang->noticeImport = "Les données importées contiennent des données qui existent déjà dans le système. Confirmez s'il vous plait cette action.";
$lang->importConfirm = "Importer";
$lang->importAndCover = "Ecraser";
$lang->importAndInsert = "Inserer";
-$lang->noResultsMatch = "Aucun résults trouvé !";
-$lang->searchMore = "Plus de résults ：";
+$lang->noResultsMatch = "Aucun résultat trouvé !";
+$lang->searchMore = "Plus de résultats ：";
$lang->chooseUsersToMail = "Choisissez les utilisateurs à avertir.";
-$lang->browserNotice = "Le navigateur que vous utilisez actuellement peut ne pas vous afficher les résultats correctement. Il est recommandé d'utiliser Chrome, Palemoon, Firefox, IE9+, Opera or Safari.";
$lang->noticePasteImg = "Vous pouvez déposer des images dans l'éditeur.";
$lang->pasteImgFail = "Echec lors de la dépose des images. Essayez plus tard.";
$lang->pasteImgUploading = "Chargement...";
@@ -790,8 +794,8 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
/* Add bug, testcase and testtask module. */
$lang->menu->bug = 'Bug|bug|index';
- $lang->menu->testcase = 'Functional Test|testcase|index';
- $lang->menu->unit = 'Unit Test|testtask|browseUnits';
+ $lang->menu->testcase = 'Tests Fonctionnels|testcase|index';
+ $lang->menu->unit = 'Unité de Test|testtask|browseUnits';
$lang->menu->testsuite = 'Cahier de Recette|testsuite|index';
$lang->menu->testtask = 'Recette|testtask|index';
$lang->menu->caselib = 'Library Recette|caselib|browse';
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index a732a38fee..72e34b7e2e 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -58,6 +58,8 @@ $lang->trunk = 'Trunk';
$lang->sort = 'Sắp xếp';
$lang->required = 'Bắt buộc';
$lang->noData = 'Không có dữ liệu.';
+$lang->fullscreen = 'Fullscreen';
+$lang->retrack = 'Retrack';
$lang->actions = 'Hành động';
$lang->restore = 'Thiết lập lại';
@@ -84,7 +86,6 @@ $lang->homepage = 'Trang thiết lập';
$lang->noviceTutorial = 'Hướng dẫn ZenTao';
$lang->changeLog = 'Thay đổi nhật ký';
$lang->manual = 'Hướng dẫn người dùng';
-$lang->manualUrl = 'https://www.zentao.pm/book/zentaomanual/zentao-installation-11.html';
$lang->customMenu = 'Tùy biến Menu';
$lang->customField = 'Tùy biến trường';
$lang->lineNumber = 'Số dòng';
@@ -335,7 +336,6 @@ $lang->testreport->menu->caselib = array('link' => 'Thư viện tình huống|
$lang->caselib = new stdclass();
$lang->caselib->menu = new stdclass();
-$lang->caselib->subMenu = $lang->qa->subMenu;
$lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|');
$lang->caselib->menu->testcase = array('link' => 'Tình huống|testcase|browse|', 'class' => 'dropdown dropdown-hover');
$lang->caselib->menu->testtask = array('link' => 'Yêu cầu|testtask|browse|');
@@ -343,6 +343,11 @@ $lang->caselib->menu->testsuite = array('link' => 'Suite|testsuite|browse|');
$lang->caselib->menu->report = array('link' => 'Báo cáo|testreport|browse|');
$lang->caselib->menu->caselib = array('link' => 'Thư viện tình huống|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase');
+$lang->caselib->subMenu = new stdclass();
+$lang->caselib->subMenu->testcase = new stdclass();
+$lang->caselib->subMenu->testcase->feature = array('link' => 'Functional Test|testcase|browse|', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story');
+$lang->caselib->subMenu->testcase->unit = array('link' => 'Unit Test|testtask|browseUnits|');
+
$lang->ci = new stdclass();
$lang->ci->menu = new stdclass();
$lang->ci->menu->code = array('link' => 'Code|repo|browse|repoID=%s', 'alias' => 'diff,view,revision,log,blame,showsynccomment');
@@ -401,11 +406,11 @@ $lang->user->menu = $lang->company->menu;
/* Admin menu settings. */
$lang->admin = new stdclass();
$lang->admin->menu = new stdclass();
-$lang->admin->menu->index = array('link' => 'Home|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
-$lang->admin->menu->message = array('link' => 'Thông báo|message|index', 'subModule' => 'message,mail,webhook');
-$lang->admin->menu->custom = array('link' => 'Custom|custom|set', 'subModule' => 'custom');
-$lang->admin->menu->sso = array('link' => 'Integration|admin|sso');
-
+$lang->admin->menu->index = array('link' => 'Home|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
+$lang->admin->menu->message = array('link' => 'Thông báo|message|index', 'subModule' => 'message,mail,webhook');
+$lang->admin->menu->custom = array('link' => 'Custom|custom|set', 'subModule' => 'custom');
+$lang->admin->menu->sso = array('link' => 'Integration|admin|sso');
+$lang->admin->menu->extension = array('link' => 'Extension|extension|browse', 'subModule' => 'extension');
$lang->admin->menu->dev = array('link' => 'Develop|dev|api', 'alias' => 'db', 'subModule' => 'dev,entry');
$lang->admin->menu->translate = array('link' => 'Translate|dev|translate');
$lang->admin->menu->data = array('link' => 'Data|backup|index', 'subModule' => 'backup,action');
@@ -522,7 +527,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 two passwords should be the same.";
$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!';
@@ -576,7 +581,6 @@ $lang->importAndInsert = "Insert";
$lang->noResultsMatch = "Không có results match found!";
$lang->searchMore = "More results：";
$lang->chooseUsersToMail = "Chọn users that will be notified.";
-$lang->browserNotice = 'The browser you currently use might not get the best browsing results. It is recommended that you use Chrome, Firefox, IE9+, Opera or Safari.';
$lang->noticePasteImg = "Bạn có thể paste images into the editor.";
$lang->pasteImgFail = "Lỗi paste images. Try again later.";
$lang->pasteImgUploading = "Uploading...";
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index f94e5f5c78..3e98b776bd 100755
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -58,6 +58,8 @@ $lang->trunk = '主干';
$lang->sort = '排序';
$lang->required = '必填';
$lang->noData = '暂无';
+$lang->fullscreen = '全屏';
+$lang->retrack = '收起';
$lang->actions = '操作';
$lang->restore = '恢复默认';
@@ -84,7 +86,6 @@ $lang->homepage = '设为模块首页';
$lang->noviceTutorial = '新手教程';
$lang->changeLog = '修改日志';
$lang->manual = '手册';
-$lang->manualUrl = 'https://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao';
$lang->customMenu = '自定义导航';
$lang->customField = '自定义表单项';
$lang->lineNumber = '行号';
@@ -377,7 +378,6 @@ $lang->testreport->menu->caselib = array('link' => '用例库|caselib|browse')
$lang->caselib = new stdclass();
$lang->caselib->menu = new stdclass();
-$lang->caselib->subMenu = $lang->qa->subMenu;
$lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|');
$lang->caselib->menu->testcase = array('link' => '用例|testcase|browse|', 'class' => 'dropdown dropdown-hover');
$lang->caselib->menu->testtask = array('link' => '测试单|testtask|browse|');
@@ -385,6 +385,11 @@ $lang->caselib->menu->testsuite = array('link' => '套件|testsuite|browse|');
$lang->caselib->menu->report = array('link' => '报告|testreport|browse|');
$lang->caselib->menu->caselib = array('link' => '用例库|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase');
+$lang->caselib->subMenu = new stdclass();
+$lang->caselib->subMenu->testcase = new stdclass();
+$lang->caselib->subMenu->testcase->feature = array('link' => '功能测试|testcase|browse|', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story');
+$lang->caselib->subMenu->testcase->unit = array('link' => '单元测试|testtask|browseUnits|');
+
$lang->ci = new stdclass();
$lang->ci->menu = new stdclass();
$lang->ci->menu->code = array('link' => '代码|repo|browse|repoID=%s', 'alias' => 'diff,view,revision,log,blame,showsynccomment');
@@ -467,7 +472,7 @@ $lang->admin->subMenu->message->browser = array('link' => '浏览器|message|bro
$lang->admin->subMenu->message->setting = array('link' => '设置|message|setting');
$lang->admin->subMenu->sso = new stdclass();
-$lang->admin->subMenu->sso->ranzhi = '然之协同|admin|sso';
+$lang->admin->subMenu->sso->ranzhi = 'ZDOO|admin|sso';
$lang->admin->subMenu->dev = new stdclass();
$lang->admin->subMenu->dev->api = array('link' => 'API|dev|api');
@@ -644,7 +649,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 = '您的浏览器不支持粘贴图片！';
@@ -698,7 +703,6 @@ $lang->importAndInsert = "全新插入";
$lang->noResultsMatch = "没有匹配结果";
$lang->searchMore = "搜索此关键字的更多结果：";
$lang->chooseUsersToMail = "选择要发信通知的用户...";
-$lang->browserNotice = '你目前使用的浏览器可能无法得到最佳浏览效果，建议使用Chrome、火狐、IE9+、Opera、Safari浏览器。';
$lang->noticePasteImg = "可以在编辑器直接贴图。";
$lang->pasteImgFail = "贴图失败，请稍后重试。";
$lang->pasteImgUploading = "正在上传图片，请稍后...";
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 37b8cd844a..42087dfda1 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -58,6 +58,8 @@ $lang->trunk = '主幹';
$lang->sort = '排序';
$lang->required = '必填';
$lang->noData = '暫無';
+$lang->fullscreen = '全屏';
+$lang->retrack = '收起';
$lang->actions = '操作';
$lang->restore = '恢復預設';
@@ -84,7 +86,6 @@ $lang->homepage = '設為模組首頁';
$lang->noviceTutorial = '新手教程';
$lang->changeLog = '修改日誌';
$lang->manual = '手冊';
-$lang->manualUrl = 'https://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao';
$lang->customMenu = '自定義導航';
$lang->customField = '自定義表單項';
$lang->lineNumber = '行號';
@@ -335,7 +336,6 @@ $lang->testreport->menu->caselib = array('link' => '用例庫|caselib|browse')
$lang->caselib = new stdclass();
$lang->caselib->menu = new stdclass();
-$lang->caselib->subMenu = $lang->qa->subMenu;
$lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|');
$lang->caselib->menu->testcase = array('link' => '用例|testcase|browse|', 'class' => 'dropdown dropdown-hover');
$lang->caselib->menu->testtask = array('link' => '測試單|testtask|browse|');
@@ -343,6 +343,11 @@ $lang->caselib->menu->testsuite = array('link' => '套件|testsuite|browse|');
$lang->caselib->menu->report = array('link' => '報告|testreport|browse|');
$lang->caselib->menu->caselib = array('link' => '用例庫|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase');
+$lang->caselib->subMenu = new stdclass();
+$lang->caselib->subMenu->testcase = new stdclass();
+$lang->caselib->subMenu->testcase->feature = array('link' => '功能測試|testcase|browse|', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story');
+$lang->caselib->subMenu->testcase->unit = array('link' => '單元測試|testtask|browseUnits|');
+
$lang->ci = new stdclass();
$lang->ci->menu = new stdclass();
$lang->ci->menu->code = array('link' => '代碼|repo|browse|repoID=%s', 'alias' => 'diff,view,revision,log,blame,showsynccomment');
@@ -420,7 +425,7 @@ $lang->admin->subMenu->message->browser = array('link' => '瀏覽器|message|bro
$lang->admin->subMenu->message->setting = array('link' => '設置|message|setting');
$lang->admin->subMenu->sso = new stdclass();
-$lang->admin->subMenu->sso->ranzhi = '然之協同|admin|sso';
+$lang->admin->subMenu->sso->ranzhi = 'ZDOO|admin|sso';
$lang->admin->subMenu->dev = new stdclass();
$lang->admin->subMenu->dev->api = array('link' => 'API|dev|api');
@@ -522,7 +527,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 = '您的瀏覽器不支持粘貼圖片！';
@@ -576,7 +581,6 @@ $lang->importAndInsert = "全新插入";
$lang->noResultsMatch = "沒有匹配結果";
$lang->searchMore = "搜索此關鍵字的更多結果：";
$lang->chooseUsersToMail = "選擇要發信通知的用戶...";
-$lang->browserNotice = '你目前使用的瀏覽器可能無法得到最佳瀏覽效果，建議使用Chrome、火狐、IE9+、Opera、Safari瀏覽器。';
$lang->noticePasteImg = "可以在編輯器直接貼圖。";
$lang->pasteImgFail = "貼圖失敗，請稍後重試。";
$lang->pasteImgUploading = "正在上傳圖片，請稍後...";
diff --git a/module/common/model.php b/module/common/model.php
index c2d8b5a4e4..9878399831 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -167,10 +167,19 @@ class commonModel extends model
{
if(stripos($method, 'ajax') !== false) return true;
if($module == 'misc' and $method == 'downloadclient') return true;
+ if($module == 'misc' and $method == 'changelog') return true;
+ if($module == 'tutorial' and $method == 'start') return true;
+ if($module == 'tutorial' and $method == 'index') return true;
+ if($module == 'tutorial' and $method == 'quit') return true;
+ if($module == 'tutorial' and $method == 'wizard') return true;
+ if($module == 'block' and $method == 'admin') return true;
+ if($module == 'block' and $method == 'set') return true;
+ if($module == 'block' and $method == 'sort') return true;
+ if($module == 'block' and $method == 'resize') return true;
+ if($module == 'block' and $method == 'dashboard') return true;
+ if($module == 'block' and $method == 'printblock') return true;
if($module == 'block' and $method == 'main') return true;
- if($module == 'misc' and $method == 'changelog') return true;
- if($module == 'tutorial') return true;
- if($module == 'block') return true;
+ if($module == 'block' and $method == 'delete') return true;
if($module == 'product' and $method == 'showerrornone') return true;
if($module == 'report' and $method == 'annualdata') return true;
}
@@ -319,7 +328,10 @@ class commonModel extends model
echo " " . $lang->help . "";
echo "\n";
echo ' ' . html::a(helper::createLink('misc', 'about'), $lang->aboutZenTao, '', "class='about iframe' data-width='1050' data-headerless='true' data-backdrop='true' data-keyboard='true' data-class='modal-about'") . '';
@@ -727,15 +739,19 @@ class commonModel extends model
$isTutorialMode = commonModel::isTutorialMode();
$currentModule = $app->getModuleName();
$currentMethod = $app->getMethodName();
- $menu = customModel::getModuleMenu($moduleName);
$isMobile = $app->viewType === 'mhtml';
+ /* When use workflow then set rawModule to moduleName. */
+ if($moduleName == 'flow') $moduleName = $app->rawModule;
+ $menu = customModel::getModuleMenu($moduleName);
+
/* If this is not workflow then use rawModule and rawMethod to judge highlight. */
if($app->isFlow)
{
$currentModule = $app->rawModule;
$currentMethod = $app->rawMethod;
}
+
if($isTutorialMode and defined('WIZARD_MODULE')) $currentModule = WIZARD_MODULE;
if($isTutorialMode and defined('WIZARD_METHOD')) $currentMethod = WIZARD_METHOD;
@@ -857,9 +873,10 @@ class commonModel extends model
echo '';
return;
}
- foreach($position as $key => $link)
+
+ if(is_array($position))
{
- echo " " . $link . '';
+ foreach($position as $key => $link) echo " " . $link . '';
}
echo '';
}
@@ -1036,6 +1053,13 @@ class commonModel extends model
");
- var $btnToolbar = $('#main .table-header .btn-toolbar:first');
- if($btnToolbar.length > 0)
+ var addSettingButton = function()
{
- datatable->$datatableId->mode) ? $config->datatable->$datatableId->mode : 'table';?>
- var $dropdown = $('');
- var $dropmenu = $('');
- $dropmenu.append("datatable->custom?>");
- $dropmenu.append("\", true);' id='switchToDatatable'>datatable->switchToDatatable : $lang->datatable->switchToTable;?>");
- $dropdown.append($dropmenu).appendTo($btnToolbar);
- }
+ var $btnToolbar = $('#main .table-header .btn-toolbar:first');
+ if($btnToolbar.length > 0)
+ {
+ datatable->$datatableId->mode) ? $config->datatable->$datatableId->mode : 'table';?>
+ var $dropdown = $('');
+ var $dropmenu = $('');
+ $dropmenu.append("datatable->custom?>");
+ $dropmenu.append("\", true);' id='switchToDatatable'>datatable->switchToDatatable : $lang->datatable->switchToTable;?>");
+ $dropdown.append($dropmenu).appendTo($btnToolbar);
+ }
+ };
+ $('#main .main-table').on('tableReload', addSettingButton);
+ addSettingButton();
$('#setShowModule').click(function()
{
@@ -31,12 +36,12 @@ $(function()
{
type: "POST",
dataType: 'json',
- data:
+ data:
{
- target: datatableId,
- name: 'showModule',
- value: value,
- allModule: allModule,
+ target: datatableId,
+ name: 'showModule',
+ value: value,
+ allModule: allModule,
},
success:function(){window.location.reload();},
url: 'createLink('datatable', 'ajaxSave')?>'
@@ -72,12 +77,12 @@ $(function()
|