From cfa0c316eb4f47d419e43bdfd7b0d97f29053a5a Mon Sep 17 00:00:00 2001 From: datagear Date: Wed, 19 Sep 2018 19:12:50 +0800 Subject: [PATCH] =?UTF-8?q?[web]=E5=AE=8C=E5=96=84=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=86=85=E5=AE=B9=EF=BC=9Berror.jsp=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0isErrorPage=3D"true"=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- datagear-web/src/main/resources/locales/datagear.properties | 4 ++-- datagear-web/src/main/webapp/WEB-INF/jsp/error.jsp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/datagear-web/src/main/resources/locales/datagear.properties b/datagear-web/src/main/resources/locales/datagear.properties index a9a224c7..283e5b76 100644 --- a/datagear-web/src/main/resources/locales/datagear.properties +++ b/datagear-web/src/main/resources/locales/datagear.properties @@ -77,8 +77,8 @@ error.EstablishConnectionException=\u6570\u636E\u5E93\u8FDE\u63A5\u51FA\u9519\uF data.queryWithShortcut=\u67E5\u8BE2\uFF08CTRL+ENTER\uFF09 data.clearWithShortcut=\u6E05\u9664\uFF08CTRL+SHIFT+BACKSPACE\uFF09 data.conditionPanelWithShortcut=\u9AD8\u7EA7\u67E5\u8BE2\uFF08CTRL+SHIFT+↓\uFF09 -data.likeTitle=LIKE\uFF08CTRL+SHIFT+!\uFF09 -data.notLikeTitle=NOT LIKE\uFF08CTRL+SHIFT+!\uFF09 +data.likeTitle=\u5305\u542B\uFF08CTRL+SHIFT+!\uFF09 +data.notLikeTitle=\u4E0D\u5305\u542B\uFF08CTRL+SHIFT+!\uFF09 #driverEntity driverEntity.addDriverEntity=\u6DFB\u52A0\u6570\u636E\u5E93\u9A71\u52A8\u7A0B\u5E8F diff --git a/datagear-web/src/main/webapp/WEB-INF/jsp/error.jsp b/datagear-web/src/main/webapp/WEB-INF/jsp/error.jsp index 16311530..30ae610e 100644 --- a/datagear-web/src/main/webapp/WEB-INF/jsp/error.jsp +++ b/datagear-web/src/main/webapp/WEB-INF/jsp/error.jsp @@ -3,7 +3,7 @@ * Copyright (c) 2018 by datagear.org. */ --%> -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isErrorPage="true"%> <%@ include file="include/jsp_import.jsp" %> <%@page import="org.springframework.web.context.support.WebApplicationContextUtils"%> <%@page import="org.springframework.web.context.WebApplicationContext"%>