Author: thomas.heute(a)jboss.com Date: 2008-05-30 06:26:19 -0400 (Fri, 30 May 2008) New Revision: 10856 Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp Log: - Core-CMS i18n, contribution from Luca Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-05-30 10:05:05 UTC (rev 10855) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-05-30 10:26:19 UTC (rev 10856) @@ -96,4 +96,26 @@ CMS_PATH=Location CMS_EMPTY_FOLDER=This folder is empty. - \ No newline at end of file + +CMS_ERROR_UPLOADARCHIVE_ASYNC=An error occurred while processing your archive. Please try again with 'Asynchronous Processing' activated +CMS_MSG_UPLOADARCHIVE_ASYNC=Your archive has been accepted for processing. The resources will appear in your Folder once the processing is finished + +CMS_REQUIRED=Required +CMS_LINK_TO_RESOURCES=Links to resources within this portal should be absolute. For example: A link to an image located in default/images/back.gif should be typed in exactly as shown here. Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking on the preview button in the editor +CMS_ERROR_PROCESSING=ERROR processing export request +CMS_YOUR_EXPORT_0=Your export of +CMS_YOUR_EXPORT_1=is ready for download +CMS_CLICK_TO_DOWNLOAD=Click to Download +CMS_ROOT_FOLDER=Root Folder +CMS_MESSAGES=Messages +CMS_HOME=Home +CMS_ERROR=Error +CMS_PENDING_APPROVAL_QUEUE=Pending Approval Queue +CMS_CONFIGURE_RESTRICTION=Configure security restrictions on node +CMS_SELECT_ACTION=Select Action +CMS_BROWSING=Browsing +CMS_CONTENT_NOT_FOUND=Content could not be found for the selected file +CMS_INTRODUCTION=Introduction +CMS_HELP=The CMS Portlet displays content from the file store inside a portlet window, or, in the case of binary content, outside of the portlet window altogether +CMS_TO_MODIFY=To modify how this portlet behaves, please +CMS_CLICK_HERE=click here Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2008-05-30 10:05:05 UTC (rev 10855) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2008-05-30 10:26:19 UTC (rev 10856) @@ -96,4 +96,23 @@ CMS_PATH=Localit\u00e0 CMS_EMPTY_FOLDER=Questa cartella \u00e8 vuota . - \ No newline at end of file + +CMS_REQUIRED=Obbligatorio +CMS_LINK_TO_RESOURCES=I link alle risorse all\'interno del portale devono essere assoluti. Per esempio: Un link a un\'immagine che si trova in in default/images/back.gif deve essere digitato esattamente come mostrato. Non iniziare mai il percorso con uno (/). Puoi verificare la correttezza del link cliccando sul bottone di anteprima dell1'editor +CMS_ERROR_PROCESSING=ERRORE nel processare l\'esportazione +CMS_YOUR_EXPORT_0=L\'esportazione di +CMS_YOUR_EXPORT_1=\u00e8 pronta per il Download +CMS_CLICK_TO_DOWNLOAD=Clicca per il Download +CMS_ROOT_FOLDER=Cartella principale +CMS_MESSAGES=Messaggi +CMS_HOME=Home +CMS_ERROR=Errore +CMS_PENDING_APPROVAL_QUEUE=Coda in attesa di approvazione +CMS_CONFIGURE_RESTRICTION=Configura le restrizioni di sicurezza sul nodo +CMS_SELECT_ACTION=Seleziona l\'azione +CMS_BROWSING=Navigazione +CMS_CONTENT_NOT_FOUND=Non ci sono contenuti per il file selezionato +CMS_INTRODUCTION=Introduzione +CMS_HELP=La Portlet CMS visualizza e salva i contenuti di un file da dentro la finestra di una Portlet, o, nel caso di un contenuto binario, fuori della finestra +CMS_TO_MODIFY=Per modificare il comportamento di questa Portlet, +CMS_CLICK_HERE=clicca qui \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2008-05-30 10:05:05 UTC (rev 10855) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2008-05-30 10:26:19 UTC (rev 10856) @@ -27,7 +27,7 @@ <table> <tr> <td valign="bottom"> - Destination: + ${n:i18n("CMS_DESTINATION")}: </td> <td> <input DISABLED type="text" size="40" name="showdestination" value="<%= sCurrPath %>" Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-05-30 10:05:05 UTC (rev 10855) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-05-30 10:26:19 UTC (rev 10856) @@ -119,7 +119,7 @@ <input type="text" name="filename" class="portlet-form-input-field"/> - : Required + : ${n:i18n("CMS_REQUIRED")} </td> </tr> <tr> @@ -195,11 +195,7 @@ <tr> <td class="portlet-section-alternate"> <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/info.gif" border="0" - alt="Info"> Links to resources within this portal should be absolute. For example: A link to an image - located in default/images/back.gif - should be typed in exactly as shown here. - Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking on the - preview button in the editor. + alt="Info"> ${n:i18n("CMS_LINK_TO_RESOURCES")}. </td> </tr> <tr> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2008-05-30 10:05:05 UTC (rev 10855) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2008-05-30 10:26:19 UTC (rev 10856) @@ -147,14 +147,7 @@ <td class="portlet-section-alternate"> <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/info.gif" border="0" - alt="Info"> Links to resources within this portal should be absolute. For example: A link to an - image - located in default/images/back.gif - should be typed in exactly as shown here. - Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking - on - the - preview button in the editor. + alt="Info"> ${n:i18n("CMS_LINK_TO_RESOURCES")}. </td> </tr> <tr> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2008-05-30 10:05:05 UTC (rev 10855) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2008-05-30 10:26:19 UTC (rev 10856) @@ -20,8 +20,8 @@ <table width="100%"> <tr> <td align="center"> - Your export of <b><%= sCurrPath %> - </b> is ready for download. + ${n:i18n("CMS_YOUR_EXPORT_0")} <b><%= sCurrPath %> + </b> ${n:i18n("CMS_YOUR_EXPORT_1")}. </td> </tr> <tr> @@ -32,7 +32,7 @@ <a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank"><img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/export_pickup.gif" alt="${n:i18n("CMS_DELETE")}" border="0"></a><br/> - <a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank">Click to Download</a> + <a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank">${n:i18n("CMS_CLICK_TO_DOWNLOAD")}</a> <br/> <input class="portlet-form-button" type="button" value="${n:i18n("CMS_BACKTOBROWSER")}" name="cancel" Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2008-05-30 10:05:05 UTC (rev 10855) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2008-05-30 10:26:19 UTC (rev 10856) @@ -19,7 +19,7 @@ <td align="left"> <table width="100%"> <tr> - <td align="center"><font color="red">ERROR processing export request!</font></td> + <td align="center"><font color="red">${n:i18n("CMS_ERROR_PROCESSING")}!</font></td> </tr> <tr> <td align="center"><input class="portlet-form-button" type="button" Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp 2008-05-30 10:05:05 UTC (rev 10855) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp 2008-05-30 10:26:19 UTC (rev 10856) @@ -40,7 +40,7 @@ <img src="<%= request.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH %>/plus.gif" border="0" alt="Expand"/></a> &nbsp; -<a href="javascript:fillform('/')">Root Folder</a><br> +<a href="javascript:fillform('/')">${n:i18n("CMS_ROOT_FOLDER")}</a><br> <% String sNavPath = (String)request.getAttribute("navpath"); Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-05-30 10:05:05 UTC (rev 10855) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-05-30 10:26:19 UTC (rev 10856) @@ -21,6 +21,7 @@ String createDate = ""; String modifiedDate = ""; Boolean manageWorkflowAccessible = (Boolean)request.getAttribute("manageWorkflowAccessible"); + List messages = (List)request.getAttribute("messages"); %> <div class="admin-ui"> @@ -31,12 +32,29 @@ <div class="cms-tab-container"> +<!-- Displaying any messages that may have occurred during this request --> +<%if(messages != null && !messages.isEmpty()){%> +<table width="100%"> + <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_MESSAGES")}:</h3></th> + <%for(int i=0; i<messages.size(); i++){%> + <tr colspan="2" align="center"> + <td colspan="2"> + <font color="red"> + <%=(String)messages.get(i)%> + </font> + </td> + </tr> + <%}%> +</table> +<br/><br/> +<%}%> + <!-- Currently browsing --> <ul class="objectpath"> <li class="pathItem"><a href="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/> <portlet:param name="path" value="/"/> - </portlet:renderURL>">Home</a></li> + </portlet:renderURL>">${n:i18n("CMS_HOME")}</a></li> <% @@ -319,4 +337,4 @@ %> </div> </div> -</div> \ No newline at end of file +</div> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2008-05-30 10:05:05 UTC (rev 10855) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2008-05-30 10:26:19 UTC (rev 10856) @@ -30,7 +30,7 @@ <li class="pathItem"><a href="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/> <portlet:param name="path" value="/"/> - </portlet:renderURL>">Home</a></li> + </portlet:renderURL>">${n:i18n("CMS_HOME")}</a></li> <% @@ -72,7 +72,7 @@ { %> <table width="100%"> - <th colspan="2"><h3 class="sectionTitle-blue">Error:</h3></th> + <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_ERROR")}:</h3></th> <tr colspan="2" align="center"> <td colspan="2"> <font color="red"> @@ -87,7 +87,7 @@ <%}%> <!-- the table listing the pending queue items --> -<div align="center"><font class="portlet-font-dim"><b>Pending Approval Queue</b></font></div> +<div align="center"><font class="portlet-font-dim"><b>${n:i18n("CMS_PENDING_APPROVAL_QUEUE")}</b></font></div> <br/> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2008-05-30 10:05:05 UTC (rev 10855) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2008-05-30 10:26:19 UTC (rev 10856) @@ -24,7 +24,7 @@ <li class="pathItem"><a href="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/> <portlet:param name="path" value="/"/> - </portlet:renderURL>">Home</a></li> + </portlet:renderURL>">${n:i18n("CMS_HOME")}</a></li> </ul> <br/> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2008-05-30 10:05:05 UTC (rev 10855) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2008-05-30 10:26:19 UTC (rev 10856) @@ -50,7 +50,7 @@ %> <tr> <td colspan="2"> - <font class="portlet-font">Configure security restrictions on node: <%= sCurrPath %> + <font class="portlet-font">${n:i18n("CMS_CONFIGURE_RESTRICTION")}: <%= sCurrPath %> </font> </td> </tr> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-05-30 10:05:05 UTC (rev 10855) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-05-30 10:26:19 UTC (rev 10856) @@ -57,7 +57,7 @@ <li class="pathItem"><a href="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/> <portlet:param name="path" value="/"/> - </portlet:renderURL>">Home</a></li> + </portlet:renderURL>">${n:i18n("CMS_HOME")}</a></li> <% @@ -109,7 +109,7 @@ <div class="menu"> <select onchange="window.open(this.options[this.selectedIndex].value,'_top')"> - <option value="">Select Action...</option> + <option value="">${n:i18n("CMS_SELECT_ACTION")}...</option> <% if (sType.equals("text/html") || sType.equals("text/plain")) { @@ -349,7 +349,7 @@ { %> <table width="100%"> - <th colspan="2"><h3 class="sectionTitle-blue">Error:</h3></th> + <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_ERROR")}:</h3></th> <tr colspan="2" align="center"> <td colspan="2"> <font color="red"> @@ -363,7 +363,7 @@ onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'"> <%}%> -<div align="center"><font class="portlet-font-dim"><b>Pending Approval Queue</b></font></div> +<div align="center"><font class="portlet-font-dim"><b>${n:i18n("CMS_PENDING_APPROVAL_QUEUE")}</b></font></div> <br/> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2008-05-30 10:05:05 UTC (rev 10855) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2008-05-30 10:26:19 UTC (rev 10856) @@ -25,7 +25,7 @@ %> <!-- Currently browsing --> -Browsing: <a href="<%= url %>">Home</a> +${n:i18n("CMS_BROWSING")}: <a href="<%= url %>">${n:i18n("CMS_HOME")}</a> <% StringTokenizer parser = new StringTokenizer(sCurrPath, "/"); String sPathBuilder = ""; @@ -138,7 +138,7 @@ </p> <%}else{%> <p class="portlet-font"> - Content could not be found for the selected file + ${n:i18n("CMS_CONTENT_NOT_FOUND")} </p> <%}%> <% Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp 2008-05-30 10:05:05 UTC (rev 10855) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp 2008-05-30 10:26:19 UTC (rev 10856) @@ -7,11 +7,9 @@ <h2>CMS Portlet - Help</h2> -<h2>Introduction</h2> +<h2>${n:i18n("CMS_INTRODUCTION")}</h2> -<p class="portlet-font">The CMS Portlet displays content from the file store inside a portlet window, or, in the case of - binary content, outside of the portlet - window altogether.</p> +<p class="portlet-font">${n:i18n("CMS_HELP")}.</p> -<p class="portlet-font">To modify how this portlet behaves, please - <a href="<portlet:renderURL portletMode="edit"></portlet:renderURL>">click here.</a></p> +<p class="portlet-font">${n:i18n("CMS_TO_MODIFY")} + <a href="<portlet:renderURL portletMode="edit"></portlet:renderURL>">${n:i18n("CMS_CLICK_HERE")}.</a></p>