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

增加导出提示信息国际化，修改egress国际化code名称

Browse Source
This commit is contained in:
duandongmei
2018-06-12 15:37:10 +08:00
parent 9d552fa8d3
commit 03ad97814e
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -570,7 +570,7 @@ ip_subnet=Subnet
district=match district district=match district
keywords=keywords keywords=keywords
ingress=ingress ingress=ingress
degress=egress egress=egress
action_drop=drop action_drop=drop
action_reject=reject action_reject=reject
action_redirect=\redirect action_redirect=\redirect

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

@@ -193,6 +193,7 @@ required=This field is required?
select=Please select select=Please select
date_list=Data List date_list=Data List
confirm_message=Are you sure? confirm_message=Are you sure?
export_confirm_message=The maximum number of data exported from the data is
fill_loginName=Please fill in the loginName fill_loginName=Please fill in the loginName
fill_loginPassWord=Please fill in the passWord fill_loginPassWord=Please fill in the passWord
loginName_error=loginName and password error,please try again. loginName_error=loginName and password error,please try again.
@@ -396,7 +397,7 @@ ip_subnet=Subnet
district=match district district=match district
keywords=keywords keywords=keywords
ingress=ingress ingress=ingress
degress=egress egress=egress
action_drop=\u0431\u0440\u043E\u0441\u044C action_drop=\u0431\u0440\u043E\u0441\u044C
action_reject=\u043E\u0442\u043A\u043B\u043E\u043D\u0438\u0442\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_redirect=\u043F\u0435\u0440\u0435\u043D\u0430\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435

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

@@ -220,6 +220,7 @@ required=\u4E0D\u80FD\u4E3A\u7A7A\!
select=\u8BF7\u9009\u62E9 select=\u8BF7\u9009\u62E9
date_list=\u6570\u636E\u5217\u8868 date_list=\u6570\u636E\u5217\u8868
confirm_message=\u786E\u5B9A\u5417\uFF1F confirm_message=\u786E\u5B9A\u5417\uFF1F
export_confirm_message=\u6570\u636E\u5BFC\u51FA\u6700\u5927\u6761\u6570\u4E3A
fill_loginName=\u8BF7\u586B\u5199\u767B\u5F55\u8D26\u53F7 fill_loginName=\u8BF7\u586B\u5199\u767B\u5F55\u8D26\u53F7
fill_loginPassWord=\u8BF7\u586B\u5199\u767B\u5F55\u5BC6\u7801 fill_loginPassWord=\u8BF7\u586B\u5199\u767B\u5F55\u5BC6\u7801
loginName_error=\u7528\u6237\u6216\u5BC6\u7801\u9519\u8BEF, \u8BF7\u91CD\u8BD5. loginName_error=\u7528\u6237\u6216\u5BC6\u7801\u9519\u8BEF, \u8BF7\u91CD\u8BD5.
@@ -582,7 +583,7 @@ ssl_san=SSL SAN\u5173\u952E\u5B57\u914D\u7F6E
ssl_ca=SSL CA\u5173\u952E\u5B57\u914D\u7F6E ssl_ca=SSL CA\u5173\u952E\u5B57\u914D\u7F6E
http_control=http\u914D\u7F6E http_control=http\u914D\u7F6E
ingress=\u51FA\u53E3\u65B9\u5411 ingress=\u51FA\u53E3\u65B9\u5411
degress=\u5165\u53E3\u65B9\u5411 egress=\u5165\u53E3\u65B9\u5411
fileTransfer_control=\u6587\u4EF6\u4F20\u8F93\u914D\u7F6E fileTransfer_control=\u6587\u4EF6\u4F20\u8F93\u914D\u7F6E
mail_hdr=\u90AE\u4EF6\u5934\u57DF\u914D\u7F6E mail_hdr=\u90AE\u4EF6\u5934\u57DF\u914D\u7F6E
mail_body=\u90AE\u4EF6\u5185\u5BB9\u914D\u7F6E mail_body=\u90AE\u4EF6\u5185\u5BB9\u914D\u7F6E
@@ -593,6 +594,7 @@ mail_ip=\u90AE\u4EF6IP\u914D\u7F6E
ftp_ip=FTP IP\u914D\u7F6E ftp_ip=FTP IP\u914D\u7F6E
dns_ip=DNS IP\u914D\u7F6E dns_ip=DNS IP\u914D\u7F6E
dns_domain=DNS\u57DF\u540D\u914D\u7F6E dns_domain=DNS\u57DF\u540D\u914D\u7F6E
action=\u52A8\u4F5C
has_prohibit_delete=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u5220\u9664 has_prohibit_delete=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u5220\u9664
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

2
src/main/webapp/WEB-INF/include/form/areaInfo.jsp
View File

@@ -367,7 +367,7 @@ $(function(){
<select name="areaCfg[${status.index}].direction" class="selectpicker show-tick form-control required" > <select name="areaCfg[${status.index}].direction" class="selectpicker show-tick form-control required" >
<option value="0" <c:if test="${areaCfg.direction==0 || areaCfg.direction==null}">selected</c:if>><spring:message code="twoway"/></option> <option value="0" <c:if test="${areaCfg.direction==0 || areaCfg.direction==null}">selected</c:if>><spring:message code="twoway"/></option>
<option value="1" <c:if test="${areaCfg.direction==1 }">selected</c:if>><spring:message code="ingress"/></option> <option value="1" <c:if test="${areaCfg.direction==1 }">selected</c:if>><spring:message code="ingress"/></option>
<option value="2" <c:if test="${areaCfg.direction==2 }">selected</c:if>><spring:message code="degress"/></option> <option value="2" <c:if test="${areaCfg.direction==2 }">selected</c:if>><spring:message code="egress"/></option>
</select> </select>
</div> </div>
<div for="areaCfg[${status.index}].direction"></div> <div for="areaCfg[${status.index}].direction"></div>

5
src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
View File

@@ -273,7 +273,7 @@
html+="<spring:message code='ingress'/>" html+="<spring:message code='ingress'/>"
} }
if(item.direction==2){ if(item.direction==2){
html+="<spring:message code='degress'/>" html+="<spring:message code='egress'/>"
} }
html+="</label>"; html+="</label>";
html+="</div>"; html+="</div>";
@@ -444,7 +444,7 @@
</div> </div>
<input id="intype" class="form-control input-medium" type="text" value=""> <input id="intype" class="form-control input-small" type="text" value="">
</div> </div>
</div> </div>
@@ -458,6 +458,7 @@
<sys:delRow url="${ctx}/ntc/av/voipForm" id="contentTable" label="update"></sys:delRow> <sys:delRow url="${ctx}/ntc/av/voipForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/av/updateAvVoipValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow> <sys:delRow url="${ctx}/ntc/av/updateAvVoipValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
</shiro:hasPermission> </shiro:hasPermission>
<!--<sys:delRow url="${ctx}/ntc/av/voipExport?functionId=${cfg.functionId }" id="contentTable" label="export" maxRow="${page.maxExportSize }"></sys:delRow>-->
<shiro:hasPermission name="avVoip:audit"> <shiro:hasPermission name="avVoip:audit">
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">