gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
wangxin
2018-03-07 09:47:36 +08:00
parent 6ecec91f22 8602e1975d
commit 599526a5f6
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/messages/message_en.properties
View File

@@ -228,4 +228,7 @@ block_url=block url
configuration=configuration configuration=configuration
direction=direction direction=direction
protocol=protocol protocol=protocol
oneway=oneway
twoway=twoway
arbitrary=arbitrary
#==========guankongbaimingdan end===================== #==========guankongbaimingdan end=====================

3
src/main/resources/messages/message_zh_CN.properties
View File

@@ -226,4 +226,7 @@ block_url=\u5c01\u5835\u8def\u5f84
configuration=\u914d\u7f6e configuration=\u914d\u7f6e
direction=\u65b9\u5411 direction=\u65b9\u5411
protocol=\u534f\u8bae protocol=\u534f\u8bae
oneway=\u5355\u5411
twoway=\u53cc\u5411
arbitrary=\u4efb\u610f
#==========guankongbaimingdan end===================== #==========guankongbaimingdan end=====================

2
src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
View File

@@ -98,8 +98,8 @@
<!-- <th>编译id</th> --> <!-- <th>编译id</th> -->
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="type"/></th> <th><spring:message code="type"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th> <th><spring:message code="label"/></th>
<th><spring:message code="property"/></th>
<!-- <th>区域生效id</th> --> <!-- <th>区域生效id</th> -->
<th><spring:message code="valid_identifier"/></th> <th><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th> <th><spring:message code="is_audit"/></th>