Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2018-09-04 13:23:33 +08:00
parent adaed46a79 2154470cd1
commit 3fdefc81e9
5 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/en.php
+1 -1
View File
@@ -267,7 +267,7 @@ $lang->qa->menu = new stdclass();
$lang->qa->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->qa->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s');
$lang->qa->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s');
$lang->qa->menu->testtask = array('link' => 'Test Task|testtask|browse|productID=%s');
$lang->qa->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s');
$lang->qa->menu->report = array('link' => 'Report|testreport|browse|productID=%s');
$lang->qa->menu->caselib = array('link' => 'Library|testsuite|library');
module/tree/control.php
+2 -1
View File
@@ -316,7 +316,8 @@ class tree extends control
{
if($confirm == 'no')
{
die(js::confirm($this->lang->tree->confirmDelete, $this->createLink('tree', 'delete', "rootID=$rootID&moduleID=$moduleID&confirm=yes")));
$module = $this->tree->getByID($moduleID);
die(js::confirm($module->type == 'line' ? $this->lang->tree->confirmDeleteLine : $this->lang->tree->confirmDelete, $this->createLink('tree', 'delete', "rootID=$rootID&moduleID=$moduleID&confirm=yes")));
}
else
{
module/tree/lang/en.php
+6 -6
View File
@@ -36,12 +36,12 @@ $lang->tree->syncFromProduct = 'Copy';
$lang->tree->dragAndSort = "Drag and Sort";
$lang->tree->sort = "Sort";
$lang->tree->addChild = "Add Child";
$lang->tree->confirmDelete = 'Do you want to delete this Module and its Children?';
$lang->tree->confirmRoot = "Changes on {$lang->productCommon} will change the Story, Bug, Case of {$lang->productCommon} it belongs to, as well as the realtion of {$lang->projectCommon} and {$lang->productCommon}, which is dangerous, please be aware of it. Do you want to change?";
$lang->tree->successSave = 'Saved.';
$lang->tree->successFixed = 'Fixed.';
$lang->tree->repeatName = 'The name "%s" has existed!';
$lang->tree->confirmDelete = 'Do you want to delete this Module and its Children?';
$lang->tree->confirmDeleteLine = 'Do you want to delete this Product Line and its Children?';
$lang->tree->confirmRoot = "Changes on {$lang->productCommon} will change the Story, Bug, Case of {$lang->productCommon} it belongs to, as well as the realtion of {$lang->projectCommon} and {$lang->productCommon}, which is dangerous, please be aware of it. Do you want to change?";
$lang->tree->successSave = 'Saved.';
$lang->tree->successFixed = 'Fixed.';
$lang->tree->repeatName = 'The name "%s" has existed!';
$lang->tree->module = 'Module';
$lang->tree->name = 'Name';
module/tree/lang/zh-cn.php
+6 -6
View File
@@ -36,12 +36,12 @@ $lang->tree->syncFromProduct = '复制模块';
$lang->tree->dragAndSort = "拖放排序";
$lang->tree->sort = "排序";
$lang->tree->addChild = "增加子模块";
$lang->tree->confirmDelete = '该模块及其子模块都会被删除，您确定删除吗？';
$lang->tree->confirmRoot = "模块的所属{$lang->productCommon}修改，会关联修改该模块下的需求、Bug、用例的所属{$lang->productCommon}，以及{$lang->projectCommon}和{$lang->productCommon}的关联关系。该操作比较危险，请谨慎操作。是否确认修改？";
$lang->tree->successSave = '成功保存';
$lang->tree->successFixed = '成功修正数据！';
$lang->tree->repeatName = '模块名“%s”已经存在！';
$lang->tree->confirmDelete = '该模块及其子模块都会被删除，您确定删除吗？';
$lang->tree->confirmDeleteLine = '该产品线及其子产品线都会被删除，您确定删除吗？';
$lang->tree->confirmRoot = "模块的所属{$lang->productCommon}修改，会关联修改该模块下的需求、Bug、用例的所属{$lang->productCommon}，以及{$lang->projectCommon}和{$lang->productCommon}的关联关系。该操作比较危险，请谨慎操作。是否确认修改？";
$lang->tree->successSave = '成功保存';
$lang->tree->successFixed = '成功修正数据！';
$lang->tree->repeatName = '模块名“%s”已经存在！';
$lang->tree->module = '模块';
$lang->tree->name = '模块名称';
module/tree/lang/zh-tw.php
+6 -6
View File
@@ -36,12 +36,12 @@ $lang->tree->syncFromProduct = '複製模組';
$lang->tree->dragAndSort = "拖放排序";
$lang->tree->sort = "排序";
$lang->tree->addChild = "增加子模組";
$lang->tree->confirmDelete = '該模組及其子模組都會被刪除，您確定刪除嗎？';
$lang->tree->confirmRoot = "模組的所屬{$lang->productCommon}修改，會關聯修改該模組下的需求、Bug、用例的所屬{$lang->productCommon}，以及{$lang->projectCommon}和{$lang->productCommon}的關聯關係。該操作比較危險，請謹慎操作。是否確認修改？";
$lang->tree->successSave = '成功保存';
$lang->tree->successFixed = '成功修正數據！';
$lang->tree->repeatName = '模組名“%s”已經存在！';
$lang->tree->confirmDelete = '該模組及其子模組都會被刪除，您確定刪除嗎？';
$lang->tree->confirmDeleteLine = '該產品綫及其子產品綫都會被刪除，您確定刪除嗎？';
$lang->tree->confirmRoot = "模組的所屬{$lang->productCommon}修改，會關聯修改該模組下的需求、Bug、用例的所屬{$lang->productCommon}，以及{$lang->projectCommon}和{$lang->productCommon}的關聯關係。該操作比較危險，請謹慎操作。是否確認修改？";
$lang->tree->successSave = '成功保存';
$lang->tree->successFixed = '成功修正數據！';
$lang->tree->repeatName = '模組名“%s”已經存在！';
$lang->tree->module = '模組';
$lang->tree->name = '模組名稱';