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

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

Browse Source
This commit is contained in:
Yagami
2020-09-02 13:59:15 +08:00
parent 3cb808bd22 d21075c1ba
commit 9d1a30a3d6
6 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/lang/de.php
+3 -6
View File
@@ -32,9 +32,9 @@ $lang->custom->region = 'Interval';
$lang->custom->tips = 'Tips';
$lang->custom->setTips = 'Set Tips';
$lang->custom->isRange = 'Is Target Control';
$lang->custom->plan = 'Plan';
$lang->custom->planStatus = 'Enable Plan';
$lang->custom->concept = 'Concept';
$lang->custom->configureScrum = 'Concept';
$lang->custom->URStory = "User requirements";
$lang->custom->SRStory = "Software requirements";
$lang->custom->object['program'] = 'Program';
$lang->custom->program->fields['unitList'] = 'Unit List';
@@ -52,9 +52,6 @@ $lang->custom->tipProgressList['SV'] = 'Schedule Variance(SV%)';
$lang->custom->tipCostList['CPI'] = 'Cost Performed Index(CPI)';
$lang->custom->tipCostList['CV'] = 'Cost Variance(CV%)';
$lang->custom->planStatusList[0] = 'No';
$lang->custom->planStatusList[1] = 'Yes';
$lang->custom->tipRangeList[0] = 'No';
$lang->custom->tipRangeList[1] = 'Yes';
module/custom/lang/en.php
+3 -6
View File
@@ -32,9 +32,9 @@ $lang->custom->region = 'Interval';
$lang->custom->tips = 'Tips';
$lang->custom->setTips = 'Set Tips';
$lang->custom->isRange = 'Is Target Control';
$lang->custom->plan = 'Plan';
$lang->custom->planStatus = 'Enable Plan';
$lang->custom->concept = 'Concept';
$lang->custom->configureScrum = 'Concept';
$lang->custom->URStory = "User requirements";
$lang->custom->SRStory = "Software requirements";
$lang->custom->object['program'] = 'Program';
$lang->custom->program->fields['unitList'] = 'Unit List';
@@ -52,9 +52,6 @@ $lang->custom->tipProgressList['SV'] = 'Schedule Variance(SV%)';
$lang->custom->tipCostList['CPI'] = 'Cost Performed Index(CPI)';
$lang->custom->tipCostList['CV'] = 'Cost Variance(CV%)';
$lang->custom->planStatusList[0] = 'No';
$lang->custom->planStatusList[1] = 'Yes';
$lang->custom->tipRangeList[0] = 'No';
$lang->custom->tipRangeList[1] = 'Yes';
module/custom/lang/fr.php
+3 -6
View File
@@ -32,9 +32,9 @@ $lang->custom->region = 'Interval';
$lang->custom->tips = 'Tips';
$lang->custom->setTips = 'Set Tips';
$lang->custom->isRange = 'Is Target Control';
$lang->custom->plan = 'Plan';
$lang->custom->planStatus = 'Enable Plan';
$lang->custom->concept = 'Concept';
$lang->custom->configureScrum = 'Concept';
$lang->custom->URStory = "User requirements";
$lang->custom->SRStory = "Software requirements";
$lang->custom->object['program'] = 'Program';
$lang->custom->program->fields['unitList'] = 'Unit List';
@@ -52,9 +52,6 @@ $lang->custom->tipProgressList['SV'] = 'Schedule Variance(SV%)';
$lang->custom->tipCostList['CPI'] = 'Cost Performed Index(CPI)';
$lang->custom->tipCostList['CV'] = 'Cost Variance(CV%)';
$lang->custom->planStatusList[0] = 'No';
$lang->custom->planStatusList[1] = 'Yes';
$lang->custom->tipRangeList[0] = 'No';
$lang->custom->tipRangeList[1] = 'Yes';
module/custom/lang/vi.php
+3 -6
View File
@@ -32,9 +32,9 @@ $lang->custom->region = 'Interval';
$lang->custom->tips = 'Tips';
$lang->custom->setTips = 'Set Tips';
$lang->custom->isRange = 'Is Target Control';
$lang->custom->plan = 'Plan';
$lang->custom->planStatus = 'Enable Plan';
$lang->custom->concept = 'Concept';
$lang->custom->configureScrum = 'Concept';
$lang->custom->URStory = "User requirements";
$lang->custom->SRStory = "Software requirements";
$lang->custom->object['program'] = 'Program';
$lang->custom->program->fields['unitList'] = 'Unit List';
@@ -52,9 +52,6 @@ $lang->custom->tipProgressList['SV'] = 'Schedule Variance(SV%)';
$lang->custom->tipCostList['CPI'] = 'Cost Performed Index(CPI)';
$lang->custom->tipCostList['CV'] = 'Cost Variance(CV%)';
$lang->custom->planStatusList[0] = 'No';
$lang->custom->planStatusList[1] = 'Yes';
$lang->custom->tipRangeList[0] = 'No';
$lang->custom->tipRangeList[1] = 'Yes';
module/design/control.php
+2
View File
@@ -291,6 +291,7 @@ class design extends control
else
{
$this->design->unlinkCommit($designID, $commitID);
die(js::reload('parent'));
}
}
@@ -353,6 +354,7 @@ class design extends control
$this->design->delete(TABLE_DESIGN, $designID);
$this->dao->delete()->from(TABLE_RELATION)->where('Atype')->eq('design')->andWhere('AID')->eq($designID)->andWhere('Btype')->eq('commit')->andwhere('relation')->eq('completedin')->exec();
$this->dao->delete()->from(TABLE_RELATION)->where('Atype')->eq('commit')->andWhere('BID')->eq($designID)->andWhere('Btype')->eq('design')->andwhere('relation')->eq('completedfrom')->exec();
die(js::locate($this->session->designList, 'parent'));
}
}
module/design/lang/en.php
+4 -4
View File
@@ -9,7 +9,7 @@
* @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
/* Field list. */
/* 字段列表. */
$lang->design->id = 'ID';
$lang->design->name = 'Name';
$lang->design->story = 'Story';
@@ -37,7 +37,7 @@ $lang->design->createdDate = 'CreatedDate';
$lang->design->basicInfo = 'Basic Information';
$lang->design->noAssigned = 'Unassigned';
/* Action list. */
/* 动作列表. */
$lang->design->common = 'Design';
$lang->design->create = 'Create Design';
$lang->design->batchCreate = 'Batch Create';
@@ -52,7 +52,7 @@ $lang->design->submit = 'Submit Review';
$lang->design->assignTo = 'Assign';
$lang->design->revision = 'Linked Code';
/* Field value. */
/* 字段取值. */
$lang->design->typeList = array();
$lang->design->typeList[''] = '';
$lang->design->typeList['HLDS'] = 'High-Level';
@@ -67,7 +67,7 @@ $lang->design->rangeList['assign'] = 'Selected';
$lang->design->featureBar['all'] = 'All';
$lang->design->featureBar += $lang->design->typeList;
/* Prompt information. */
/* 提示信息. */
$lang->design->errorSelection = 'No record selected!';
$lang->design->noDesign = 'No record.';
$lang->design->noCommit = 'No record commited.';