From d04bb157e97f1dbe83b4eb7b8415857c49095d2e Mon Sep 17 00:00:00 2001 From: Kamil Banach Date: Tue, 29 Dec 2015 13:34:52 +0100 Subject: [PATCH 01/11] i18n: Move almost all strings from jsp/tag to messages.properties --- .../views/layout/external-layout.jsp | 3 +- .../views/layout/internal-layout.jsp | 2 +- .../resources/views/pages/dashboard.jsp | 2 +- .../resources/views/pages/error-page.jsp | 5 +-- .../META-INF/resources/views/pages/login.jsp | 3 +- .../resources/views/pages/page-not-found.jsp | 5 +-- .../views/sections/footer-section.jsp | 2 +- .../views/sections/header-section.jsp | 9 ++++-- .../resources/views/sections/left-section.jsp | 2 +- .../views/sections/top-navigation-section.jsp | 3 +- .../META-INF/tags/breadcrumb/breadcrumb.tag | 2 +- .../resources/META-INF/tags/data-table.tag | 5 +-- .../tags/edit/n2many-edit-control.tag | 5 ++- .../META-INF/tags/edit/n2one-edit-control.tag | 4 +-- .../main/resources/META-INF/tags/search.tag | 9 ++++-- .../src/main/resources/messages.properties | 32 ++++++++++++------- 16 files changed, 59 insertions(+), 34 deletions(-) diff --git a/lightadmin-core/src/main/resources/META-INF/resources/views/layout/external-layout.jsp b/lightadmin-core/src/main/resources/META-INF/resources/views/layout/external-layout.jsp index 99a90e5e..ea74e118 100644 --- a/lightadmin-core/src/main/resources/META-INF/resources/views/layout/external-layout.jsp +++ b/lightadmin-core/src/main/resources/META-INF/resources/views/layout/external-layout.jsp @@ -7,6 +7,7 @@ <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> +<%@ taglib prefix="bean" uri="http://java.sun.com/jsp/jstl/fmt" %> @@ -18,7 +19,7 @@ - LightAdmin - Web administration framework. + <bean:message key="lightadmin.application.external.name"/> "> "> diff --git a/lightadmin-core/src/main/resources/META-INF/resources/views/layout/internal-layout.jsp b/lightadmin-core/src/main/resources/META-INF/resources/views/layout/internal-layout.jsp index 9c8bb00e..33a84d4a 100644 --- a/lightadmin-core/src/main/resources/META-INF/resources/views/layout/internal-layout.jsp +++ b/lightadmin-core/src/main/resources/META-INF/resources/views/layout/internal-layout.jsp @@ -20,7 +20,7 @@ - <spring:message code="application.name"/> + <title><spring:message code="lightadmin.application.name"/> <c:out value="${ not empty(screenContext) ? screenContext.screenName : ''}"/> "> diff --git a/lightadmin-core/src/main/resources/META-INF/resources/views/pages/dashboard.jsp b/lightadmin-core/src/main/resources/META-INF/resources/views/pages/dashboard.jsp index ac2f62d7..238f2e29 100644 --- a/lightadmin-core/src/main/resources/META-INF/resources/views/pages/dashboard.jsp +++ b/lightadmin-core/src/main/resources/META-INF/resources/views/pages/dashboard.jsp @@ -9,7 +9,7 @@
-
+
diff --git a/lightadmin-core/src/main/resources/META-INF/resources/views/pages/error-page.jsp b/lightadmin-core/src/main/resources/META-INF/resources/views/pages/error-page.jsp index 9af109d5..b89bec68 100644 --- a/lightadmin-core/src/main/resources/META-INF/resources/views/pages/error-page.jsp +++ b/lightadmin-core/src/main/resources/META-INF/resources/views/pages/error-page.jsp @@ -3,18 +3,19 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="light" uri="http://www.lightadmin.org/tags" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="bean" uri="http://java.sun.com/jsp/jstl/fmt" %>
-

Something went wrong here

+

400

-

Oops! Sorry, an error has occured.

+


${back_to_dashboard}
diff --git a/lightadmin-core/src/main/resources/META-INF/resources/views/pages/login.jsp b/lightadmin-core/src/main/resources/META-INF/resources/views/pages/login.jsp index 527df4e9..e2d38af7 100644 --- a/lightadmin-core/src/main/resources/META-INF/resources/views/pages/login.jsp +++ b/lightadmin-core/src/main/resources/META-INF/resources/views/pages/login.jsp @@ -6,6 +6,7 @@ +
@@ -48,7 +49,7 @@
+ for="_spring_security_remember_me">${remember_me}
diff --git a/lightadmin-core/src/main/resources/META-INF/resources/views/pages/page-not-found.jsp b/lightadmin-core/src/main/resources/META-INF/resources/views/pages/page-not-found.jsp index 2ccf306b..cf152cf7 100644 --- a/lightadmin-core/src/main/resources/META-INF/resources/views/pages/page-not-found.jsp +++ b/lightadmin-core/src/main/resources/META-INF/resources/views/pages/page-not-found.jsp @@ -3,17 +3,18 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="light" uri="http://www.lightadmin.org/tags" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="bean" uri="http://java.sun.com/jsp/jstl/fmt" %>
-

Something went wrong here

+

404

-

Oops! Sorry, an error has occured.
Requested page not found!

+


${back_to_dashboard}
diff --git a/lightadmin-core/src/main/resources/META-INF/resources/views/sections/footer-section.jsp b/lightadmin-core/src/main/resources/META-INF/resources/views/sections/footer-section.jsp index 1079086e..f4888416 100644 --- a/lightadmin-core/src/main/resources/META-INF/resources/views/sections/footer-section.jsp +++ b/lightadmin-core/src/main/resources/META-INF/resources/views/sections/footer-section.jsp @@ -7,6 +7,6 @@ \ No newline at end of file diff --git a/lightadmin-core/src/main/resources/META-INF/resources/views/sections/header-section.jsp b/lightadmin-core/src/main/resources/META-INF/resources/views/sections/header-section.jsp index 6c393d4f..1828e3d8 100644 --- a/lightadmin-core/src/main/resources/META-INF/resources/views/sections/header-section.jsp +++ b/lightadmin-core/src/main/resources/META-INF/resources/views/sections/header-section.jsp @@ -7,6 +7,9 @@ + + +