diff --git a/module/branch/lang/en.php b/module/branch/lang/en.php index 7fee852b93..53ee04c8c7 100644 --- a/module/branch/lang/en.php +++ b/module/branch/lang/en.php @@ -9,6 +9,9 @@ $lang->branch->manageTitle = '%s Management'; $lang->branch->all = 'All '; $lang->branch->main = 'Main'; +$lang->branch->edit = 'Edit'; +$lang->branch->active = 'Active'; +$lang->branch->close = 'Close'; $lang->branch->create = 'Create Branch'; $lang->branch->merge = 'Merge'; diff --git a/module/branch/lang/zh-cn.php b/module/branch/lang/zh-cn.php index e5fa159288..c0066b6be3 100644 --- a/module/branch/lang/zh-cn.php +++ b/module/branch/lang/zh-cn.php @@ -9,6 +9,9 @@ $lang->branch->manageTitle = '%s管理'; $lang->branch->all = '所有'; $lang->branch->main = '主干'; +$lang->branch->edit = '编辑'; +$lang->branch->active = '激活'; +$lang->branch->close = '关闭'; $lang->branch->create = '新增分支'; $lang->branch->merge = '合并'; diff --git a/module/branch/view/manage.html.php b/module/branch/view/manage.html.php index f8e22f2a80..c087c8b364 100644 --- a/module/branch/view/manage.html.php +++ b/module/branch/view/manage.html.php @@ -63,7 +63,7 @@ - id => ''), '', $branch->id == BRANCH_MAIN ? "disabled='disabled'" : '');?> + id => ''));?> @@ -78,7 +78,7 @@ common::printIcon('branch', 'edit', "branchID=$branch->id", $branch, 'list', '', '', $disabled); if($branch->status == 'active') { - common::printIcon('branch', 'closed', "branchID=$branch->id", $branch, 'list', 'off', '', $disabled); + common::printIcon('branch', 'close', "branchID=$branch->id", $branch, 'list', 'off', '', $disabled); } else {