You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sh...@apache.org on 2004/09/18 00:43:31 UTC
cvs commit: jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/login login.jsp
shinsuke 2004/09/17 15:43:31
Modified: applications/security project.xml
applications/security/src/webapp/WEB-INF portlet.xml
applications/security/src/webapp/WEB-INF/security/login
login.jsp
Added: applications/security/src/java/org/apache/jetspeed/portlets/security/resources
LoginResources.properties
LoginResources_en.properties
LoginResources_ja.properties
Log:
moved English message to the resource bundle
Revision Changes Path
1.8 +10 -2 jakarta-jetspeed-2/applications/security/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/security/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 18 Aug 2004 19:19:29 -0000 1.7
+++ project.xml 17 Sep 2004 22:43:31 -0000 1.8
@@ -33,7 +33,7 @@
</dependency>
<dependency>
<id>taglibs:standard</id>
- <version>1.0.2</version>
+ <version>1.0.4</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -171,6 +171,14 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java/</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
</build>
<reports>
1.1 jakarta-jetspeed-2/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources.properties
Index: LoginResources.properties
===================================================================
# Copyright 2004 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# $Id: LoginResources.properties,v 1.1 2004/09/17 22:43:31 shinsuke Exp $
#
# login.jsp
login.label.Login=Login
login.label.Welcome=Welcome {0}
login.label.Logout=Logout
login.label.InvalidUsernameOrPassword=Invalid username or password ({0})
login.label.Username=Username
login.label.Password=Password
1.1 jakarta-jetspeed-2/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources_en.properties
Index: LoginResources_en.properties
===================================================================
# Copyright 2004 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# $Id: LoginResources_en.properties,v 1.1 2004/09/17 22:43:31 shinsuke Exp $
#
# portlet info
javax.portlet.title=Login Portlet
javax.portlet.short-title=Login Portlet
# login.jsp
login.label.Login=Login
login.label.Welcome=Welcome {0}
login.label.Logout=Logout
login.label.InvalidUsernameOrPassword=Invalid username or password ({0})
login.label.Username=Username
login.label.Password=Password
1.1 jakarta-jetspeed-2/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources_ja.properties
Index: LoginResources_ja.properties
===================================================================
# Copyright 2004 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# $Id: LoginResources_ja.properties,v 1.1 2004/09/17 22:43:31 shinsuke Exp $
#
# portlet info
javax.portlet.title=\u30ED\u30B0\u30A4\u30F3
javax.portlet.short-title=\u30ED\u30B0\u30A4\u30F3\u30DD\u30FC\u30C8\u30EC\u30C3\u30C8
# login.jsp
login.label.Login=\u30ED\u30B0\u30A4\u30F3
login.label.Welcome=\u3088\u3046\u3053\u305D {0}
login.label.Logout=\u30ED\u30B0\u30A2\u30A6\u30C8
login.label.InvalidUsernameOrPassword=\u30E6\u30FC\u30B6\u30FC\u540D\u307E\u305F\u306F\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u5411\u3053\u3046\u3067\u3059 ({0})
login.label.Username=\u30E6\u30FC\u30B6\u30FC\u540D
login.label.Password=\u30D1\u30B9\u30EF\u30FC\u30C9
1.4 +3 -0 jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/portlet.xml
Index: portlet.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/portlet.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- portlet.xml 29 Jul 2004 22:24:19 -0000 1.3
+++ portlet.xml 17 Sep 2004 22:43:31 -0000 1.4
@@ -28,6 +28,9 @@
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
</supports>
+ <supported-locale>en</supported-locale>
+ <supported-locale>ja</supported-locale>
+ <resource-bundle>org.apache.jetspeed.portlets.security.resources.LoginResources</resource-bundle>
<portlet-info>
<title>Login Portlet</title>
<short-title>Login Portlet</short-title>
1.4 +10 -7 jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/login/login.jsp
Index: login.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/login/login.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- login.jsp 21 May 2004 18:38:38 -0000 1.3
+++ login.jsp 17 Sep 2004 22:43:31 -0000 1.4
@@ -14,26 +14,29 @@
limitations under the License.
--%>
<%@page import="org.apache.jetspeed.login.LoginConstants" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<fmt:setBundle basename="org.apache.jetspeed.portlets.security.resources.LoginResources" />
+
<html>
- <title>Login</title>
+ <title><fmt:message key="login.label.Login"/></title>
<body>
<% if ( request.getUserPrincipal() != null )
{ %>
- Welcome <%= request.getUserPrincipal().getName() %> <br>
- <a href='<%= response.encodeURL(request.getContextPath()+"/login/logout") %>'>Logout</a>
+ <fmt:message key="login.label.Welcome"><fmt:param><%= request.getUserPrincipal().getName() %></fmt:param></fmt:message><br>
+ <a href='<%= response.encodeURL(request.getContextPath()+"/login/logout") %>'><fmt:message key="login.label.Logout"/></a>
<% }
else
{
Integer retryCount = (Integer)request.getSession().getAttribute(LoginConstants.RETRYCOUNT);
if ( retryCount != null )
{ %>
- <br><i>Invalid username or password (<%=retryCount%>)</i><br>
+ <br><i><fmt:message key="login.label.InvalidUsernameOrPassword"><fmt:param><%=retryCount%></fmt:param></fmt:message></i><br>
<% } %>
<form method="POST" action='<%= response.encodeURL(request.getContextPath()+"/login/proxy")%>'>
- Username <input type="text" size="15" name="<%=LoginConstants.USERNAME%>">
+ <fmt:message key="login.label.Username"/> <input type="text" size="15" name="<%=LoginConstants.USERNAME%>">
<br>
- Password <input type="password" size="15" name="<%=LoginConstants.PASSWORD%>">
- <input type="submit" value="Login">
+ <fmt:message key="login.label.Password"/> <input type="password" size="15" name="<%=LoginConstants.PASSWORD%>">
+ <input type="submit" value="<fmt:message key="login.label.Login"/>">
</form>
<% } %>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org