diff --git a/db/update7.3.sql b/db/update7.3.sql index ac692dc0cd..628028c2df 100644 --- a/db/update7.3.sql +++ b/db/update7.3.sql @@ -28,4 +28,4 @@ ALTER TABLE `zt_story` ADD `plan` text COLLATE 'utf8_general_ci' NOT NULL AFTER UPDATE `zt_story` SET `plan`='' WHERE `plan`='0'; ALTER TABLE `zt_release` DROP INDEX `name`; -ALTER TABLE `zt_user` ADD `bindRanzhi` char(30) COLLATE 'utf8_general_ci' NOT NULL AFTER `locked`; +ALTER TABLE `zt_user` ADD `ranzhi` char(30) COLLATE 'utf8_general_ci' NOT NULL AFTER `locked`; diff --git a/module/release/lang/en.php b/module/release/lang/en.php index 66989a7e6d..dafd79cb40 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -62,5 +62,8 @@ $lang->release->statusList[''] = ''; $lang->release->statusList['normal'] = 'Normal'; $lang->release->statusList['terminate'] = 'Terminate'; +$lang->release->changeStatusList['normal'] = 'Activate'; +$lang->release->changeStatusList['terminate'] = 'Terminate'; + $lang->release->action = new stdclass(); -$lang->release->action->changestatus = array('main' => '$date, $extra By $actor.', 'extra' => 'statusList'); +$lang->release->action->changestatus = array('main' => '$date, $extra By $actor.', 'extra' => 'changeStatusList'); diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php index cdcf99ff5e..031573cbd2 100644 --- a/module/release/lang/zh-cn.php +++ b/module/release/lang/zh-cn.php @@ -59,8 +59,11 @@ $lang->release->exportTypeList['bug'] = 'Bug'; $lang->release->exportTypeList['leftbug'] = '遗留Bug'; $lang->release->statusList[''] = ''; -$lang->release->statusList['normal'] = '正常维护'; +$lang->release->statusList['normal'] = '正常'; $lang->release->statusList['terminate'] = '停止维护'; +$lang->release->changeStatusList['normal'] = '激活'; +$lang->release->changeStatusList['terminate'] = '停止维护'; + $lang->release->action = new stdclass(); -$lang->release->action->changestatus = array('main' => '$date, 由 $actor $extra。', 'extra' => 'statusList'); +$lang->release->action->changestatus = array('main' => '$date, 由 $actor $extra。', 'extra' => 'changeStatusList'); diff --git a/module/release/lang/zh-tw.php b/module/release/lang/zh-tw.php index 17b5df701f..4712269b04 100644 --- a/module/release/lang/zh-tw.php +++ b/module/release/lang/zh-tw.php @@ -62,5 +62,8 @@ $lang->release->statusList[''] = ''; $lang->release->statusList['normal'] = '正常維護'; $lang->release->statusList['terminate'] = '停止維護'; +$lang->release->changeStatusList['normal'] = '激活'; +$lang->release->changeStatusList['terminate'] = '停止維護'; + $lang->release->action = new stdclass(); -$lang->release->action->changestatus = array('main' => '$date, 由 $actor $extra。', 'extra' => 'statusList'); +$lang->release->action->changestatus = array('main' => '$date, 由 $actor $extra。', 'extra' => 'changeStatusList'); diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index 6063877f6c..3e76dc19b6 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -50,7 +50,7 @@ if(common::hasPriv('release', 'changeStatus')) { $changedStatus = $release->status == 'normal' ? 'terminate' : 'normal'; - echo html::a(inlink('changeStatus', "releaseID=$release->id&status=$changedStatus"), ' ', 'hiddenwin', "class='btn-icon' title='{$lang->release->statusList[$changedStatus]}'"); + echo html::a(inlink('changeStatus', "releaseID=$release->id&status=$changedStatus"), ' ', 'hiddenwin', "class='btn-icon' title='{$lang->release->changeStatusList[$changedStatus]}'"); } common::printIcon('release', 'edit', "release=$release->id", '', 'list'); if(common::hasPriv('release', 'delete')) diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index 2348a751c3..80c578c793 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -32,7 +32,7 @@ if(common::hasPriv('release', 'changeStatus')) { $changedStatus = $release->status == 'normal' ? 'terminate' : 'normal'; - echo html::a(inlink('changeStatus', "releaseID=$release->id&type=$changedStatus"), ' ' . $lang->release->statusList[$changedStatus], 'hiddenwin', "class='btn'"); + echo html::a(inlink('changeStatus', "releaseID=$release->id&type=$changedStatus"), ' ' . $lang->release->changeStatusList[$changedStatus], 'hiddenwin', "class='btn'"); } if(common::hasPriv('release', 'linkStory')) echo html::a(inlink('view', "releaseID=$release->id&type=story&link=true"), ' ' . $lang->release->linkStory, '', "class='btn'"); if(common::hasPriv('release', 'linkBug')) echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"), ' ' . $lang->release->linkBug, '', "class='btn'");