Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

module/common/lang/de.php

@@ -114,8 +114,6 @@ $lang->future       = 'Warte';
 $lang->year         = 'Jahr';
 $lang->workingHour  = 'Stunde';
 
-$lang->generalUR    = 'UR/Epic';
-$lang->generalSR    = 'SR/Story';
 $lang->sprintCommon = $lang->iterationCommon . '/Phase';
 
 $lang->execution = new stdclass();

module/common/lang/en.php

@@ -114,8 +114,6 @@ $lang->future       = 'Waiting';
 $lang->year         = 'Year';
 $lang->workingHour  = 'Hours';
 
-$lang->generalUR    = 'UR/Epic';
-$lang->generalSR    = 'SR/Story';
 $lang->sprintCommon = $lang->iterationCommon . '/Phase';
 
 $lang->execution = new stdclass();

module/common/lang/fr.php

@@ -114,8 +114,6 @@ $lang->future       = 'En Attente';
 $lang->year         = 'Année';
 $lang->workingHour  = 'Heures';
 
-$lang->generalUR    = 'UR/Epic';
-$lang->generalSR    = 'SR/Story';
 $lang->sprintCommon = $lang->iterationCommon . '/Phase';
 
 $lang->execution = new stdclass();

module/common/lang/vi.php

@@ -114,8 +114,6 @@ $lang->future      = 'Đang đợi';
 $lang->year        = 'Năm';
 $lang->workingHour = 'giờ';
 
-$lang->generalUR    = 'UR/Epic';
-$lang->generalSR    = 'SR/Story';
 $lang->sprintCommon = $lang->iterationCommon . '/Phase';
 
 $lang->execution = new stdclass();

module/common/lang/zh-cn.php

@@ -114,8 +114,6 @@ $lang->future      = '未来';
 $lang->year        = '年';
 $lang->workingHour = '工时';
 
-$lang->generalUR    = '用需/史诗';
-$lang->generalSR    = '软需/故事';
 $lang->sprintCommon = $lang->iterationCommon . '/阶段';
 
 $lang->execution = new stdclass();

module/common/lang/zh-tw.php

@@ -114,8 +114,6 @@ $lang->future      = '未來';
 $lang->year        = '年';
 $lang->workingHour = '工時';
 
-$lang->generalUR    = '用需/史詩';
-$lang->generalSR    = '軟需/故事';
 $lang->sprintCommon = '迭代/階段';
 
 $lang->execution = new stdclass();

module/program/control.php

@@ -763,12 +763,12 @@ class program extends control
      */
     public function index($projectID = 0)
     {
-        $project = $this->program->getPRJByID($projectID);
-        if(empty($project) || $project->type != 'project') die(js::error($this->lang->notFound) . js::locate('back'));
-
         $this->lang->navGroup->program = 'project';
         $projectID = $this->program->savePRJState($projectID, $this->program->getPRJPairs());
 
+        $project = $this->program->getPRJByID($projectID);
+        if(empty($project) || $project->type != 'project') die(js::error($this->lang->notFound) . js::locate('back'));
+
         if(!$projectID) $this->locate($this->createLink('program', 'PRJbrowse')); 
         setCookie("lastPRJ", $projectID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
 

module/projectstory/lang/de.php

@@ -2,7 +2,6 @@
 $lang->projectstory->common      = 'Anforderungen an Projekte';
 $lang->projectstory->index       = 'Fordern Sie Homepage';
 $lang->projectstory->view        = 'Story Detail';
-$lang->projectstory->story       = $lang->generalSR;
 $lang->projectstory->track       = 'Matrix der Verfolgung';
 $lang->projectstory->linkStory   = 'Linked' . $lang->SRCommon;
 $lang->projectstory->unlinkStory = 'Unlinked' . $lang->SRCommon;

module/projectstory/lang/en.php

@@ -2,7 +2,6 @@
 $lang->projectstory->common      = 'Project Requirements';
 $lang->projectstory->index       = 'Request Home';
 $lang->projectstory->view        = 'Story Detail';
-$lang->projectstory->story       = $lang->generalSR;
 $lang->projectstory->track       = 'Tracking Matrix';
 $lang->projectstory->linkStory   = 'Linked' . $lang->SRCommon;
 $lang->projectstory->unlinkStory = 'Unlinked' . $lang->SRCommon;

module/projectstory/lang/fr.php

@@ -2,7 +2,6 @@
 $lang->projectstory->common      = 'Exigences du projet';
 $lang->projectstory->index       = 'Exigences Accueil';
 $lang->projectstory->view        = 'Story Detail';
-$lang->projectstory->story       = $lang->generalSR;
 $lang->projectstory->track       = 'Matrice de suivi';
 $lang->projectstory->linkStory   = 'Linked' . $lang->SRCommon;
 $lang->projectstory->unlinkStory = 'Unlinked' . $lang->SRCommon;

module/projectstory/lang/vi.php

@@ -2,7 +2,6 @@
 $lang->projectstory->common      = 'Yêu cầu dự án';
 $lang->projectstory->index       = 'Yêu cầu trang nhà';
 $lang->projectstory->view        = 'Story Detail';
-$lang->projectstory->story       = $lang->generalSR;
 $lang->projectstory->track       = 'Theo dõi ma trận';
 $lang->projectstory->linkStory   = 'Linked' . $lang->SRCommon;
 $lang->projectstory->unlinkStory = 'Unlinked' . $lang->SRCommon;

module/projectstory/lang/zh-cn.php

@@ -2,7 +2,6 @@
 $lang->projectstory->common      = '项目需求';
 $lang->projectstory->index       = '需求主页';
 $lang->projectstory->view        = '需求详情';
-$lang->projectstory->story       = $lang->generalSR;
 $lang->projectstory->track       = '矩阵';
 $lang->projectstory->linkStory   = '关联' . $lang->SRCommon;
 $lang->projectstory->unlinkStory = '移除' . $lang->SRCommon;

module/projectstory/lang/zh-tw.php

@@ -2,7 +2,6 @@
 $lang->projectstory->common      = '項目需求';
 $lang->projectstory->index       = '需求主頁';
 $lang->projectstory->view        = '需求詳情';
-$lang->projectstory->story       = $lang->generalSR;
 $lang->projectstory->track       = '矩陣';
 $lang->projectstory->linkStory   = '關聯' . $lang->SRCommon;
 $lang->projectstory->unlinkStory = '移除' . $lang->SRCommon;