Author: woonsan
Date: Thu Feb 4 16:59:17 2010
New Revision: 906565
URL: http://svn.apache.org/viewvc?rev=906565&view=rev
Log:
JS2-1057: Adding i18n to space related portlets.
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources.properties
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/breadcrumbs.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/space-navigator.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/spaces-list.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/spaces-manager.jsp
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources.properties?rev=906565&r1=906564&r2=906565&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources.properties
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources.properties
Thu Feb 4 16:59:17 2010
@@ -17,9 +17,17 @@
#
# DO NOT TRANSLATE & DO NOT INCLUDE IN L10N PROPERTIES FILE
-spaces.label.title=Title
-spaces.label.description=Description
-spaces.label.owner=Owner
-spaces.table.title=Spaces
-spaces.label.edit=Edit
-spaces.label.delete=Delete
+
+spaces.label.name = Name
+spaces.label.title = Title
+spaces.label.description = Description
+spaces.label.owner = Owner
+spaces.label.security = Security
+spaces.label.theme = Theme
+spaces.table.title = Spaces
+spaces.label.edit = Edit
+spaces.label.delete = Delete
+spaces.label.add = Add Space
+spaces.label.update = Update Space
+
+spaces.pages.label.add = Add Page
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml?rev=906565&r1=906564&r2=906565&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
Thu Feb 4 16:59:17 2010
@@ -2209,6 +2209,7 @@
<portlet-mode>EDIT</portlet-mode>
</supports>
<supported-locale>en</supported-locale>
+
<resource-bundle>org.apache.jetspeed.portlets.spaces.resources.SpacesResources</resource-bundle>
<portlet-info>
<title>Spaces Manager</title>
<short-title>Spaces</short-title>
@@ -2242,6 +2243,7 @@
<portlet-mode>EDIT</portlet-mode>
</supports>
<supported-locale>en</supported-locale>
+
<resource-bundle>org.apache.jetspeed.portlets.spaces.resources.SpacesResources</resource-bundle>
<portlet-info>
<title>Space Navigator</title>
<short-title>SpaceNavigator</short-title>
@@ -2271,6 +2273,7 @@
<portlet-mode>EDIT</portlet-mode>
</supports>
<supported-locale>en</supported-locale>
+
<resource-bundle>org.apache.jetspeed.portlets.spaces.resources.SpacesResources</resource-bundle>
<portlet-info>
<title>Page Navigator</title>
<short-title>PageNavigator</short-title>
@@ -2292,6 +2295,7 @@
<portlet-mode>VIEW</portlet-mode>
</supports>
<supported-locale>en</supported-locale>
+
<resource-bundle>org.apache.jetspeed.portlets.spaces.resources.SpacesResources</resource-bundle>
<portlet-info>
<title>Spaces List</title>
<short-title>Spaces</short-title>
@@ -2314,6 +2318,7 @@
<portlet-mode>VIEW</portlet-mode>
</supports>
<supported-locale>en</supported-locale>
+
<resource-bundle>org.apache.jetspeed.portlets.spaces.resources.SpacesResources</resource-bundle>
<portlet-info>
<title>Breadcrumb Menu</title>
<short-title>Breadcrumb</short-title>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/breadcrumbs.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/breadcrumbs.jsp?rev=906565&r1=906564&r2=906565&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/breadcrumbs.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/breadcrumbs.jsp
Thu Feb 4 16:59:17 2010
@@ -19,8 +19,11 @@
<%...@page import="org.apache.jetspeed.page.document.Node"%>
<%...@page
import="org.apache.jetspeed.portlets.spaces.BreadcrumbMenu.BreadcrumbMenuItem"
%>
<%@ page contentType="text/html" %>
+<%...@taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/portlet"; prefix="portlet"%>
<portlet:defineObjects/>
+<fmt:setBundle
basename="org.apache.jetspeed.portlets.spaces.resources.SpacesResources" />
<%
List<BreadcrumbMenuItem> menus =
(List<BreadcrumbMenuItem>)renderRequest.getAttribute("breadcrumbs");
int count = 0;
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp?rev=906565&r1=906564&r2=906565&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
Thu Feb 4 16:59:17 2010
@@ -100,6 +100,7 @@
%>
<portlet:defineObjects/>
+<fmt:setBundle
basename="org.apache.jetspeed.portlets.spaces.resources.SpacesResources" />
<%
RequestContext rc = (RequestContext)
request.getAttribute(RequestContext.REQUEST_PORTALENV);
@@ -163,7 +164,7 @@
<tr>
<td class="portlet-section-subheader">
<form id='jsPages' method="POST" action='<portlet:actionURL/>'>
- <input type="text" name="addPage" size="15" value="" ><input
type="submit" value="Add Page" />
+ <input type="text" name="addPage" size="15" value="" ><input
type="submit" value="<fmt:message key='spaces.pages.label.add'/>" />
</form>
</td>
</tr>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/space-navigator.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/space-navigator.jsp?rev=906565&r1=906564&r2=906565&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/space-navigator.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/space-navigator.jsp
Thu Feb 4 16:59:17 2010
@@ -22,10 +22,12 @@
<%...@page import="org.apache.jetspeed.om.page.Page"%>
<%...@page import="org.apache.jetspeed.CommonPortletServices"%>
<%@ page contentType="text/html" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/portlet"; prefix="portlet"%>
<portlet:defineObjects/>
+<fmt:setBundle
basename="org.apache.jetspeed.portlets.spaces.resources.SpacesResources" />
<%
SpaceBean current = ((SpaceBean)renderRequest.getAttribute("space"));
%>
@@ -54,7 +56,7 @@
if (renderRequest.isUserInRole("admin"))
{
%>
- <li class="add"><a
href="<portlet:actionURL><portlet:param name='navAction'
value='addSpace'/></portlet:actionURL>" title="Add Space">Add Space</a></li>
+ <li class="add"><a
href="<portlet:actionURL><portlet:param name='navAction'
value='addSpace'/></portlet:actionURL>" title="<fmt:message
key='spaces.label.add'/>"><fmt:message key='spaces.label.add'/></a></li>
</ul>
</li>
<% } %>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/spaces-list.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/spaces-list.jsp?rev=906565&r1=906564&r2=906565&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/spaces-list.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/spaces-list.jsp
Thu Feb 4 16:59:17 2010
@@ -18,6 +18,7 @@
<%...@page contentType="text/html" %>
<%...@page import="java.util.List"%>
<%...@page import="org.apache.jetspeed.portlets.spaces.SpaceBean"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/portlet"; prefix="portlet"%>
<portlet:defineObjects/>
@@ -59,7 +60,7 @@
<th class="portlet-section-header" colspan="6"></th>
</tr>
<tr>
- <td><input name='addspace' type="submit" value="Add Space" /></td>
+ <td><input name='addspace' type='submit' value='<fmt:message
key="spaces.label.add"/>'/></td>
</tr>
</table>
</form>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/spaces-manager.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/spaces-manager.jsp?rev=906565&r1=906564&r2=906565&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/spaces-manager.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/spaces-manager.jsp
Thu Feb 4 16:59:17 2010
@@ -26,6 +26,7 @@
<%@ taglib uri="http://java.sun.com/portlet"; prefix="portlet"%>
<portlet:defineObjects/>
+<fmt:setBundle
basename="org.apache.jetspeed.portlets.spaces.resources.SpacesResources" />
<c_rt:set var="requestContext"
value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
<c:set var="portalContextPath" value="${requestContext.request.contextPath}"/>
<c:if test="${empty portalContextPath}">
@@ -35,7 +36,6 @@
<%
SpaceBean space = ((SpaceBean)renderRequest.getAttribute("space"));
String readonly = (space.isPersisted()) ? "readonly" : "";
- String actionString = (space.isPersisted()) ? "Update Space" : "Add
Space";
String persisted = (space.isPersisted()) ? "true" : "false";
%>
@@ -46,25 +46,25 @@
<td>
<table>
<tr>
- <td class="portlet-section-subheader">Name:</td>
+ <td class="portlet-section-subheader"><fmt:message
key="spaces.label.name"/></td>
<td class="portlet-section-subheader"><input type="text" <%=readonly%>
name="spaceName" size="30" value="${space.name}" /></td>
</tr>
<% if (space.isPersisted()) { %>
<tr>
- <td class="portlet-section-subheader">Owner:</td>
+ <td class="portlet-section-subheader"><fmt:message
key="spaces.label.owner"/></td>
<td class="portlet-section-subheader"><input type="text" readonly
name="spaceOwner" size="30" value="${space.owner}" /></td>
</tr>
<% } %>
<tr>
- <td class="portlet-section-subheader">Title:</td>
+ <td class="portlet-section-subheader"><fmt:message
key="spaces.label.title"/></td>
<td class="portlet-section-subheader"><input type="text"
name="spaceTitle" size="30" value="${space.title}" /></td>
</tr>
<tr>
- <td class="portlet-section-subheader">Description:</td>
+ <td class="portlet-section-subheader"><fmt:message
key="spaces.label.description"/></td>
<td class="portlet-section-subheader"><input type="text"
name="spaceDescription" size="30" value="${space.description}" /></td>
</tr>
<tr>
- <td class="portlet-section-subheader">Security:</td>
+ <td class="portlet-section-subheader"><fmt:message
key="spaces.label.security"/></td>
<td class="portlet-section-subheader">
<select name="securityConstraintRef">
<c:forEach items="${constraints}" var="constraint">
@@ -74,7 +74,7 @@
</td>
</tr>
<tr>
- <td class="portlet-section-subheader">Theme :</td>
+ <td class="portlet-section-subheader"><fmt:message
key="spaces.label.theme"/></td>
<td class="portlet-section-subheader"></td>
</tr>
<tr>
@@ -93,7 +93,13 @@
</td>
</tr>
<tr>
- <td colspan='2' style="text-align: center"
class="portlet-section-subheader"><input type="submit"
value="<%=actionString%>" /></td>
+ <td colspan='2' style="text-align: center"
class="portlet-section-subheader">
+ <% if (space.isPersisted()) { %>
+ <input type="submit" value="<fmt:message
key='spaces.label.update'/>" />
+ <% } else { %>
+ <input type="submit" value="<fmt:message key='spaces.label.add'/>" />
+ <% } %>
+ </td>
</tr>
<tr>
<th class="portlet-section-header" colspan="2"></th>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
