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

db/zentao.sql

@@ -1345,7 +1345,7 @@ INSERT INTO `zt_group` (`id`, `name`, `role`, `desc`) VALUES
 (10, 'OTHERS', 'others', 'for others.'),
 (11, 'guest', 'guest', 'For guest'),
 (12, 'LIMITED', 'limited', 'For limited user'),
-(13, '项目管理员', 'projectAdmin', '项目管理员可以维护项目的权限');
+(13, 'Project Admin', 'projectAdmin', 'Project Admins manage project privileges');
 
 INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (1,'action','editComment'),

module/common/lang/en.php

@@ -36,8 +36,8 @@ $lang->help           = 'Help';
 $lang->aboutZenTao    = 'About';
 $lang->profile        = 'Profile';
 $lang->changePassword = 'Password';
-$lang->unfoldMenu     = 'Unfold Menu';
-$lang->collapseMenu   = 'Collapse Menu';
+$lang->unfoldMenu     = 'Unfold';
+$lang->collapseMenu   = 'Collapse';
 $lang->preference     = 'Preference';
 $lang->runInfo        = "<div class='row'><div class='u-1 a-center' id='debugbar'>Time %s MS, Memory %s KB, Query %s.  </div></div>";
 $lang->agreement      = "I have read and agreed to the terms and conditions of <a href='http://zpl.pub/page/zplv12.html' target='_blank'> Z PUBLIC LICENSE 1.2 </a>. <span class='text-danger'>Without authorization, I should not remove, hide or cover any logos/links of ZenTao.</span>";
@@ -86,8 +86,8 @@ $lang->importSuccess   = 'Saved';
 $lang->fail            = 'Fail';
 $lang->addFiles        = 'Added Files';
 $lang->files           = 'Files ';
-$lang->pasteText       = 'Multi-lines Paste';
-$lang->uploadImages    = 'Multi-images Upload';
+$lang->pasteText       = 'Multi-line Paste';
+$lang->uploadImages    = 'Multi-image Upload';
 $lang->timeout         = 'Timeout. Check your newtwork connections, or try it again!';
 $lang->repairTable     = 'Database table might be damaged. Run phpmyadmin or myisamchk to fix it.';
 $lang->duplicate       = '%s has the same title as a file existed.';
@@ -144,7 +144,7 @@ $lang->admin->common      = 'Admin';
 $lang->task->common       = 'Task';
 $lang->bug->common        = 'Bug';
 $lang->testcase->common   = 'Testcase';
-$lang->testtask->common   = 'Testtask';
+$lang->testtask->common   = 'Request';
 $lang->score->common      = 'Score';
 $lang->build->common      = 'Build';
 $lang->testreport->common = 'Report';
@@ -185,7 +185,7 @@ $lang->track      = 'Track';
 $lang->settings   = 'Settings';
 $lang->overview   = 'Overview';
 $lang->module     = 'Module';
-$lang->priv       = 'Priv Group';
+$lang->priv       = 'Privilege';
 $lang->design     = 'Design';
 $lang->other      = 'Other';
 $lang->estimation = 'Estimation';

module/doc/lang/en.php

@@ -98,7 +98,7 @@ $lang->doc->libName        = 'Document Library';
 $lang->doc->libType        = 'Category';
 $lang->doc->custom         = 'Custom Document Library';
 $lang->doc->customAB       = 'Custom Doc Lib';
-$lang->doc->createLib      = 'Create Document Library';
+$lang->doc->createLib      = 'Document Library';
 $lang->doc->allLibs        = 'Library List';
 $lang->doc->objectLibs     = "{$lang->productCommon}/{$lang->executionCommon} Libraries";
 $lang->doc->showFiles      = 'Attachments';
@@ -108,7 +108,7 @@ $lang->doc->fixedMenu      = 'Fix to Menu';
 $lang->doc->removeMenu     = 'Remove from Menu';
 $lang->doc->search         = 'Search';
 $lang->doc->allCollections = 'All Collections';
-$lang->doc->keywordsTips   = 'Please use commas to separate multiple keywords.';
+$lang->doc->keywordsTips   = 'Please use commas to separate keywords.';
 
 global $config;
 /* Query condition list. */

module/execution/js/create.js

@@ -33,9 +33,9 @@ $(function()
     /* Assign value to the manage products by the different request type.*/
     var product = $('#products0');
     if(copyExecutionID) productID = product.val();
-    $(product).val(productID);
-    $(product).trigger("chosen:updated");
-    loadBranches($(product));
+    product.val(productID);
+    product.trigger("chosen:updated");
+    loadBranches(product);
 
     var adjustMainCol = function()
     {

module/index/lang/en.php

@@ -1,7 +1,7 @@
 <?php
 $lang->index->common      = 'Home';
 $lang->index->index       = 'Home';
-$lang->index->pleaseInput = 'Please input';
+$lang->index->pleaseInput = 'Enter';
 $lang->index->search      = 'Search';
 
 $lang->index->app = new stdClass();
@@ -14,4 +14,4 @@ $lang->index->upgradeNow     = 'Upgrade now';
 $lang->index->upgrade        = 'Upgrade';
 $lang->index->log            = 'Log';
 $lang->index->detailed       = 'Details';
-$lang->index->website        = 'Please visit the official website';
+$lang->index->website        = 'Visit ZenTao official website';

module/misc/lang/en.php

@@ -19,7 +19,7 @@ $lang->misc->zentao->labels['about']   = 'About ZenTao';
 $lang->misc->zentao->labels['support'] = 'Tech Support';
 $lang->misc->zentao->labels['cowin']   = 'Help Us';
 $lang->misc->zentao->labels['service'] = 'Service';
-$lang->misc->zentao->labels['others']  = 'EasyCorp Products';
+$lang->misc->zentao->labels['others']  = 'From EasyCorp';
 
 $lang->misc->zentao->icons['about']   = 'group';
 $lang->misc->zentao->icons['support'] = 'question-sign';
@@ -69,7 +69,7 @@ $lang->misc->tableName   = "Table Name";
 $lang->misc->tableStatus = "Status";
 $lang->misc->novice      = "New to ZenTao? Do you want to start ZenTao Tutorial?";
 $lang->misc->showAnnual  = 'Add Annual Summary';
-$lang->misc->annualDesc  = 'After version 12.0, the Annual Summary can be viewed on 『Report->Annual Summary』 page. <a href="%s" target="_blank" id="showAnnual" class="btn btn-mini btn-primary">See now</a>.';
+$lang->misc->annualDesc  = 'After version 12.0, Annual Summary can be viewed on 『Report->Annual Summary』 page. <a href="%s" target="_blank" id="showAnnual" class="btn btn-mini btn-primary">See now</a>.';
 $lang->misc->remind      = 'New feature reminders';
 
 $lang->misc->noticeRepair = "<h5>If you are not Administrator, contact your ZenTao Administrator to repair tables.</h5>

module/task/lang/en.php

@@ -135,7 +135,7 @@ $lang->task->lblTestStory      = 'Story Tested';
 $lang->task->recordEstimateAction = 'Record Estimate';
 
 $lang->task->ditto             = 'Ditto';
-$lang->task->dittoNotice       = "This Task is not linked to the %s as the previous one is!";
+$lang->task->dittoNotice       = "This Task is not linked to %s like the last one!";
 $lang->task->selectTestStory   = 'Select Story Testd';
 $lang->task->selectAllUser     = 'All Users';
 $lang->task->noStory           = 'No Story Linked';
@@ -175,8 +175,8 @@ $lang->task->reasonList['done']   = 'Done';
 $lang->task->reasonList['cancel'] = 'Cancelled';
 
 $lang->task->afterChoices['continueAdding'] = ' Continue Adding Tasks';
-$lang->task->afterChoices['toTaskList']     = 'Go to Task List Page';
-$lang->task->afterChoices['toStoryList']    = 'Go to Story List Page';
+$lang->task->afterChoices['toTaskList']     = 'Go to Task List';
+$lang->task->afterChoices['toStoryList']    = 'Go to Story List';
 
 $lang->task->legendBasic  = 'Basic Info';
 $lang->task->legendEffort = 'Effort';
@@ -202,7 +202,7 @@ $lang->task->deniedNotice           = 'Only the %s can %s the task.';
 $lang->task->noTask                 = 'No tasks yet. ';
 $lang->task->createDenied           = 'Create Task is denied in this project';
 $lang->task->cannotDeleteParent     = 'Cannot delete parent task';
-$lang->task->addChildTask           = 'Because the task has already consumed consumption, to ensure data consistency, we will help you create a subtask with the same name to record the consumption.';
+$lang->task->addChildTask           = 'Because the task has cost hours, ZenTao will create a child task with the same name to record the cost housrs to ensure data consistency.';
 
 $lang->task->error = new stdclass();
 $lang->task->error->totalNumber       = '"Total Cost" must be numbers.';

module/task/model.php

@@ -2143,7 +2143,7 @@ class taskModel extends model
         }
 
         $projectList = array();
-        foreach($tasks as $task) $projectList[] = $task->project;
+        foreach($tasks as $task) $projectList[$task->project] = $task->project;
         $projectPairs = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->in($projectList)->fetchPairs('id');
         foreach($tasks as $task) $task->projectName = zget($projectPairs, $task->project);
 

module/testtask/lang/en.php

@@ -48,12 +48,12 @@ $lang->testtask->allTasks         = 'All Requests';
 $lang->testtask->collapseAll      = 'Collapse';
 $lang->testtask->expandAll        = 'Expand';
 
-$lang->testtask->viewAction     = "View Testtask";
+$lang->testtask->viewAction     = "View Request";
 $lang->testtask->casesAction    = 'View Case';
-$lang->testtask->activateAction = "Activate Testtask";
-$lang->testtask->blockAction    = "Block Testtask";
-$lang->testtask->closeAction    = "Close Testtask";
-$lang->testtask->startAction    = "Start Testtask";
+$lang->testtask->activateAction = "Activate Request";
+$lang->testtask->blockAction    = "Block Request";
+$lang->testtask->closeAction    = "Close Request";
+$lang->testtask->startAction    = "Start Request";
 $lang->testtask->resultsAction  = "Case Result";
 $lang->testtask->reportAction   = 'Report';
 
@@ -203,7 +203,7 @@ $lang->testtask->unitTag['lastWeek']  = 'Last week';
 $lang->testtask->unitTag['thisMonth'] = 'This month';
 $lang->testtask->unitTag['lastMonth'] = 'Last month';
 
-$lang->testtask->typeList['integrate']   = 'Integrate';
+$lang->testtask->typeList['integrate']   = 'Integration';
 $lang->testtask->typeList['system']      = 'System';
 $lang->testtask->typeList['acceptance']  = 'Acceptance';
 $lang->testtask->typeList['performance'] = 'Performance';

module/upgrade/model.php

@@ -4766,6 +4766,12 @@ class upgradeModel extends model
         }
     }
 
+    /**
+     * Merge repo.
+     *
+     * @access public
+     * @return void
+     */
     public function mergeRepo()
     {
         $data = fixer::input('post')

module/user/lang/en.php

@@ -11,8 +11,8 @@
  */
 $lang->user->common           = 'User';
 $lang->user->id               = 'ID';
-$lang->user->inside           = 'Inside Members';
-$lang->user->outside          = 'Outside Members';
+$lang->user->inside           = 'Internal';
+$lang->user->outside          = 'Outsiders';
 $lang->user->company          = 'Company';
 $lang->user->dept             = 'Department';
 $lang->user->account          = 'Account';
@@ -54,8 +54,8 @@ $lang->user->score            = 'Score';
 $lang->user->name             = 'Name';
 $lang->user->type             = 'User Type';
 $lang->user->cropAvatar       = 'Crop Avatar';
-$lang->user->cropAvatarTip    = 'Drag and drop the box to select the image clipping range.';
-$lang->user->cropImageTip     = 'The image used is too small, the recommended image size is at least 48x48, the current image size is %s';
+$lang->user->cropAvatarTip    = 'Drag and drop the box to crop the image.';
+$lang->user->cropImageTip     = 'The image is too small. The recommended image size is at least 48x48. The current image size is %s';
 $lang->user->captcha          = 'Captcha';
 
 $lang->user->legendBasic        = 'Basic Information';
@@ -89,7 +89,7 @@ $lang->user->else          = 'Else';
 $lang->user->saveTemplate          = 'Save as Template';
 $lang->user->setPublic             = 'Set as Public Template';
 $lang->user->deleteTemplate        = 'Delete Template';
-$lang->user->setTemplateTitle      = 'Please enter the title of template.';
+$lang->user->setTemplateTitle      = 'Please enter the title of the template.';
 $lang->user->applyTemplate         = 'Templates';
 $lang->user->confirmDeleteTemplate = 'Do you want to delete this template?';
 $lang->user->setPublicTemplate     = 'Set as Public Template';
@@ -128,7 +128,7 @@ $lang->user->loginFailed  = "Login failed. Please check your account and passwor
 $lang->user->lockWarning  = "You can try %s times.";
 $lang->user->loginLocked  = "Please contact the administrator to unlock your account or try %s minutes later.";
 $lang->user->weakPassword = "Your password does not meet the requirements.";
-$lang->user->errorWeak    = "Passwords cannot use [%s] these commonly used weak passwords.";
+$lang->user->errorWeak    = "Passwords cannot use [%s] weak passwords.";
 $lang->user->errorCaptcha = "Captcha Error";
 
 $lang->user->roleList['']       = '';
@@ -199,10 +199,10 @@ $lang->user->error->account        = "ID %s，account must be >= 3 letters, unde
 $lang->user->error->accountDupl    = "ID %s，account is used.";
 $lang->user->error->realname       = "ID %s，must be real name";
 $lang->user->error->password       = "ID %s，password must be >= 6 characters.";
-$lang->user->error->mail           = "ID %s，please enter valid Email address";
+$lang->user->error->mail           = "ID %s，enter valid Email address";
 $lang->user->error->reserved       = "ID %s，account is reserved.";
 $lang->user->error->weakPassword   = "ID %s，the password strength is less than the system setting.";
-$lang->user->error->dangerPassword = "ID %s，Passwords cannot be used with [%s] these commonly used if-passwords.";
+$lang->user->error->dangerPassword = "ID %s，passwords cannot be used with [%s] these commonly used if-passwords.";
 
 $lang->user->error->verifyPassword   = "Verification failed. Please enter your Login Password.";
 $lang->user->error->originalPassword = "Old password is incorrect.";
@@ -247,13 +247,13 @@ $lang->user->noticeResetFile  = "<h5>Contact the Administrator to reset your pas
     <li>If the file exists, remove it and create it again.</li>
     </ol>";
 $lang->user->notice4Safe = "Warning: Weak password of one click package detected";
-$lang->user->process4DIR = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Delete or rename the %s directory. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
-$lang->user->process4DB  = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
+$lang->user->process4DIR = "It is detected that you might use the one-click installation package environment. Other sites in the environment are still using weak passwords. For security reasons, if you do not use other sites, please handle them in time. Delete or rename the %s directory. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
+$lang->user->process4DB  = "It is detected that you might use the one-click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
 $lang->user->mkdirWin = <<<EOT
     <html><head><meta charset='utf-8'></head>
     <body><table align='center' style='width:700px; margin-top:100px; border:1px solid gray; font-size:14px;'><tr><td style='padding:8px'>
     <div style='margin-bottom:8px;'>不能创建临时目录，请确认目录<strong style='color:#ed980f'>%s</strong>是否存在并有操作权限。</div> 
-    <div>Can't create tmp directory, make sure the directory <strong style='color:#ed980f'>%s</strong> exists and has permission to operate.</div>
+    <div>A tmp directory cannot be created. Make sure the directory <strong style='color:#ed980f'>%s</strong> exists and you have the right permission.</div>
     </td></tr></table></body></html>
 EOT;
 $lang->user->mkdirLinux = <<<EOT
@@ -261,7 +261,7 @@ $lang->user->mkdirLinux = <<<EOT
     <body><table align='center' style='width:700px; margin-top:100px; border:1px solid gray; font-size:14px;'><tr><td style='padding:8px'>
     <div style='margin-bottom:8px;'>不能创建临时目录，请确认目录<strong style='color:#ed980f'>%s</strong>是否存在并有操作权限。</div>  
     <div style='margin-bottom:8px;'>命令为：<strong style='color:#ed980f'>chmod o=rwx -R %s</strong>。</div>
-    <div>Can't create tmp directory, make sure the directory <strong style='color:#ed980f'>%s</strong> exists and has permission to operate.</div>
+    <div>A tmp directory cannot be created. Make sure the directory <strong style='color:#ed980f'>%s</strong> exists and you have the right permission.</div>
     <div style='margin-bottom:8px;'>Commond: <strong style='color:#ed980f'>chmod o=rwx -R %s</strong>.</div>
     </td></tr></table></body></html>
 EOT;