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 
Conflicts:
	src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
	src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
This commit is contained in:
fangshunjian
2018-08-27 20:08:13 +08:00
parent 76aa9d4f27 9f33c72a42
commit 4259117e94
191 changed files with 4999 additions and 1857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
View File

@@ -65,6 +65,7 @@
invisibleChar:"Please enter the visible character",
hasInvisibleChar:"The tag {0} has invisible character",
haveInvisibleChar:"The tags {0} have invisible character",
httpCheck:"Please enter a correct url(http[s]://xxx.xx)"
httpCheck:"Please enter a correct url(http[s]://xxx.xx)",
failed:"Failed"
});
}(jQuery));

4
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
View File

@@ -65,6 +65,8 @@
invisibleChar:"请输入可见字符",
hasInvisibleChar:"标签{0}包含不可见字符",
haveInvisibleChar:"标签{0}包含不可见字符",
httpCheck:"请输入正确的url(http[s]://xxx.xx)"
httpCheck:"请输入正确的url(http[s]://xxx.xx)",
failed:"获取失败"
});
}(jQuery));