青岛易软天创网络科技有限公司开发。
官方网站:https://www.zentao.net
diff --git a/module/mail/lang/zh-tw.php b/module/mail/lang/zh-tw.php
index 68632d8851..78c5ba2881 100644
--- a/module/mail/lang/zh-tw.php
+++ b/module/mail/lang/zh-tw.php
@@ -59,7 +59,7 @@ $lang->mail->statusList['wait'] = '待發送';
$lang->mail->statusList['sended'] = '成功';
$lang->mail->statusList['fail'] = '失敗';
-$lang->mail->turnonList[1] = '打開';
+$lang->mail->turnonList[1] = '打開';
$lang->mail->turnonList[0] = '關閉';
$lang->mail->asyncList[1] = '是';
@@ -69,7 +69,7 @@ $lang->mail->debugList[0] = '關閉';
$lang->mail->debugList[1] = '一般';
$lang->mail->debugList[2] = '較高';
-$lang->mail->authList[1] = '需要';
+$lang->mail->authList[1] = '需要';
$lang->mail->authList[0] = '不需要';
$lang->mail->secureList[''] = '不加密';
diff --git a/module/repo/lang/de.php b/module/repo/lang/de.php
index 99d6b242b4..b58bd24719 100644
--- a/module/repo/lang/de.php
+++ b/module/repo/lang/de.php
@@ -147,6 +147,7 @@ $lang->repo->error->version = 'Version 1.8+ of https and svn protocol is r
$lang->repo->error->path = 'Repo address is the file path, e.g. /home/test.';
$lang->repo->error->cmd = 'Client Error!';
$lang->repo->error->diff = 'Two versions must be selected.';
+$lang->repo->error->safe = 'For security reasons, the client version needs to be detected. Please write the version to the file %s.
Execute command: %s';
$lang->repo->error->product = "Please select {$lang->productCommon}!";
$lang->repo->error->commentText = 'Please enter content for review!';
$lang->repo->error->comment = 'Please enter content!';
diff --git a/module/repo/lang/en.php b/module/repo/lang/en.php
index 10dbd70ca5..1cbc1e380b 100644
--- a/module/repo/lang/en.php
+++ b/module/repo/lang/en.php
@@ -147,6 +147,7 @@ $lang->repo->error->version = 'Version 1.8+ of https and svn protocol is r
$lang->repo->error->path = 'Repo address is the file path, e.g. /home/test.';
$lang->repo->error->cmd = 'Client Error!';
$lang->repo->error->diff = 'Two versions must be selected.';
+$lang->repo->error->safe = 'For security reasons, the client version needs to be detected. Please write the version to the file %s.
Execute command: %s';
$lang->repo->error->product = "Please select {$lang->productCommon}!";
$lang->repo->error->commentText = 'Please enter content for review!';
$lang->repo->error->comment = 'Please enter content!';
diff --git a/module/repo/lang/fr.php b/module/repo/lang/fr.php
index b7abe003c5..6f743d8e5f 100644
--- a/module/repo/lang/fr.php
+++ b/module/repo/lang/fr.php
@@ -147,6 +147,7 @@ $lang->repo->error->version = 'Version 1.8+ de https et du protocole svn e
$lang->repo->error->path = "L'adresse du référentiel est le chemin du fichier, ex: /home/test";
$lang->repo->error->cmd = 'Erreur du Client !';
$lang->repo->error->diff = 'Deux version doivent être sélectionnées.';
+$lang->repo->error->safe = 'For security reasons, the client version needs to be detected. Please write the version to the file %s.
Execute command: %s';
$lang->repo->error->product = "Veuillez sélectionner un {$lang->productCommon}!";
$lang->repo->error->commentText = 'Veuillez entrer du contenu pour une révision !';
$lang->repo->error->comment = 'Veuillez entrer le contenu du commentaire !';
diff --git a/module/repo/lang/vi.php b/module/repo/lang/vi.php
index e6860960ac..37d8b33ab9 100644
--- a/module/repo/lang/vi.php
+++ b/module/repo/lang/vi.php
@@ -147,6 +147,7 @@ $lang->repo->error->version = 'Phiên bản 1.8+ of https and svn protocol
$lang->repo->error->path = 'Repo address is the file path, ví dụ: /home/test.';
$lang->repo->error->cmd = 'Client Error!';
$lang->repo->error->diff = 'Two versions phải là selected.';
+$lang->repo->error->safe = 'For security reasons, the client version needs to be detected. Please write the version to the file %s.
Execute command: %s';
$lang->repo->error->product = "Please select {$lang->productCommon}!";
$lang->repo->error->commentText = 'Vui lòng nhập nội dung để duyệt!';
$lang->repo->error->comment = 'Vui lòng nhập content!';
diff --git a/module/repo/lang/zh-tw.php b/module/repo/lang/zh-tw.php
index 82d8a6e0a2..5a33f3af16 100644
--- a/module/repo/lang/zh-tw.php
+++ b/module/repo/lang/zh-tw.php
@@ -147,6 +147,7 @@ $lang->repo->error->version = "https和svn協議需要1.8及以上版本
$lang->repo->error->path = '版本庫地址直接填寫檔案路徑,如:/home/test。';
$lang->repo->error->cmd = '客戶端錯誤!';
$lang->repo->error->diff = '必須選擇兩個版本';
+$lang->repo->error->safe = '因為安全原因,需要檢測客戶端版本,請將版本號寫入檔案 %s
可以執行命令:%s';
$lang->repo->error->product = "請選擇{$lang->productCommon}!";
$lang->repo->error->commentText = '請填寫評審內容';
$lang->repo->error->comment = '請填寫內容';
diff --git a/module/report/lang/zh-tw.php b/module/report/lang/zh-tw.php
index f738c9d66a..df836fd361 100644
--- a/module/report/lang/zh-tw.php
+++ b/module/report/lang/zh-tw.php
@@ -33,7 +33,7 @@ $lang->report->colors[] = '9D080D';
$lang->report->colors[] = 'A186BE';
$lang->report->assign['noassign'] = '未指派';
-$lang->report->assign['assign'] = '已指派';
+$lang->report->assign['assign'] = '已指派';
$lang->report->singleColor[] = 'F6BD0F';
diff --git a/module/tutorial/lang/zh-tw.php b/module/tutorial/lang/zh-tw.php
index 63db534924..d8fb1715c2 100644
--- a/module/tutorial/lang/zh-tw.php
+++ b/module/tutorial/lang/zh-tw.php
@@ -38,30 +38,46 @@ $lang->tutorial->tasks['createAccount'] = array('title' => '創建帳號
$lang->tutorial->tasks['createAccount']['nav'] = array('module' => 'user', 'method' => 'create', 'menuModule' => 'company', 'menu' => 'browseUser', 'form' => '#createForm', 'submit' => '#submit', 'target' => '.create-user-btn', 'targetPageName' => '添加用戶');
$lang->tutorial->tasks['createAccount']['desc'] = "在系統創建一個新的用戶帳號:
- 打開 組織 用戶 添加用戶 頁面;
- 在添加用戶表單中填寫新用戶信息;
- 保存用戶信息。
";
-$lang->tutorial->tasks['createProduct'] = array('title' => '創建' . $lang->productCommon);
-$lang->tutorial->tasks['createProduct']['nav'] = array('module' => 'product', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#createForm', 'submit' => '#submit', 'target' => '.create-product-btn', 'targetPageName' => '添加' . $lang->productCommon);
-$lang->tutorial->tasks['createProduct']['desc'] = "在系統創建一個新的{$lang->productCommon}:
- 打開 {$lang->productCommon} 添加{$lang->productCommon} 頁面;
- 在表單中填寫要創建的{$lang->productCommon}信息;
- 保存{$lang->productCommon}信息。
";
+global $config;
+if($config->global->flow == 'full' or $config->global->flow != 'onlyTask')
+{
+ $lang->tutorial->tasks['createProduct'] = array('title' => '創建' . $lang->productCommon);
+ $lang->tutorial->tasks['createProduct']['nav'] = array('module' => 'product', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#createForm', 'submit' => '#submit', 'target' => '.create-product-btn', 'targetPageName' => '添加' . $lang->productCommon);
+ $lang->tutorial->tasks['createProduct']['desc'] = "在系統創建一個新的{$lang->productCommon}:
- 打開 {$lang->productCommon} 添加{$lang->productCommon} 頁面;
- 在表單中填寫要創建的{$lang->productCommon}信息;
- 保存{$lang->productCommon}信息。
";
+}
-$lang->tutorial->tasks['createStory'] = array('title' => "創建{$lang->storyCommon}");
-$lang->tutorial->tasks['createStory']['nav'] = array('module' => 'story', 'method' => 'create', 'menuModule' => 'product', 'menu' => 'story', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => "提{$lang->storyCommon}");
-$lang->tutorial->tasks['createStory']['desc'] = "在系統創建一個新的{$lang->storyCommon}:
- 打開 {$lang->productCommon} {$lang->storyCommon} 添加{$lang->storyCommon} 頁面;
- 在表單中填寫要創建的{$lang->storyCommon}信息;
- 保存{$lang->storyCommon}信息。
";
+if($config->global->flow == 'full' or $config->global->flow == 'onlyStory')
+{
+ $lang->tutorial->tasks['createStory'] = array('title' => "創建{$lang->storyCommon}");
+ $lang->tutorial->tasks['createStory']['nav'] = array('module' => 'story', 'method' => 'create', 'menuModule' => 'product', 'menu' => 'story', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => "提{$lang->storyCommon}");
+ $lang->tutorial->tasks['createStory']['desc'] = "在系統創建一個新的{$lang->storyCommon}:
- 打開 {$lang->productCommon} {$lang->storyCommon} 添加{$lang->storyCommon} 頁面;
- 在表單中填寫要創建的{$lang->storyCommon}信息;
- 保存{$lang->storyCommon}信息。
";
+}
-$lang->tutorial->tasks['createProject'] = array('title' => '創建' . $lang->projectCommon);
-$lang->tutorial->tasks['createProject']['nav'] = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->projectCommon);
-$lang->tutorial->tasks['createProject']['desc'] = "在系統創建一個新的{$lang->projectCommon}:
- 打開 {$lang->projectCommon} 添加{$lang->projectCommon} 頁面;
- 在表單中填寫要創建的{$lang->projectCommon}信息;
- 保存{$lang->projectCommon}信息。
";
+if($config->global->flow == 'full' or $config->global->flow == 'onlyTask')
+{
+ $lang->tutorial->tasks['createProject'] = array('title' => '創建' . $lang->projectCommon);
+ $lang->tutorial->tasks['createProject']['nav'] = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->projectCommon);
+ $lang->tutorial->tasks['createProject']['desc'] = "在系統創建一個新的{$lang->projectCommon}:
- 打開 {$lang->projectCommon} 添加{$lang->projectCommon} 頁面;
- 在表單中填寫要創建的{$lang->projectCommon}信息;
- 保存{$lang->projectCommon}信息。
";
-$lang->tutorial->tasks['manageTeam'] = array('title' => '管理團隊');
-$lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '團隊管理');
-$lang->tutorial->tasks['manageTeam']['desc'] = "管理{$lang->projectCommon}團隊成員:
- 打開 {$lang->projectCommon} 團隊 團隊管理 頁面;
- 選擇要加入團隊的成員;
- 保存團隊成員信息。
";
+ $lang->tutorial->tasks['manageTeam'] = array('title' => '管理團隊');
+ $lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '團隊管理');
+ $lang->tutorial->tasks['manageTeam']['desc'] = "管理{$lang->projectCommon}團隊成員:
- 打開 {$lang->projectCommon} 團隊 團隊管理 頁面;
- 選擇要加入團隊的成員;
- 保存團隊成員信息。
";
-$lang->tutorial->tasks['linkStory'] = array('title' => "關聯{$lang->storyCommon}");
-$lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "關聯{$lang->storyCommon}");
-$lang->tutorial->tasks['linkStory']['desc'] = "將{$lang->storyCommon}關聯到{$lang->projectCommon}:
- 打開 {$lang->projectCommon} {$lang->storyCommon} 關聯{$lang->storyCommon} 頁面;
- 在{$lang->storyCommon}列表中勾選要關聯的{$lang->storyCommon};
- 保存關聯的{$lang->storyCommon}信息。
";
+ if($config->global->flow == 'full')
+ {
+ $lang->tutorial->tasks['linkStory'] = array('title' => "關聯{$lang->storyCommon}");
+ $lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "關聯{$lang->storyCommon}");
+ $lang->tutorial->tasks['linkStory']['desc'] = "將{$lang->storyCommon}關聯到{$lang->projectCommon}:
- 打開 {$lang->projectCommon} {$lang->storyCommon} 關聯{$lang->storyCommon} 頁面;
- 在{$lang->storyCommon}列表中勾選要關聯的{$lang->storyCommon};
- 保存關聯的{$lang->storyCommon}信息。
";
+ }
-$lang->tutorial->tasks['createTask'] = array('title' => '分解任務');
-$lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '建任務');
-$lang->tutorial->tasks['createTask']['desc'] = "將{$lang->projectCommon}{$lang->storyCommon}分解為任務:
- 打開 {$lang->projectCommon} {$lang->storyCommon} 分解任務 頁面;
- 在表單中填寫任務信息;
- 保存任務信息。
";
+ $lang->tutorial->tasks['createTask'] = array('title' => '分解任務');
+ $lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '建任務');
+ $lang->tutorial->tasks['createTask']['desc'] = "將{$lang->projectCommon}{$lang->storyCommon}分解為任務:
- 打開 {$lang->projectCommon} {$lang->storyCommon} 分解任務 頁面;
- 在表單中填寫任務信息;
- 保存任務信息。
";
+}
-$lang->tutorial->tasks['createBug'] = array('title' => '提Bug');
-$lang->tutorial->tasks['createBug']['nav'] = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '提Bug');
-$lang->tutorial->tasks['createBug']['desc'] = "在系統中提交一個Bug:
- 打開 測試 Bug 提Bug;
- 在表單中填寫Bug信息;
- 保存Bug信息。
";
+if($config->global->flow == 'full' or $config->global->flow == 'onlyTest')
+{
+ $lang->tutorial->tasks['createBug'] = array('title' => '提Bug');
+ $lang->tutorial->tasks['createBug']['nav'] = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '提Bug');
+ $lang->tutorial->tasks['createBug']['desc'] = "在系統中提交一個Bug:
- 打開 測試 Bug 提Bug;
- 在表單中填寫Bug信息;
- 保存Bug信息。
";
+}
diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php
index 8421a9485c..071782c9f3 100644
--- a/module/upgrade/lang/version.php
+++ b/module/upgrade/lang/version.php
@@ -125,3 +125,4 @@ $lang->upgrade->fromVersions['12_3_1'] = '12.3.1';
$lang->upgrade->fromVersions['12_3_2'] = '12.3.2';
$lang->upgrade->fromVersions['12_3_3'] = '12.3.3';
$lang->upgrade->fromVersions['12_4'] = '12.4';
+$lang->upgrade->fromVersions['12_4_1'] = '12.4.1';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 3cbf97a3f3..f86873cfde 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -606,6 +606,9 @@ class upgradeModel extends model
$this->saveLogs('Execute 12_4');
$this->execSQL($this->getUpgradeFile('12.4'));
$this->appendExec('12_4');
+ case '12_4_1':
+ $this->saveLogs('Execute 12_4_1');
+ $this->appendExec('12_4_1');
}
$this->deletePatch();
@@ -782,6 +785,7 @@ class upgradeModel extends model
case '12_3_2': $confirmContent .= file_get_contents($this->getUpgradeFile('12.3.2'));
case '12_3_3': $confirmContent .= file_get_contents($this->getUpgradeFile('12.3.3'));
case '12_4': $confirmContent .= file_get_contents($this->getUpgradeFile('12.4'));
+ case '12_4_1':
}
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
}