[portal-commits] JBoss Portal SVN: r10829 - in branches/JBoss_Portal_Branch_2_6/core/src: bin/portal-core-war/layouts/3columns and 11 other directories.

Wednesday, 28 May 2008


Author: sviluppatorefico
Date: 2008-05-28 17:32:25 -0400 (Wed, 28 May 2008)
New Revision: 10829

Modified:
  
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp
  
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp
  
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp
  
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp
   branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/login/error.jsp
   branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/nodesk/index.jsp
   branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/phalanx/index.jsp
  
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource.properties
  
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties
  
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
  
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties
  
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
  
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
  
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp
  
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp
  
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp
   branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp
Log:
added internationalization updates

Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp	2008-05-27
23:13:55 UTC (rev 10828)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp	2008-05-28
21:32:25 UTC (rev 10829)
@@ -1,5 +1,7 @@
 <%@ page import="org.jboss.portal.server.PortalConstants" %>
+<%@page import="java.util.ResourceBundle"%>
 <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p"
%>
+<% ResourceBundle rb = ResourceBundle.getBundle("Resource",
request.getLocale()); %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -51,7 +53,7 @@
 </div>
 
 <!-- TODO: Fix the auto jump in this tag -->
-<div id="footer-container" class="portal-copyright">Powered by
+<div id="footer-container" class="portal-copyright"><%=
rb.getString("POWERED_BY") %>
 <a class="portal-copyright"
href="http://www.jboss.com/products/jbossportal">JBoss
Portal</a><br/>
 </div>
 

Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp	2008-05-27
23:13:55 UTC (rev 10828)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp	2008-05-28
21:32:25 UTC (rev 10829)
@@ -1,5 +1,7 @@
 <%@ page import="org.jboss.portal.server.PortalConstants" %>
+<%@page import="java.util.ResourceBundle"%>
 <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p"
%>
+<% ResourceBundle rb = ResourceBundle.getBundle("Resource",
request.getLocale()); %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -58,7 +60,7 @@
 </div>
 
 <!-- TODO: Fix the auto jump in this tag -->
-<div id="footer-container" class="portal-copyright">Powered by
+<div id="footer-container" class="portal-copyright"><%=
rb.getString("POWERED_BY") %>
 <a class="portal-copyright"
href="http://www.jboss.com/products/jbossportal">JBoss
Portal</a><br/>
 </div>
 

Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp	2008-05-27
23:13:55 UTC (rev 10828)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp	2008-05-28
21:32:25 UTC (rev 10829)
@@ -1,5 +1,7 @@
 <%@ page import="org.jboss.portal.server.PortalConstants" %>
+<%@page import="java.util.ResourceBundle"%>
 <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p"
%>
+<% ResourceBundle rb = ResourceBundle.getBundle("Resource",
request.getLocale()); %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -46,7 +48,7 @@
    </div>
 </div>
 
-<div id="footer-container" class="portal-copyright">Powered by
+<div id="footer-container" class="portal-copyright"><%=
rb.getString("POWERED_BY") %>
 <a class="portal-copyright"
href="http://www.jboss.com/products/jbossportal">JBoss
Portal</a><br/>
 </div>
 

Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp	2008-05-27
23:13:55 UTC (rev 10828)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp	2008-05-28
21:32:25 UTC (rev 10829)
@@ -1,5 +1,7 @@
 <%@ page import="org.jboss.portal.server.PortalConstants" %>
+<%@page import="java.util.ResourceBundle"%>
 <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p"
%>
+<% ResourceBundle rb = ResourceBundle.getBundle("Resource",
request.getLocale()); %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -38,7 +40,7 @@
                 <p:region regionName='maximized'
regionID='regionMaximized'/>
                 <hr class="cleaner"/>
 
-                <div id="footer-container"
class="portal-copyright">Powered by
+                <div id="footer-container"
class="portal-copyright"><%= rb.getString("POWERED_BY") %>
                     <a class="portal-copyright"
href="http://www.jboss.com/products/jbossportal">JBoss
Portal</a><br>
                     <span id="ThemeBy"></span>
                 </div>

Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/login/error.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/login/error.jsp	2008-05-27
23:13:55 UTC (rev 10828)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/login/error.jsp	2008-05-28
21:32:25 UTC (rev 10829)
@@ -1,6 +1,7 @@
+<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
 <html>
 <head></head>
 <body>
-bad login
+${n:i18n("BAD_LOGIN")}
 </body>
 </html>

Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/nodesk/index.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/nodesk/index.jsp	2008-05-27
23:13:55 UTC (rev 10828)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/nodesk/index.jsp	2008-05-28
21:32:25 UTC (rev 10829)
@@ -21,6 +21,7 @@
 %>
 
 <%@ taglib uri="/WEB-INF/theme-basic-lib.tld" prefix="basic"
%>
+<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
 <%@ page
     import="java.util.Iterator,
             java.io.Writer,
@@ -261,8 +262,8 @@
  <% } %>
 
  <tr>
-  <td class="portal-copyright" height="10" colspan="<%=
nbCol %>" align="center" valign="top">Powered by <a
class="portal-copyright"
href="http://www.jboss.com/products/jbossportal">JBoss
Portal</a><br>
-  Theme by <a class="portal-copyright"
href="http://www.nodesk.org">Nodesk</a>
+  <td class="portal-copyright" height="10" colspan="<%=
nbCol %>" align="center"
valign="top">${n:i18n("POWERED_BY")} <a
class="portal-copyright"
href="http://www.jboss.com/products/jbossportal">JBoss
Portal</a><br>
+  ${n:i18n("THEME_BY")} <a class="portal-copyright"
href="http://www.nodesk.org">Nodesk</a>
   </td>
  </tr>
 </table>

Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/phalanx/index.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/phalanx/index.jsp	2008-05-27
23:13:55 UTC (rev 10828)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/phalanx/index.jsp	2008-05-28
21:32:25 UTC (rev 10829)
@@ -1,4 +1,5 @@
 <%@ taglib uri="/WEB-INF/theme-basic-lib.tld" prefix="basic"
%>
+<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
 <%@ page
       import="org.jboss.portal.server.PortalConstants" %>
 <%@ page import="java.util.ResourceBundle"%>
@@ -125,7 +126,7 @@
       <tr>
          <td align="left"><div class="portlet-font-dim"
style="font-size:10px">
             Copyright 2005, JBoss Inc.<br>
-            Powered by <a href="http://www.jboss.com/products/jbossportal"
target="_blank">JBoss Portal</a>
+            ${n:i18n("POWERED_BY")} <a
href="http://www.jboss.com/products/jbossportal"
target="_blank">JBoss Portal</a>
             </div></td>
       </tr>
    </table>

Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource.properties	2008-05-27
23:13:55 UTC (rev 10828)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource.properties	2008-05-28
21:32:25 UTC (rev 10829)
@@ -25,4 +25,10 @@
 PAGENAME_default=Home
 PAGENAME_Admin=Admin
 PAGENAME_Test=Test
-PAGENAME_News=News 
\ No newline at end of file
+PAGENAME_News=News 
+
+LOGIN_TITLE=JBoss Portal Login
+LOGIN_USERNAME=Username
+LOGIN_PASSWORD=Password
+LOGIN_CANCEL=Cancel
+LOGIN_SUBMIT=Submit
\ No newline at end of file

Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties	2008-05-27
23:13:55 UTC (rev 10828)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties	2008-05-28
21:32:25 UTC (rev 10829)
@@ -25,4 +25,10 @@
 PAGENAME_default=Home
 PAGENAME_Admin=Amministrazione
 PAGENAME_Test=Test
-PAGENAME_News=Novit\u00e0 
\ No newline at end of file
+PAGENAME_News=Novit\u00e0 
+
+LOGIN_TITLE=JBoss Portal Login
+LOGIN_USERNAME=Nome utente
+LOGIN_PASSWORD=Password
+LOGIN_CANCEL=Annulla
+LOGIN_SUBMIT=Invia
\ No newline at end of file

Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties	2008-05-27
23:13:55 UTC (rev 10828)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties	2008-05-28
21:32:25 UTC (rev 10829)
@@ -321,4 +321,17 @@
 PERMISSION_DOMAIN_MOD=Modify Domain
 PERMISSION_DEFINEDROLES=Defined roles
 PERMISSION_IMPLIEDROLES=Implied roles
- 
\ No newline at end of file
+ 
+POWERED_BY=Powered by
+BAD_LOGIN=bad login
+THEME_BY=Theme by
+PORTLET_INSTANCE_ASSOCIATED=Portlet instance associated to this window
+PORTLET_NAME=Portlet name
+PORTLET_DESCRIPTION=Portlet description
+DASHBOARD=Dashboard
+CONFIGURE_DASHBOARD=Configure dashboard
+COPY_TO_DASHBOARD=Copy to my dashboard
+PORTAL=Portal
+ADMIN=Admin
+MEMBERS=Members
+LOGGED=Logged in as
\ No newline at end of file

Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties	2008-05-27
23:13:55 UTC (rev 10828)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties	2008-05-28
21:32:25 UTC (rev 10829)
@@ -130,7 +130,7 @@
 Delete=Cancella
 Edit=Modifica
 Ok=Ok
-Cancel=Cancella
+Cancel=Annulla
 AreYouSureToDeleteUser=Sei sicuro di voler cancellare l' utente?
 UserDeleted=Utente cancellato con successo
 ReturnToMemberList=Ritorna alla lista dei membri
@@ -245,7 +245,7 @@
 REGISTER_ADMIN_SEARCH=Visualizza/edita gli utenti
 
 
-MENU_LOGOUT=Logout
+MENU_LOGOUT=Uscita
 MENU_EDITPROFILE=Modifica il tuo profilo
 MENU_LISTUSERS=Lista di tutti gli utenti
 
@@ -321,4 +321,17 @@
 PERMISSION_DOMAIN_MOD=Modifica Dominio
 PERMISSION_DEFINEDROLES=Ruoli definiti
 PERMISSION_IMPLIEDROLES=Ruoli impliciti
- 
\ No newline at end of file
+ 
+POWERED_BY=Sviluppato da
+BAD_LOGIN=login sbagliato
+THEME_BY=Tema di
+PORTLET_INSTANCE_ASSOCIATED=Istanza di Portlet associata a questa finestra
+PORTLET_NAME=Nome della Portlet
+PORTLET_DESCRIPTION=Descrizione della Portlet
+DASHBOARD=Dashboard
+CONFIGURE_DASHBOARD=Configura la dashboard
+COPY_TO_DASHBOARD=Copia nella mia dashboard
+PORTAL=Portale
+ADMIN=Amministrazione
+MEMBERS=Membri
+LOGGED=Benvenuto
\ No newline at end of file

Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp	2008-05-27
23:13:55 UTC (rev 10828)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp	2008-05-28
21:32:25 UTC (rev 10829)
@@ -18,6 +18,7 @@
 <%@page import="org.jboss.portal.portlet.info.PortletInfo" %>
 <%@ page import="java.util.Collection" %>
 <%@ page import="java.util.Locale" %>
+<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
 <portlet:defineObjects/>
 <script type='text/javascript'
src='/portal-admin/js/domLib.js'></script>
 <script type="text/javascript"
src="/portal-admin/js/fadomatic.js"></script>
@@ -33,7 +34,7 @@
 
 <table style="width:500px;">
 <tr>
-  <td><h3 class="sectionTitle tenpx-top-bottom">Portlet instance
associated to this window:</h3></td>
+  <td><h3 class="sectionTitle
tenpx-top-bottom">${n:i18n("PORTLET_INSTANCE_ASSOCIATED")}:</h3></td>
 </tr>
 <%
   Locale locale = renderRequest.getLocale();
@@ -69,10 +70,10 @@
     <span><%= displayName %></span>
 
     <div>
-      <span class="portlet-form-field-label">Portlet
name:</span><%= displayName %>
+      <span
class="portlet-form-field-label">${n:i18n("PORTLET_NAME")}:</span><%=
displayName %>
     </div>
     <div>
-      <span class="portlet-form-field-label">Portlet
description:</span>
+      <span
class="portlet-form-field-label">${n:i18n("PORTLET_DESCRIPTION")}:</span>
       <%= getLocalizedValue(metaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale)
%>
     </div>
 
@@ -118,9 +119,9 @@
               </div>
             </div>
             <div class="content">
-              <div><span class="portlet-form-field-label">Portlet
name:</span><%= displayName %>
+              <div><span
class="portlet-form-field-label">${n:i18n("PORTLET_NAME")}:</span><%=
displayName %>
               </div>
-              <div><span class="portlet-form-field-label">Portlet
description:</span>
+              <div><span
class="portlet-form-field-label">${n:i18n("PORTLET_DESCRIPTION")}:</span>
                 <%=
getLocalizedValue(portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %>
               </div>
             </div>

Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp	2008-05-27
23:13:55 UTC (rev 10828)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp	2008-05-28
21:32:25 UTC (rev 10829)
@@ -1,7 +1,9 @@
 <%@ page import="org.jboss.portal.api.PortalURL" %>
 <%@ page import="org.jboss.portal.identity.User" %>
+<%@page import="java.util.ResourceBundle"%>
 
 <%
+   ResourceBundle rb = ResourceBundle.getBundle("Resource",
request.getLocale());
    User user = (User)request.getAttribute("org.jboss.portal.header.USER");
    PortalURL dashboardURL =
(PortalURL)request.getAttribute("org.jboss.portal.header.DASHBOARD_URL");
    PortalURL loginURL =
(PortalURL)request.getAttribute("org.jboss.portal.header.LOGIN_URL");
@@ -32,10 +34,10 @@
 </script>
 
 <noscript>
-      <a href="<%= loginURL %>">Login</a>
+      <a href="<%= loginURL %>"><%=
rb.getString("LOGIN") %></a>
 </noscript>
 <%}else{%>
-<a href="<%= loginURL %>">Login</a>
+<a href="<%= loginURL %>"><%= rb.getString("LOGIN")
%></a>
 <%}%>
 
 
@@ -50,34 +52,34 @@
    document.getElementById('loginIframe').src = '';
    /* ]]> */
 </script>
-Logged in as: <%= user.getUserName() %><br/><br/>
+<%= rb.getString("LOGGED") %>: <%= user.getUserName()
%><br/><br/>
 
 <%
    if (dashboardURL != null)
    {
-%>&nbsp;&nbsp;<a href="<%= dashboardURL
%>">Dashboard</a>&nbsp;&nbsp;|<%
+%>&nbsp;&nbsp;<a href="<%= dashboardURL %>"><%=
rb.getString("DASHBOARD") %></a>&nbsp;&nbsp;|<%
    }
 
    if (defaultPortalURL != null)
    {
-%>&nbsp;&nbsp;<a href="<%= defaultPortalURL
%>">Portal</a>&nbsp;&nbsp;|<%
+%>&nbsp;&nbsp;<a href="<%= defaultPortalURL %>"><%=
rb.getString("PORTAL") %></a>&nbsp;&nbsp;|<%
    }
 
    if (adminPortalURL != null)
    {
-%>&nbsp;&nbsp;<a href="<%= adminPortalURL
%>">Admin</a>&nbsp;&nbsp;|<%
+%>&nbsp;&nbsp;<a href="<%= adminPortalURL %>"><%=
rb.getString("ADMIN") %></a>&nbsp;&nbsp;|<%
    }
 
    if (editDashboardURL != null)
    {
-%>&nbsp;&nbsp;<a href="<%= editDashboardURL
%>">Configure dashboard</a>&nbsp;&nbsp;|<%
+%>&nbsp;&nbsp;<a href="<%= editDashboardURL %>"><%=
rb.getString("CONFIGURE_DASHBOARD") %></a>&nbsp;&nbsp;|<%
    }
 
    if (copyToDashboardURL != null)
    {
-%>&nbsp;&nbsp;<a href="<%= copyToDashboardURL %>">Copy
to my dashboard</a>&nbsp;&nbsp;|<%
+%>&nbsp;&nbsp;<a href="<%= copyToDashboardURL %>"><%=
rb.getString("COPY_TO_DASHBOARD") %></a>&nbsp;&nbsp;|<%
    }
-%>&nbsp;&nbsp;<a href="<%= signOutURL
%>">Logout</a>
+%>&nbsp;&nbsp;<a href="<%= signOutURL %>"><%=
rb.getString("MENU_LOGOUT") %></a>
 <%
    }
 %>

Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp	2008-05-27
23:13:55 UTC (rev 10828)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp	2008-05-28
21:32:25 UTC (rev 10829)
@@ -24,12 +24,12 @@
             <portlet:param name="roleid"
value="${n:out('role.id')}"/>
             <portlet:param name="usersperpage" value="10"/>
             <portlet:param name="usernamefilter" value=""/>
-            </portlet:actionURL>">Members</a></td>
+           
</portlet:actionURL>">${n:i18n("MEMBERS")}</a></td>
             <td nowrap class="portlet-table-text"><a
href="<portlet:actionURL>
             <portlet:param name="op" value="removeRole"/>
             <portlet:param name="roleid"
value="${n:out('role.id')}"/>
             </portlet:actionURL>"
-                                                     onClick="javascript:return
confirm('${n:i18n("ROLE_CONFIRM_DELETE")}')">Delete</a>
+                                                     onClick="javascript:return
confirm('${n:i18n("ROLE_CONFIRM_DELETE")}')">${n:i18n("Delete")}</a>
             </td>
          </tr>
       </n:iterate>

Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp	2008-05-27
23:13:55 UTC (rev 10828)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp	2008-05-28
21:32:25 UTC (rev 10829)
@@ -27,8 +27,7 @@
             <n:error key="realemail_error"/>
          </td>
 
-         <td><input type="checkbox" name="viewrealemail"
value="true" checked="checked"
class="portlet-form-label"/>Allow
-            other users to view my real e-mail address
+         <td><input type="checkbox" name="viewrealemail"
value="true" checked="checked"
class="portlet-form-label"/>${n:i18n("AllowEmailView")}
          </td>
       </tr>
       <tr>

Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp	2008-05-27
23:13:55 UTC (rev 10828)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp	2008-05-28
21:32:25 UTC (rev 10829)
@@ -34,8 +34,7 @@
             <n:error key="realemail_error"/>
          </td>
 
-         <td><input type="checkbox" name="viewrealemail"
value="true" checked="checked"
class="portlet-form-label"/>Allow
-            other users to view my real e-mail address
+         <td><input type="checkbox" name="viewrealemail"
value="true" checked="checked"
class="portlet-form-label"/>${n:i18n("AllowEmailView")}
          </td>
       </tr>
       <tr>

Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp	2008-05-27
23:13:55 UTC (rev 10828)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp	2008-05-28
21:32:25 UTC (rev 10829)
@@ -21,6 +21,11 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                 ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
 <%@ page pageEncoding="utf-8" %>
+<%@page import="java.util.ResourceBundle"%>
+
+<%
+      ResourceBundle rb = ResourceBundle.getBundle("conf.bundles.Resource",
request.getLocale());
+%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -54,7 +59,7 @@
 <div class="login-container">
 
    <div class="login-header">
-      <h2>JBoss Portal Login</h2>
+      <h2><%= rb.getString("LOGIN_TITLE") %></h2>
    </div>
    <div class="login-content">
       <div class="error-message"
@@ -64,15 +69,15 @@
       <form method="post" action="<%=
response.encodeURL("j_security_check") %>" name="loginform"
id="loginForm"
             target="_parent">
          <div class="form-field">
-            <label for="j_username">Username:</label>
+            <label for="j_username"><%=
rb.getString("LOGIN_USERNAME") %></label>
                <input type="text" name="j_username"
id="j_username" value=""/>
          </div>
          <div class="form-field bottom-field">
-            <label for="j_password">Password:</label>
+            <label for="j_password"><%=
rb.getString("LOGIN_PASSWORD") %></label>
                <input type="password" name="j_password"
id="j_password" value=""/>
          </div>
-         <input style="<%=(request.getParameter("loginheight") !=
null ? "" : "display:none")%>;" type="button"
name="cancel" value="Cancel" class="cancel-button"
onclick="window.parent.hideContentModal('login-modal');"/>
-         <input style="<%=(request.getParameter("loginheight") !=
null ? "" : "right:10px")%>;" type="submit"
name="login" value="Login" class="login-button"/>
+         <input style="<%=(request.getParameter("loginheight") !=
null ? "" : "display:none")%>;" type="button"
name="cancel" value="<%= rb.getString("LOGIN_CANCEL") 
%>" class="cancel-button"
onclick="window.parent.hideContentModal('login-modal');"/>
+         <input style="<%=(request.getParameter("loginheight") !=
null ? "" : "right:10px")%>;" type="submit"
name="login" value="<%= rb.getString("LOGIN_SUBMIT") 
%>" class="login-button"/>
       </form>
 
    </div>


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[portal-commits] JBoss Portal SVN: r10829 - in branches/JBoss_Portal_Branch_2_6/core/src: bin/portal-core-war/layouts/3columns and 11 other directories.