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

Merge branch 'sprint/170_zhouxin_16408' into 'sprint/170'

Browse Source 
Fix bug 16408.

See merge request easycorp/zentaopms!526
This commit is contained in:
孙广明
2021-11-19 00:33:29 +00:00
parent 40b0b05a3e b8783ecd5c
commit 92b7515069
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/branch/lang/en.php
+3 -2
View File
@@ -9,13 +9,14 @@ $lang->branch->manageTitle = '%s Management';
$lang->branch->all = 'All ';
$lang->branch->main = 'Main';
$lang->branch->edit = 'Edit';
$lang->branch->editAction = 'Edit %s';
$lang->branch->edit = 'Edit %s';
$lang->branch->editAction = 'Edit Branch';
$lang->branch->activate = 'Activate';
$lang->branch->activateAction = 'Activate Branch';
$lang->branch->close = 'Close';
$lang->branch->closeAction = 'Close Branch';
$lang->branch->create = 'Create %s';
$lang->branch->createAction = 'Create Branch';
$lang->branch->merge = 'Merge';
$lang->branch->batchEdit = 'Batch Edit';
$lang->branch->defaultBranch = 'Default Branch';
module/branch/lang/zh-cn.php
+3 -2
View File
@@ -9,13 +9,14 @@ $lang->branch->manageTitle = '%s管理';
$lang->branch->all = '所有';
$lang->branch->main = '主干';
$lang->branch->edit = '编辑';
$lang->branch->editAction = '编辑%s';
$lang->branch->edit = '编辑%s';
$lang->branch->editAction = '编辑分支';
$lang->branch->activate = '激活';
$lang->branch->activateAction = '激活分支';
$lang->branch->close = '关闭';
$lang->branch->closeAction = '关闭分支';
$lang->branch->create = '新增%s';
$lang->branch->createAction = '新增分支';
$lang->branch->merge = '合并';
$lang->branch->batchEdit = '批量编辑';
$lang->branch->defaultBranch = '默认分支';
module/branch/view/edit.html.php
+1 -1
View File
@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<div id='mainContent' class='main-content'>
<div class='main-header'>
<h2><?php echo sprintf($lang->branch->editAction, $lang->product->branchName[$product->type]);?></h2>
<h2><?php echo sprintf($lang->branch->edit, $lang->product->branchName[$product->type]);?></h2>
</div>
<form class='main-form' method='post' target='hiddenwin'>
<table class='table table-form'>
module/group/lang/resource.php
+1 -1
View File
@@ -421,7 +421,7 @@ $lang->product->methodOrder[105] = 'unbindWhitelist';
/* Branch. */
$lang->resource->branch = new stdclass();
$lang->resource->branch->manage = 'manage';
$lang->resource->branch->create = 'create';
$lang->resource->branch->create = 'createAction';
$lang->resource->branch->edit = 'editAction';
$lang->resource->branch->close = 'closeAction';
$lang->resource->branch->activate = 'activateAction';