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

(1)action国际化code添加，中英俄三国国际化

Browse Source 
(2)列表页面部分数字写死的代码替换为字典值
This commit is contained in:
wangxin
2018-06-06 17:06:31 +08:00
parent efb52a6bf9
commit cc5acbc271
6 changed files with 61 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -566,4 +566,13 @@ ip_subnet=Subnet
district=match district district=match district
keywords=keywords keywords=keywords
ingress=ingress ingress=ingress
degress=egress degress=egress
action_drop=drop
action_reject=reject
action_redirect=\redirect
action_loop=loop
action_forward=forward
action_ratelimit=rate limit
action_replace=replace
action_whitelist=white list
action_monit=monitor

11
src/main/resources/messages/message_ru.properties
View File

@@ -392,4 +392,13 @@ ip_subnet=Subnet
district=match district district=match district
keywords=keywords keywords=keywords
ingress=ingress ingress=ingress
degress=egress degress=egress
action_drop=\u0431\u0440\u043E\u0441\u044C
action_reject=\u043E\u0442\u043A\u043B\u043E\u043D\u0438\u0442\u044C
action_redirect=\u043F\u0435\u0440\u0435\u043D\u0430\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435
action_loop=\u043F\u0435\u0442\u043B\u044F
action_forward=\u0432\u043F\u0435\u0440\u0435\u0434
action_ratelimit=\u0441\u0442\u0430\u0432\u043A\u0438 \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0438\u0442\u044C
action_replace=\u0437\u0430\u043C\u0435\u043D\u0438\u0442\u044C
action_whitelist=\u0431\u0435\u043B\u044B\u0439 \u0441\u043F\u0438\u0441\u043E\u043A
action_monit=\u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433

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

@@ -593,3 +593,12 @@ has_prohibit_delete=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u5220
has_prohibit_nopass=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u672A\u901A\u8FC7\u5BA1\u6838 has_prohibit_nopass=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u672A\u901A\u8FC7\u5BA1\u6838
has_prohibit_pass=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u4EE5\u5BA1\u6838\u901A\u8FC7 has_prohibit_pass=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u4EE5\u5BA1\u6838\u901A\u8FC7
multiple_keywords_tip=\u53EF\u540C\u65F6\u8F93\u5165\u591A\u6761\u5173\u952E\u5B57\uFF0C\u8BF7\u4EE5\u82F1\u6587\u9017\u53F7\u6216\u8005\u56DE\u8F66\u952E\u9694\u5F00\u3002 multiple_keywords_tip=\u53EF\u540C\u65F6\u8F93\u5165\u591A\u6761\u5173\u952E\u5B57\uFF0C\u8BF7\u4EE5\u82F1\u6587\u9017\u53F7\u6216\u8005\u56DE\u8F66\u952E\u9694\u5F00\u3002
action_drop=\u4E22\u5F03
action_reject=\u963B\u65AD
action_redirect=\u91CD\u5B9A\u5411
action_loop=\u56DE\u6D41
action_forward=\u8F6C\u53D1
action_ratelimit=\u9650\u901F
action_replace=\u66FF\u6362
action_whitelist=\u767D\u540D\u5355
action_monit=\u76D1\u6D4B

34
src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp
View File

@@ -87,10 +87,9 @@
<div class="pull-left"> <div class="pull-left">
<form:select path="isAudit" class="selectpicker select2 input-small"> <form:select path="isAudit" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="all_states"/></form:option> <form:option value=""><spring:message code="all_states"/></form:option>
<form:option value="0"><spring:message code="created"></spring:message></form:option> <c:forEach items="${fns:getDictList('SPEC_AUDIT')}" var="auditC">
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="${auditC.itemCode}"><spring:message code="${auditC.itemValue}"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> </c:forEach>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
<div class="pull-left"> <div class="pull-left">
@@ -246,18 +245,19 @@
<td>${cfg.destIpAddress }</td> <td>${cfg.destIpAddress }</td>
<td>${cfg.destPort }</td> <td>${cfg.destPort }</td>
<td> <td>
<c:forEach items="${serviceList}" var="service"> <c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="serviceC">
<c:if test="${cfg.action eq service.action}"><spring:message code="${service.actionCode }"/></c:if> <c:if test="${cfg.action eq serviceC.itemValue}"><spring:message code="${serviceC.itemDesc }"/></c:if>
</c:forEach> </c:forEach>
</td> </td>
<td> <td>
<c:if test="${cfg.direction==0}"><spring:message code="twoway"/></c:if> <c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<c:if test="${cfg.direction==1}"><spring:message code="oneway"/></c:if> <c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemDesc }"/></c:if>
</c:forEach>
</td> </td>
<td> <td>
<c:if test="${cfg.protocol==6}"><spring:message code="TCP"/></c:if> <c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol==17}"><spring:message code="UDP"/></c:if> <c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemDesc }"/></c:if>
<c:if test="${cfg.protocol==0}"><spring:message code="arbitrary"/></c:if> </c:forEach>
</td> </td>
<td> <td>
<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if> <c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
@@ -298,12 +298,12 @@
<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if> <c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
</td> </td>
<td> <td>
<c:choose> <c:forEach items="${fns:getDictList('SPEC_AUDIT')}" var="auditC">
<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when> <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'created'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:if>
<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when> <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'approved'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:if>
<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when> <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'unapproved'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:if>
<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when> <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'cancel'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:if>
</c:choose> </c:forEach>
</td> </td>
<td>${cfg.creatorName }</td> <td>${cfg.creatorName }</td>
<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td> <td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>

11
src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
View File

@@ -138,9 +138,9 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label> <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
<div class="col-md-6"> <div class="col-md-6">
<select name="ipPattern" class="selectpicker show-tick form-control required"> <select name="ipPattern" class="selectpicker show-tick form-control required">
<option value="1" <c:if test="${_cfg.ipPattern==1}">selected</c:if>><spring:message code="ip_subnet"/></option> <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<option value="2" <c:if test="${_cfg.ipPattern==2}">selected</c:if>><spring:message code="ip_range"/></option> <option value="${ipPatternC.itemCode}" <c:if test="${_cfg.ipPattern==ipPatternC.itemCode || (_cfg.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemDesc}"/></option>
<option value="3" <c:if test="${_cfg.ipPattern==3}">selected</c:if>><spring:message code="ip"/></option> </c:forEach>
</select> </select>
<!-- <input class="form-control" type="text" value="${_cfg.ipType}">--> <!-- <input class="form-control" type="text" value="${_cfg.ipType}">-->
</div> </div>
@@ -163,8 +163,9 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label> <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
<div class="col-md-6"> <div class="col-md-6">
<select name="portPattern" class="selectpicker show-tick form-control required"> <select name="portPattern" class="selectpicker show-tick form-control required">
<option value="1" <c:if test="${_cfg.portPattern==1}">selected</c:if> ><spring:message code="port"/></option> <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<option value="2" <c:if test="${_cfg.portPattern==2}">selected</c:if>><spring:message code="port_mask"/></option> <option value="${portPatternC.itemCode}" <c:if test="${_cfg.portPattern==portPatternC.itemCode || (_cfg.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemDesc}"/></option>
</c:forEach>
</select> </select>
</div> </div>
<div for="portPattern"></div> <div for="portPattern"></div>

19
src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
View File

@@ -88,10 +88,9 @@
<div class="pull-left"> <div class="pull-left">
<form:select path="isAudit" class="selectpicker select2 input-small"> <form:select path="isAudit" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="all_states"/></form:option> <form:option value=""><spring:message code="all_states"/></form:option>
<form:option value="0"><spring:message code="created"></spring:message></form:option> <c:forEach items="${fns:getDictList('SPEC_AUDIT')}" var="auditC">
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="${auditC.itemCode}"><spring:message code="${auditC.itemValue}"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> </c:forEach>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
<div class="pull-left"> <div class="pull-left">
@@ -251,12 +250,12 @@
<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if> <c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
</td> </td>
<td> <td>
<c:choose> <c:forEach items="${fns:getDictList('SPEC_AUDIT')}" var="auditC">
<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when> <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'created'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:if>
<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when> <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'approved'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:if>
<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when> <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'unapproved'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:if>
<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when> <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'cancel'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:if>
</c:choose> </c:forEach>
</td> </td>
<td>${cfg.creatorName }</td> <td>${cfg.creatorName }</td>
<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td> <td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>