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

* Finish tash for Lang and multiple #78665.

Browse Source
This commit is contained in:
liuhong
2022-12-08 07:48:25 +00:00
parent 0094f902f5
commit 0d9f59c49b
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/control.php
+2 -8
View File
@@ -718,13 +718,11 @@ class build extends control
$buildStories = $this->loadModel('story')->getByList($build->allStories);
$buildBugs = $this->loadModel('bug')->getByList($build->allBugs);
$branchPairs = $this->loadModel('branch')->getPairs($build->product);
$this->app->loadLang('branch');
$removeBranches = '';
foreach(explode(',', $oldBranch) as $oldBranchID)
{
if($oldBranchID and strpos(",$newBranch,", ",$oldBranchID,") === false) $removeBranches .= "{$branchPairs[$oldBranchID]},";
if($oldBranchID == '0') $removeBranches = $this->lang->branch->main;
}
$unlinkStoryCounts = 0;
@@ -754,10 +752,6 @@ class build extends control
{
printf($this->lang->build->confirmRemoveBug, trim($removeBranches, ','), $unlinkBugCounts);
}
else
{
printf($this->lang->build->confirmRemoveTips, trim($removeBranches, ','));
}
}
/**
@@ -802,12 +796,12 @@ class build extends control
{
foreach($planStories as $storyID => $story)
{
if($story->branch and strpos(",$newBranch,", ",$story->branch,") === false) $this->build->unlinkStory($storyID, $buildID);
if($story->branch and strpos(",$newBranch,", ",$story->branch,") === false) $this->build->unlinkStory($buildID, $storyID);
}
foreach($planBugs as $bugID => $bug)
{
if($bug->branch and strpos(",$newBranch,", ",$bug->branch,") === false) $this->build->unlinkBug($bugID, $buildID);
if($bug->branch and strpos(",$newBranch,", ",$bug->branch,") === false) $this->build->unlinkBug($buildID, $bugID);
}
}
}
module/build/lang/de.php
+6
View File
@@ -30,6 +30,8 @@ $lang->build->basicInfo = 'Basis Info';
$lang->build->id = 'ID';
$lang->build->product = $lang->productCommon;
$lang->build->project = 'Project';
$lang->build->allBranch = 'All associated branches';
$lang->build->allPlatform = 'All associated platforms';
$lang->build->branch = 'Platform/Branch';
$lang->build->branchName = '%s';
$lang->build->execution = $lang->executionCommon;
@@ -68,6 +70,10 @@ $lang->build->finishStories = " %s {$lang->SRCommon} sind abgeschlossen.";
$lang->build->resolvedBugs = ' %s Bugs sind gelöst.';
$lang->build->createdBugs = ' %s Bugs wurden erstellt.';
$lang->build->confirmChangeBuild = "After branch『%s』disassociation,the branch exists %s {$lang->SRCommon} and %s Bug will remove synchronization from version, whether to cancel？";
$lang->build->confirmRemoveStory = "After branch『%s』disassociation,the branch exists %s {$lang->SRCommon} will remove synchronization from version, whether to cancel？";
$lang->build->confirmRemoveBug = "After branch『%s』disassociation,the branch exists %s Bug will remove synchronization from version, whether to cancel？";
$lang->build->placeholder = new stdclass();
$lang->build->placeholder->scmPath = ' Source code repository, z.B. Subversion/Git Pfad';
$lang->build->placeholder->filePath = ' Pfad zum Download für diese Build.';
module/build/lang/en.php
+6
View File
@@ -31,6 +31,8 @@ $lang->build->id = 'ID';
$lang->build->product = $lang->productCommon;
$lang->build->project = 'Project';
$lang->build->branch = 'Platform/Branch';
$lang->build->allBranch = 'All associated branches';
$lang->build->allPlatform = 'All associated platforms';
$lang->build->branchName = '%s';
$lang->build->execution = $lang->executionCommon;
$lang->build->integrated = 'Integrated';
@@ -68,6 +70,10 @@ $lang->build->finishStories = " Finished {$lang->SRCommon} %s";
$lang->build->resolvedBugs = ' Resolved Bug %s';
$lang->build->createdBugs = ' Reported Bug %s';
$lang->build->confirmChangeBuild = "After branch『%s』disassociation,the branch exists %s {$lang->SRCommon} and %s Bug will remove synchronization from version, whether to cancel？";
$lang->build->confirmRemoveStory = "After branch『%s』disassociation,the branch exists %s {$lang->SRCommon} will remove synchronization from version, whether to cancel？";
$lang->build->confirmRemoveBug = "After branch『%s』disassociation,the branch exists %s Bug will remove synchronization from version, whether to cancel？";
$lang->build->placeholder = new stdclass();
$lang->build->placeholder->scmPath = ' Source code repository, e.g. Subversion/Git Library path';
$lang->build->placeholder->filePath = ' Download path for this Build.';
module/build/lang/fr.php
+6
View File
@@ -31,6 +31,8 @@ $lang->build->id = 'ID';
$lang->build->product = $lang->productCommon;
$lang->build->project = 'Project';
$lang->build->branch = 'Plateforme/Branche';
$lang->build->allBranch = 'All associated branches';
$lang->build->allPlatform = 'All associated platforms';
$lang->build->branchName = '%s';
$lang->build->execution = $lang->executionCommon;
$lang->build->integrated = 'Integrated';
@@ -68,6 +70,10 @@ $lang->build->finishStories = " {$lang->SRCommon} Terminées %s";
$lang->build->resolvedBugs = ' Bugs Résolus %s';
$lang->build->createdBugs = ' Bugs Signalés %s';
$lang->build->confirmChangeBuild = "After branch『%s』disassociation,the branch exists %s {$lang->SRCommon} and %s Bug will remove synchronization from version, whether to cancel？";
$lang->build->confirmRemoveStory = "After branch『%s』disassociation,the branch exists %s {$lang->SRCommon} will remove synchronization from version, whether to cancel？";
$lang->build->confirmRemoveBug = "After branch『%s』disassociation,the branch exists %s Bug will remove synchronization from version, whether to cancel？";
$lang->build->placeholder = new stdclass();
$lang->build->placeholder->scmPath = ' Répertoire des codes sources, ex: chemin de la bibliothèque Subversion / GitSource';
$lang->build->placeholder->filePath = ' Chemin de téléchargement pour ce Build.';