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

module/action/lang/en.php

@@ -87,7 +87,7 @@ $lang->action->objectTypes['testreport']  = 'Report';
 $lang->action->objectTypes['entry']       = 'Entry';
 $lang->action->objectTypes['webhook']     = 'Webhook';
 
-/* 用来描述操作历史记录。*/
+/* Used to describe operation history. */
 $lang->action->desc = new stdclass();
 $lang->action->desc->common         = '$date, <strong>$action</strong> by <strong>$actor</strong>.' . "\n";
 $lang->action->desc->extra          = '$date, <strong>$action</strong> as <strong>$extra</strong> by <strong>$actor</strong>.' . "\n";
@@ -129,7 +129,7 @@ $lang->action->desc->diff2          = '<strong><i>%s</i></strong> is changed. Th
 $lang->action->desc->diff3          = 'File Name %s was changed to %s .' . "\n";
 $lang->action->desc->linked2bug     = '$date, linked to <strong>$extra</strong> by <strong>$actor</strong>';
 
-/* 子任务修改父任务的历史操作记录 */
+/* Used to describe the history of operations related to parent-child tasks. */
 $lang->action->desc->createchildren     = '$date, <strong>$actor</strong> created a child task <strong>$extra</strong>。' . "\n";
 $lang->action->desc->linkchildtask      = '$date, <strong>$actor</strong> linked a child task <strong>$extra</strong>。' . "\n";
 $lang->action->desc->linkchildtask      = '$date, <strong>$actor</strong> linked a child task <strong>$extra</strong>。' . "\n";
@@ -137,11 +137,11 @@ $lang->action->desc->unlinkchildrentask = '$date, <strong>$actor</strong> unlink
 $lang->action->desc->linkparenttask     = '$date, <strong>$actor</strong> linked to a parent task <strong>$extra</strong>。' . "\n";
 $lang->action->desc->unlinkparenttask   = '$date, <strong>$actor</strong> unlinked a parent task <strong>$extra</strong>。' . "\n";
 
-/* 关联用例和移除用例时的历史操作记录。*/
+/* Historical record of actions when associating and removing cases. */
 $lang->action->desc->linkrelatedcase   = '$date, <strong>$actor</strong> linked a case <strong>$extra</strong>.' . "\n";
 $lang->action->desc->unlinkrelatedcase = '$date, <strong>$actor</strong> unlinked a case <strong>$extra</strong>.' . "\n";
 
-/* 用来显示动态信息。*/
+/* Used to display dynamic information. */
 $lang->action->label = new stdclass();
 $lang->action->label->created             = 'created ';
 $lang->action->label->opened              = 'opened ';
@@ -209,7 +209,7 @@ $lang->action->label->batchcreate         = "batch created tasks";
 $lang->action->label->createchildren      = "create child tasks";
 $lang->action->label->managed             = "managed";
 
-/* 动态信息按照对象分组 */
+/* Dynamic information is grouped by object. */
 $lang->action->dynamicAction = new stdclass;
 $lang->action->dynamicAction->todo['opened']               = 'Create Todo';
 $lang->action->dynamicAction->todo['edited']               = 'Edit Todo';
@@ -357,7 +357,7 @@ $lang->action->dynamicAction->user['loginxuanxuan']        = 'Login Desktop';
 $lang->action->dynamicAction->entry['created']             = 'Add Application';
 $lang->action->dynamicAction->entry['edited']              = 'Edit Application';
 
-/* 用来生成相应对象的链接。*/
+/* Generate the corresponding object link. */
 $lang->action->label->product     = $lang->productCommon . '|product|view|productID=%s';
 $lang->action->label->productplan = 'Plan|productplan|view|productID=%s';
 $lang->action->label->release     = 'Release|release|view|productID=%s';
@@ -402,7 +402,7 @@ $lang->action->search->objectTypeList['testsuite']   = 'Suite';
 $lang->action->search->objectTypeList['caselib']     = 'Library';
 $lang->action->search->objectTypeList['testreport']  = 'Report';
 
-/* 用来在动态显示中显示动作 */
+/* Used to display actions in dynamic method. */
 $lang->action->search->label['']                    = '';
 $lang->action->search->label['created']             = $lang->action->label->created;
 $lang->action->search->label['opened']              = $lang->action->label->opened;

module/action/lang/zh-cn.php

@@ -129,7 +129,7 @@ $lang->action->desc->diff2          = '修改了 <strong><i>%s</i></strong>，
 $lang->action->desc->diff3          = '将文件名 %s 改为 %s 。' . "\n";
 $lang->action->desc->linked2bug     = '$date 由 <strong>$actor</strong> 关联到版本 <strong>$extra</strong>';
 
-/* 子任务修改父任务的历史操作记录 */
+/* 用来描述和父子任务相关的操作历史记录。*/
 $lang->action->desc->createchildren     = '$date, 由 <strong>$actor</strong> 创建子任务 <strong>$extra</strong>。' . "\n";
 $lang->action->desc->linkchildtask      = '$date, 由 <strong>$actor</strong> 关联子任务 <strong>$extra</strong>。' . "\n";
 $lang->action->desc->linkchildtask      = '$date, 由 <strong>$actor</strong> 关联子任务 <strong>$extra</strong>。' . "\n";

module/bug/lang/en.php

@@ -19,6 +19,8 @@ $lang->bug->module           = 'Module';
 $lang->bug->moduleAB         = 'Module';
 $lang->bug->project          = $lang->projectCommon;
 $lang->bug->story            = 'Story';
+$lang->bug->storyVersion     = 'Story Version';
+$lang->bug->color            = 'Color';
 $lang->bug->task             = 'Task';
 $lang->bug->title            = 'Title';
 $lang->bug->severity         = 'Severity';
@@ -65,6 +67,8 @@ $lang->bug->linkBug          = 'Linked Bugs';
 $lang->bug->linkBugs         = 'Link Bug';
 $lang->bug->unlinkBug        = 'Unlink';
 $lang->bug->case             = 'Cases';
+$lang->bug->caseVersion      = 'Case Version';
+$lang->bug->testtask         = 'Request';
 $lang->bug->files            = 'Files';
 $lang->bug->keywords         = 'Tags';
 $lang->bug->lastEditedByAB   = 'EditedBy';
@@ -74,7 +78,7 @@ $lang->bug->fromCase         = 'From Case';
 $lang->bug->toCase           = 'To Case';
 $lang->bug->colorTag         = 'Color';
 
-/* 方法列表。*/
+/* Method list. */
 $lang->bug->index              = 'Bug Home';
 $lang->bug->create             = 'Report Bug';
 $lang->bug->batchCreate        = 'Batch Report';
@@ -110,7 +114,7 @@ $lang->bug->confirmStoryChange = 'Confirm Story Change';
 $lang->bug->copy               = 'Copy';
 $lang->bug->search             = 'Search';
 
-/* 查询条件列表。*/
+/* Query condition list. */
 $lang->bug->assignToMe         = 'AssignedToMe';
 $lang->bug->openedByMe         = 'ReportedByMe';
 $lang->bug->resolvedByMe       = 'ResolvedByMe';
@@ -143,7 +147,7 @@ $lang->bug->noBug        = 'No bugs yet.';
 $lang->bug->noModule     = '<div>You have no modules.</div><div>Manage now</div>';
 $lang->bug->delayWarning = " <strong class='text-danger'> Delay %s days </strong>";
 
-/* 页面标签。*/
+/* Page tags. */
 $lang->bug->lblAssignedTo = 'AssignTo';
 $lang->bug->lblMailto     = 'Mailto';
 $lang->bug->lblLastEdited = 'EditedBy';
@@ -152,7 +156,7 @@ $lang->bug->allUsers      = 'Load All Users';
 $lang->bug->allBuilds     = 'All Builds';
 $lang->bug->createBuild   = 'New';
 
-/* legend列表。*/
+/* Legend list。*/
 $lang->bug->legendBasicInfo             = 'Basic Info';
 $lang->bug->legendAttatch               = 'Files';
 $lang->bug->legendPrjStoryTask          = $lang->projectCommon . '/Story/Task';
@@ -164,22 +168,22 @@ $lang->bug->legendLife                  = 'Bug Life';
 $lang->bug->legendMisc                  = 'Misc.';
 $lang->bug->legendRelated               = 'Related Info';
 
-/* 功能按钮。*/
+/* Button. */
 $lang->bug->buttonConfirm = 'Confirm';
 
-/* 交互提示。*/
+/* Interactive prompt. */
 $lang->bug->summary               = "Total <strong>%s</strong> bugs on this page, and <strong>%s</strong> Active.";
 $lang->bug->confirmChangeProduct  = "Any change to {$lang->productCommon} will cause linked {$lang->projectCommon}s, stories and tasks change. Do you want to do this?";
 $lang->bug->confirmDelete         = 'Do you want to delete this bug?';
 $lang->bug->remindTask            = 'This bug has been converted to a task. Do you want to update the status of Task(ID %s)?';
 $lang->bug->skipClose             = 'Bug %s is active. You cannot close it.';
 
-/* 模板。*/
+/* Template. */
 $lang->bug->tplStep   = "<p>[Steps]</p><br/>";
 $lang->bug->tplResult = "<p>[Results]</p><br/>";
 $lang->bug->tplExpect = "<p>[Expectations]</p><br/>";
 
-/* 各个字段取值列表。*/
+/* Value list for each field. */
 $lang->bug->severityList[1] = '1';
 $lang->bug->severityList[2] = '2';
 $lang->bug->severityList[3] = '3';
@@ -269,7 +273,7 @@ $lang->bug->resolutionList['postponed']  = 'Postponed';
 $lang->bug->resolutionList['willnotfix'] = "Won't Fix";
 $lang->bug->resolutionList['tostory']    = 'Convert to Story';
 
-/* 统计报表。*/
+/* Statistical statement. */
 $lang->bug->report = new stdclass();
 $lang->bug->report->common = 'Report';
 $lang->bug->report->select = 'Select Report Type';
@@ -365,7 +369,7 @@ $lang->bug->report->bugsPerAssignedTo->graph->xAxisName     = 'AssignTo';
 $lang->bug->report->bugLiveDays->graph->xAxisName           = 'Handling Time';
 $lang->bug->report->bugHistories->graph->xAxisName          = 'Handling Steps';
 
-/* 操作记录。*/
+/* Operating record. */
 $lang->bug->action = new stdclass();
 $lang->bug->action->resolved            = array('main' => '$date, resolved by <strong>$actor</strong> and the resolution is <strong>$extra</strong> $appendLink.', 'extra' => 'resolutionList');
 $lang->bug->action->tostory             = array('main' => '$date, converted by <strong>$actor</strong> to <strong>Story</strong> with ID <strong>$extra</strong>.');

module/bug/lang/zh-cn.php

@@ -19,6 +19,8 @@ $lang->bug->module           = '所属模块';
 $lang->bug->moduleAB         = '模块';
 $lang->bug->project          = '所属' . $lang->projectCommon;
 $lang->bug->story            = '相关需求';
+$lang->bug->storyVersion     = '需求版本';
+$lang->bug->color            = '标题颜色';
 $lang->bug->task             = '相关任务';
 $lang->bug->title            = 'Bug标题';
 $lang->bug->severity         = '严重程度';
@@ -65,6 +67,8 @@ $lang->bug->linkBug          = '相关Bug';
 $lang->bug->linkBugs         = '关联相关Bug';
 $lang->bug->unlinkBug        = '移除相关Bug';
 $lang->bug->case             = '相关用例';
+$lang->bug->caseVersion      = '用例版本';
+$lang->bug->testtask         = '测试单';
 $lang->bug->files            = '附件';
 $lang->bug->keywords         = '关键词';
 $lang->bug->lastEditedByAB   = '修改者';

module/common/lang/de.php

@@ -21,6 +21,7 @@ $lang->percent   = '%';
 $lang->dash      = '-';
 
 $lang->zentaoPMS      = 'ZenTao';
+$lang->logoImg        = 'zt-logo-en.png';
 $lang->welcome        = "%s PMS";
 $lang->logout         = 'Abmelden';
 $lang->login          = 'Anmelden';

module/common/lang/en.php

@@ -21,6 +21,7 @@ $lang->percent   = '%';
 $lang->dash      = '-';
 
 $lang->zentaoPMS      = 'ZenTao';
+$lang->logoImg        = 'zt-logo-en.png';
 $lang->welcome        = "%s ALM";
 $lang->logout         = 'Logout';
 $lang->login          = 'Login';
@@ -178,7 +179,7 @@ $lang->index->menu = new stdclass();
 $lang->index->menu->product = "{$lang->productCommon}|product|browse";
 $lang->index->menu->project = "{$lang->projectCommon}|project|browse";
 
-/* my dashboard menu settings. */
+/* My dashboard menu settings. */
 $lang->my = new stdclass();
 $lang->my->menu = new stdclass();
 

module/common/lang/zh-cn.php

@@ -21,6 +21,7 @@ $lang->percent   = '%';
 $lang->dash      = '-';
 
 $lang->zentaoPMS      = '禅道';
+$lang->logoImg        = 'zt-logo.png';
 $lang->welcome        = "%s项目管理系统";
 $lang->logout         = '退出';
 $lang->login          = '登录';

module/common/lang/zh-tw.php

@@ -21,6 +21,7 @@ $lang->percent   = '%';
 $lang->dash      = '-';
 
 $lang->zentaoPMS      = '禪道';
+$lang->logoImg        = 'zt-logo.png';
 $lang->welcome        = "%s項目管理系統";
 $lang->logout         = '退出';
 $lang->login          = '登錄';

module/doc/lang/en.php

@@ -63,7 +63,7 @@ $lang->doc->pastEdited     = 'Total Updated';
 $lang->doc->myDoc          = 'My Documents';
 $lang->doc->myCollection   = 'My Favorites';
 
-/* 方法列表。*/
+/* Methods list */
 $lang->doc->index            = 'Document Home';
 $lang->doc->create           = 'Create Document';
 $lang->doc->edit             = 'Edit Document';
@@ -96,7 +96,7 @@ $lang->doc->fixedMenu      = 'Fix to Menu';
 $lang->doc->removeMenu     = 'Remove from Menu';
 $lang->doc->search         = 'Search';
 
-/* 查询条件列表 */
+/* Query condition list. */
 $lang->doc->allProduct     = 'All' . $lang->productCommon . 's';
 $lang->doc->allProject     = 'All' . $lang->projectCommon . 's';
 

module/extension/lang/de.php

@@ -29,10 +29,11 @@ $lang->extension->eraseAction      = 'Erase Extension';
 $lang->extension->upgrade       = 'Erweiterung Upgraden';
 $lang->extension->agreeLicense  = 'Lizenz';
 
-$lang->extension->structure   = 'Struktur';
-$lang->extension->installed   = 'Installiert';
-$lang->extension->deactivated = 'Deaktiviert';
-$lang->extension->available   = 'Heruntergeladen';
+$lang->extension->structure     = 'Struktur';
+$lang->extension->extstructure  = 'Struktur';
+$lang->extension->installed     = 'Installiert';
+$lang->extension->deactivated   = 'Deaktiviert';
+$lang->extension->available     = 'Heruntergeladen';
 
 $lang->extension->name        = 'Erweiterungsname';
 $lang->extension->code        = 'Code';

module/extension/lang/en.php

@@ -29,10 +29,11 @@ $lang->extension->eraseAction      = 'Erase Extension';
 $lang->extension->upgrade          = 'Upgrade Extension';
 $lang->extension->agreeLicense     = 'I agree to the license.';
 
-$lang->extension->structure   = 'Extension Structure';
-$lang->extension->installed   = 'Installed';
-$lang->extension->deactivated = 'Deactivated';
-$lang->extension->available   = 'Downloaded';
+$lang->extension->structure        = 'Structure';
+$lang->extension->extstructure     = 'Extension Structure';
+$lang->extension->installed        = 'Installed';
+$lang->extension->deactivated      = 'Deactivated';
+$lang->extension->available        = 'Downloaded';
 
 $lang->extension->name        = 'Extension Name';
 $lang->extension->code        = 'Code';

module/extension/lang/zh-cn.php

@@ -29,10 +29,11 @@ $lang->extension->eraseAction      = '清除插件';
 $lang->extension->upgrade          = '升级插件';
 $lang->extension->agreeLicense     = '我同意该授权';
 
-$lang->extension->structure   = '目录结构';
-$lang->extension->installed   = '已安装';
-$lang->extension->deactivated = '被禁用';
-$lang->extension->available   = '已下载';
+$lang->extension->structure    = '目录结构';
+$lang->extension->extstructure = '目录结构';
+$lang->extension->installed    = '已安装';
+$lang->extension->deactivated  = '被禁用';
+$lang->extension->available    = '已下载';
 
 $lang->extension->name        = '插件名称';
 $lang->extension->code        = '代号';

module/extension/lang/zh-tw.php

@@ -29,10 +29,11 @@ $lang->extension->eraseAction      = '清除插件';
 $lang->extension->upgrade          = '升級插件';
 $lang->extension->agreeLicense     = '我同意該授權';
 
-$lang->extension->structure   = '目錄結構';
-$lang->extension->installed   = '已安裝';
-$lang->extension->deactivated = '被禁用';
-$lang->extension->available   = '已下載';
+$lang->extension->structure     = '目錄結構';
+$lang->extension->extstructure  = '目錄結構';
+$lang->extension->installed     = '已安裝';
+$lang->extension->deactivated   = '被禁用';
+$lang->extension->available     = '已下載';
 
 $lang->extension->name        = '插件名稱';
 $lang->extension->code        = '代號';

module/extension/model.php

@@ -626,7 +626,7 @@ class extensionModel extends model
             rsort($dirs);    // remove from the lower level directory.
             foreach($dirs as $dir)
             {
-                if(!@rmdir($appRoot . $dir)) $removeCommands[] = "rmdir $appRoot$dir";
+                if(!is_writable($appRoot . $dir) or !rmdir($appRoot . $dir)) $removeCommands[] = "rmdir $appRoot$dir";
             }
         }
 

module/group/lang/resource.php

@@ -930,7 +930,7 @@ $lang->admin->methodOrder[20] = 'sso';
 $lang->resource->extension = new stdclass();
 $lang->resource->extension->browse     = 'browse';
 $lang->resource->extension->obtain     = 'obtain';
-$lang->resource->extension->structure  = 'structure';
+$lang->resource->extension->structure  = 'extstructure';
 $lang->resource->extension->install    = 'install';
 $lang->resource->extension->uninstall  = 'uninstallAction';
 $lang->resource->extension->activate   = 'activateAction';

module/misc/view/about.html.php

@@ -8,7 +8,7 @@
       <table class='table table-form'>
         <tr>
           <td class='text-center w-160px'>
-            <img src='<?php echo $config->webRoot . 'theme/default/images/main/' . ($app->getClientLang() != 'en' ? 'zt-logo.png' : 'zt-logo-en.png');?>' />
+            <img src='<?php echo $config->webRoot . 'theme/default/images/main/' . $lang->logoImg;?>' />
             <h4><?php printf($lang->misc->zentao->version, $config->version);?></h4>
           </td>
           <td><?php include './links.html.php';?></td>
@@ -23,4 +23,4 @@
     </div>
   </div>
 </main>
-<?php include '../../common/view/footer.lite.html.php';?>
+<?php include '../../common/view/footer.lite.html.php';?>

module/project/lang/en.php

@@ -107,7 +107,7 @@ $lang->team->limitedList['no']  = 'No';
 $lang->project->basicInfo = 'Basic Information';
 $lang->project->otherInfo = 'Other Information';
 
-/* 字段取值列表。*/
+/* Field value list. */
 $lang->project->statusList['wait']      = 'Waiting';
 $lang->project->statusList['doing']     = 'Doing';
 $lang->project->statusList['suspended'] = 'Suspended';
@@ -117,7 +117,7 @@ $lang->project->aclList['open']    = "Default (Users who can visit {$lang->proje
 $lang->project->aclList['private'] = 'Private (For team members only.)';
 $lang->project->aclList['custom']  = 'Whitelist (Team members and the whitelist users can access it.)';
 
-/* 方法列表。*/
+/* Method list. */
 $lang->project->index             = "{$lang->projectCommon} Home";
 $lang->project->task              = 'Task List';
 $lang->project->groupTask         = 'Group View';
@@ -181,7 +181,7 @@ $lang->project->iteration         = 'Iterations';
 $lang->project->iterationInfo     = '%s Iterations';
 $lang->project->viewAll           = 'View All';
 
-/* 分组浏览。*/
+/* Group browsing. */
 $lang->project->allTasks     = 'All';
 $lang->project->assignedToMe = 'My';
 $lang->project->myInvolved   = 'Involved';
@@ -212,12 +212,12 @@ $lang->project->groupFilter['assignedTo']['all']    = 'All';
 
 $lang->project->byQuery = 'Search';
 
-/* 查询条件列表。*/
+/* Query condition list. */
 $lang->project->allProject      = "All {$lang->projectCommon}s";
 $lang->project->aboveAllProduct = "All the above {$lang->productCommon}s";
 $lang->project->aboveAllProject = "All the above {$lang->projectCommon}s";
 
-/* 页面提示。*/
+/* Page prompt. */
 $lang->project->linkStoryByPlanTips = "This action will link all stories in this plan to the {$lang->projectCommon}.";
 $lang->project->selectProject       = "Select {$lang->projectCommon}";
 $lang->project->beginAndEnd         = 'Duration';
@@ -254,7 +254,7 @@ $lang->project->byUser              = 'By User';
 $lang->project->noProject           = "No {$lang->projectCommon}. ";
 $lang->project->noMembers           = 'No team members yet. ';
 
-/* 交互提示。*/
+/* Interactive prompts. */
 $lang->project->confirmDelete         = "Do you want to delete the {$lang->projectCommon}[%s]?";
 $lang->project->confirmUnlinkMember   = "Do you want to unlink this User from {$lang->projectCommon}?";
 $lang->project->confirmUnlinkStory    = "Do you want to unlink this Story from {$lang->projectCommon}?";
@@ -277,7 +277,7 @@ $lang->project->action->opened  = '$date, created by <strong>$actor</strong> .'
 $lang->project->action->managed = '$date, managed by <strong>$actor</strong> .' . "\n";
 $lang->project->action->extra   = "The linked {$lang->productCommon}s are %s.";
 
-/* 统计。*/
+/* Statistics. */
 $lang->project->charts = new stdclass();
 $lang->project->charts->burn = new stdclass();
 $lang->project->charts->burn->graph = new stdclass();

module/story/lang/en.php

@@ -239,7 +239,7 @@ $lang->story->action->subdividestory      = array('main' => '$date, decomposed b
 $lang->story->action->unlinkrelatedstory  = array('main' => '$date, unlinked by <strong>$actor</strong> from Story <strong>$extra</strong>.');
 $lang->story->action->unlinkchildstory    = array('main' => '$date, unlinked by <strong>$actor</strong> Decomposed Story <strong>$extra</strong>.');
 
-/* 统计报表。*/
+/* Statistical statement. */
 $lang->story->report = new stdclass();
 $lang->story->report->common = 'Report';
 $lang->story->report->select = 'Select Report Type';

module/testtask/lang/en.php

@@ -141,7 +141,7 @@ $lang->testtask->action->testtaskclosed  = '$date,  <strong>$actor</strong> comp
 
 $lang->testtask->unexecuted = 'Pending';
 
-/* 统计报表。*/
+/* Statistical statement. */
 $lang->testtask->report = new stdclass();
 $lang->testtask->report->common = 'Report';
 $lang->testtask->report->select = 'Select Report Type';