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

Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
zhujinyong
2021-03-17 10:10:50 +08:00
parent 409a8384dc 9df4cc58b9
commit 28df323cc3
10 changed files with 30 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/zh-cn.php
+2 -2
View File
@@ -192,7 +192,7 @@ $lang->product->homeMenu->list = array('link' => $lang->productCommon . '|produc
$lang->product->menu = new stdclass();
$lang->product->menu->dashboard = array('link' => '仪表盘|product|dashboard|productID=%s');
if($config->URAndSR) $lang->product->viewMenu->requirement = array('link' => "$lang->URCommon|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
if($config->URAndSR) $lang->product->menu->requirement = array('link' => "$lang->URCommon|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
$lang->product->menu->story = array('link' => "$lang->SRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
$lang->product->menu->plan = array('link' => "计划|productplan|browse|productID=%s", 'subModule' => 'productplan');
$lang->product->menu->release = array('link' => '发布|release|browse|productID=%s', 'subModule' => 'release');
@@ -213,7 +213,7 @@ $lang->release = new stdclass();
$lang->branch = new stdclass();
$lang->productplan = new stdclass();
$lang->release->menu = $lang->product->viewMenu;
$lang->release->menu = $lang->product->menu;
$lang->branch->menu = $lang->product->menu;
$lang->productplan->menu = $lang->product->menu;
module/common/model.php
+2 -2
View File
@@ -664,7 +664,7 @@ class commonModel extends model
$target = '';
$module = '';
$method = '';
$link = commonModel::createMenuLink($menuItem, $group);
$link = commonModel::createMenuLink($menuItem, $openApp);
if(is_array($menuItem->link))
{
if(isset($menuItem->link['target'])) $target = $menuItem->link['target'];
@@ -834,7 +834,7 @@ class commonModel extends model
$target = '';
$module = '';
$method = '';
$link = commonModel::createMenuLink($menuItem, $group);
$link = commonModel::createMenuLink($menuItem, $openApp);
if(is_array($menuItem->link))
{
if(isset($menuItem->link['target'])) $target = $menuItem->link['target'];
module/index/lang/de.php
+2 -6
View File
@@ -8,12 +8,8 @@ $lang->index->app->open = 'Open';
$lang->index->app->reload = 'Reload';
$lang->index->app->close = 'Close';
$lang->index->upgradeVersion = 'New version of Zen Tao';
$lang->index->currentVersion = 'Current Version';
$lang->index->versionName = 'Version Name';
$lang->index->releaseDate = 'Release Date';
$lang->index->explain = 'Release Notes';
$lang->index->actions = 'Operating';
$lang->index->upgradeVersion = 'Upgradable version';
$lang->index->upgradeNow = 'Upgrade now';
$lang->index->upgrade = 'Upgrade';
$lang->index->log = 'Log';
$lang->index->detailed = 'Details';
module/index/lang/en.php
+2 -6
View File
@@ -8,12 +8,8 @@ $lang->index->app->open = 'Open';
$lang->index->app->reload = 'Reload';
$lang->index->app->close = 'Close';
$lang->index->upgradeVersion = 'New version of Zen Tao';
$lang->index->currentVersion = 'Current Version';
$lang->index->versionName = 'Version Name';
$lang->index->releaseDate = 'Release Date';
$lang->index->explain = 'Release Notes';
$lang->index->actions = 'Operating';
$lang->index->upgradeVersion = 'Upgradable version';
$lang->index->upgradeNow = 'Upgrade now';
$lang->index->upgrade = 'Upgrade';
$lang->index->log = 'Log';
$lang->index->detailed = 'Details';
module/index/lang/fr.php
+4 -8
View File
@@ -1,6 +1,6 @@
<?php
$lang->index->common = 'Accueil';
$lang->index->index = 'Accueil';
$lang->index->common = 'Home';
$lang->index->index = 'Home';
$lang->index->search = 'Please input';
$lang->index->app = new stdClass();
@@ -8,12 +8,8 @@ $lang->index->app->open = 'Open';
$lang->index->app->reload = 'Reload';
$lang->index->app->close = 'Close';
$lang->index->upgradeVersion = 'New version of Zen Tao';
$lang->index->currentVersion = 'Current Version';
$lang->index->versionName = 'Version Name';
$lang->index->releaseDate = 'Release Date';
$lang->index->explain = 'Release Notes';
$lang->index->actions = 'Operating';
$lang->index->upgradeVersion = 'Upgradable version';
$lang->index->upgradeNow = 'Upgrade now';
$lang->index->upgrade = 'Upgrade';
$lang->index->log = 'Log';
$lang->index->detailed = 'Details';
module/index/lang/vi.php
+4 -8
View File
@@ -1,6 +1,6 @@
<?php
$lang->index->common = 'Trang chủ';
$lang->index->index = 'Trang chủ';
$lang->index->common = 'Home';
$lang->index->index = 'Home';
$lang->index->search = 'Please input';
$lang->index->app = new stdClass();
@@ -8,12 +8,8 @@ $lang->index->app->open = 'Open';
$lang->index->app->reload = 'Reload';
$lang->index->app->close = 'Close';
$lang->index->upgradeVersion = 'New version of Zen Tao';
$lang->index->currentVersion = 'Current Version';
$lang->index->versionName = 'Version Name';
$lang->index->releaseDate = 'Release Date';
$lang->index->explain = 'Release Notes';
$lang->index->actions = 'Operating';
$lang->index->upgradeVersion = 'Upgradable version';
$lang->index->upgradeNow = 'Upgrade now';
$lang->index->upgrade = 'Upgrade';
$lang->index->log = 'Log';
$lang->index->detailed = 'Details';
module/index/lang/zh-cn.php
+2 -1
View File
@@ -9,7 +9,8 @@ $lang->index->app->reload = '刷新';
$lang->index->app->close = '关闭';
$lang->index->upgradeVersion = '可升级版本';
$lang->index->upgrade = '现在升级';
$lang->index->upgradeNow = '现在升级';
$lang->index->upgrade = '升级';
$lang->index->log = '查看版本更新日志 >';
$lang->index->detailed = '详情';
$lang->index->website = '请访问官网';
module/index/lang/zh-tw.php
+3 -7
View File
@@ -8,13 +8,9 @@ $lang->index->app->open = '打開';
$lang->index->app->reload = '刷新';
$lang->index->app->close = '關閉';
$lang->index->upgradeVersion = '禪道新版本';
$lang->index->currentVersion = '當前版本';
$lang->index->versionName = '版本名稱';
$lang->index->releaseDate = '發佈日期';
$lang->index->explain = '更新說明';
$lang->index->actions = '操作';
$lang->index->upgradeVersion = '可升級版本';
$lang->index->upgradeNow = '現在升級';
$lang->index->upgrade = '升級';
$lang->index->log = '日誌';
$lang->index->log = '查看版本更新日誌 >';
$lang->index->detailed = '詳情';
$lang->index->website = '請訪問官網';
module/index/view/index.html.php
+4 -1
View File
@@ -96,6 +96,7 @@ js::set('defaultOpen', $open);
</div>
<?php else:?>
<div class='version-content'>
<?php $lastVersion = end($latestVersionList);?>
<?php foreach($latestVersionList as $versionNumber => $version):?>
<div class="version-list">
<div>
@@ -105,10 +106,12 @@ js::set('defaultOpen', $open);
<div class="version-detail"><?php echo $version->explain;?></div>
<div class="version-footer">
<a href="<?php echo inLink('changeLog', 'version=' . $versionNumber);?>" class="btn btn-link iframe" data-width="800"><?php echo $lang->index->log;?></strong></a>
<a href='<?php echo $version->link?>' class='btn btn-primary upgrade-now' style='color: white;' target='_blank'><?php echo $lang->index->upgrade;?></a>
<a href='<?php echo $version->link?>' class='btn btn-primary upgrade-now' style='color: white;' target='_blank'><?php echo $lang->index->upgradeNow;?></a>
</div>
</div>
<?php if($version->name != $lastVersion->name):?>
<hr class='version-hr'>
<?php endif;?>
<?php endforeach;?>
</div>
<?php endif;?>
module/testtask/model.php
+5 -1
View File
@@ -143,7 +143,11 @@ class testtaskModel extends model
common::setMenuVars($this->lang->testtask->menu, $key, $replace);
}
$this->lang->testtask->menu->testcase['subModule'] = 'testtask';
if($this->lang->navGroup->testcase == 'project' && $this->app->rawMethod == 'browseunits')
{
$lang->projectQa->menu->testcase['subModule'] = 'testtask';
}
if($this->lang->navGroup->testtask == 'qa')
{
foreach($this->lang->qa->subMenu->testcase as $key => $menu)