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
2017-12-20 16:47:01 +08:00
parent a42b0008c9 2089850a63
commit afb023fca9
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/lang/en.php
+1 -1
View File
@@ -39,7 +39,7 @@ $lang->bug->toStory = 'Convert to Story';
$lang->bug->mailto = 'Mail To';
$lang->bug->openedBy = 'Open By';
$lang->bug->openedDate = 'Open On';
$lang->bug->openedDateAB = 'Open On';
$lang->bug->openedDateAB = 'Created on';
$lang->bug->openedBuild = 'Open Build';
$lang->bug->assignedTo = 'Assigned To';
$lang->bug->assignedDate = 'Assigned On';
module/bug/model.php
+2 -1
View File
@@ -2467,7 +2467,8 @@ class bugModel extends model
echo substr($bug->openedDate, 5, 11);
break;
case 'openedBuild':
foreach(explode(',', $bug->openedBuild) as $build) echo zget($builds, $build) . ' ';
$builds = array_flip($builds);
foreach(explode(',', $bug->openedBuild) as $build) echo html::a(helper::createLink('build', 'view', "buildID=$builds[$build]"), $build, '', "title='$bug->openedBuild'");
break;
case 'assignedTo':
echo zget($users, $bug->assignedTo, $bug->assignedTo);
module/common/lang/en.php
+2 -2
View File
@@ -93,8 +93,8 @@ $lang->workingHour = 'Hour';
$lang->idAB = 'ID';
$lang->priAB = 'P';
$lang->statusAB = 'Status';
$lang->openedByAB = 'Open';
$lang->assignedToAB = 'To';
$lang->openedByAB = 'Created by';
$lang->assignedToAB = 'Assignee';
$lang->typeAB = 'Type';
$lang->common = new stdclass();
module/install/lang/en.php
+1 -1
View File
@@ -162,7 +162,7 @@ $lang->install->login = 'Login ZenTao';
$lang->install->register = 'Register in ZenTao';
$lang->install->joinZentao = <<<EOT
<p>Tou have installed ZenTao %s.<strong class='text-danger'> Please delete install.php asap</strong>.</p><p>Note: In order to get the latest news of ZenTao, please register in ZenTao(<a href='http://www.zentao.pm' class='alert-link' target='_blank'>www.zentao.pm</a>).</p>
<p>You have installed ZenTao %s.<strong class='text-danger'> Please delete install.php asap</strong>.</p><p>Note: In order to get the latest news of ZenTao, please register in ZenTao(<a href='http://www.zentao.pm' class='alert-link' target='_blank'>www.zentao.pm</a>).</p>
EOT;
$lang->install->product = array('chanzhi', 'ranzhi');