svn commit: r828936 - in /ofbiz/trunk/framework/common: config/CommonUiLabels.xml webcommon/portal/editPortalPage.ftl webcommon/portal/listPortalPortlets.ftl

Author: jleroux
Date: Fri Oct 23 05:30:38 2009
New Revision: 828936

URL: http://svn.apache.org/viewvc?rev=828936&view=rev
Log:
A patch from Bruno Busco "Locale strings for portal pages" (https://issues.apache.org/jira/browse/OFBIZ-3068) - OFBIZ-3068

Modified:
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
    ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=828936&r1=828935&r2=828936&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Fri Oct 23 05:30:38 2009
@@ -829,6 +829,10 @@
         <value xml:lang="zh">可用</value>
         <value xml:lang="zh_CN">可用的</value>
     </property>
+    <property key="CommonAvailablePortlets">
+        <value xml:lang="en">Available Portlets</value>
+        <value xml:lang="it">Portlet disponibili</value>
+    </property>
     <property key="CommonAverage">
         <value xml:lang="ar">متوسط</value>
         <value xml:lang="de">Durchschnitt</value>
@@ -1002,7 +1006,7 @@
         <value xml:lang="es">Cancelar</value>
         <value xml:lang="fr">Annuler</value>
         <value xml:lang="hi_IN">रद्द करें</value>
-        <value xml:lang="it">Cancella</value>
+        <value xml:lang="it">Annulla</value>
         <value xml:lang="nl">Annuleer</value>
         <value xml:lang="pt">Cancelar</value>
         <value xml:lang="ro">Sterge</value>
@@ -2053,6 +2057,7 @@
         <value xml:lang="es">Terminar</value>
         <value xml:lang="fr">Terminer</value>
         <value xml:lang="hi_IN">हो गया</value>
+        <value xml:lang="it">Fatto</value>
         <value xml:lang="nl">Klaar</value>
         <value xml:lang="pt">Feito</value>
         <value xml:lang="ro">Executa</value>
@@ -4564,6 +4569,14 @@
         <value xml:lang="zh">没有上一级</value>
         <value xml:lang="zh_CN">没有父结点</value>
     </property>
+    <property key="CommonNoPortalPageDataFound">
+        <value xml:lang="en">No portal page data found. You may not have the necessary seed or other data for it.</value>
+        <value xml:lang="it">Dati portal page non trovati.</value>
+    </property>
+    <property key="CommonNoPortletsInCategory">
+        <value xml:lang="en">Please, choose new category again, No portlet in this category.</value>
+        <value xml:lang="it">Nessun portlet in questa categoria.</value>
+    </property>
     <property key="CommonNoPostalAddress">
         <value xml:lang="ar">لا عنوان بريدي</value>
         <value xml:lang="de">Keine Postadresse erfasst</value>
@@ -5301,7 +5314,7 @@
         <value xml:lang="en">Portal pages for application</value>
         <value xml:lang="fr">Pages portail pour application</value>
         <value xml:lang="hi_IN">आवेदन के लिए पोर्टल पृष्ठ</value>
-        <value xml:lang="it">Pagine porale per applicazione</value>
+        <value xml:lang="it">Pagine portale per applicazione</value>
         <value xml:lang="zh">应用程序门户页面</value>
     </property>
     <property key="CommonPostedBy">

Modified: ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl?rev=828936&r1=828935&r2=828936&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl Fri Oct 23 05:30:38 2009
@@ -126,5 +126,5 @@
 </table>
 
 <#else/>
-<h2>No portal page data found. You may not have the necessary seed or other data for it.</h2>
+<h2>${uiLabelMap.CommonNoPortalPageDataFound}</h2>
 </#if>
\ No newline at end of file

Modified: ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl?rev=828936&r1=828935&r2=828936&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl Fri Oct 23 05:30:38 2009
@@ -17,19 +17,15 @@
 under the License.
 -->
 
-<style type="text/css">
-.screenlet {
-margin: 1em;
-}
-</style>
 <div class="screenlet">
   <div class="screenlet-title-bar">
     <ul>
-      <li class="h3">Available portlets</li>
+      <li class="h3">${uiLabelMap.CommonAvailablePortlets}</li>
       <li><a href="<@ofbizUrl>ManagePortalPages?portalPageId=${parameters.portalPageId}&parentPortalPageId=${parameters.parentPortalPageId}</@ofbizUrl>">${uiLabelMap.CommonCancel}</a></li>
     </ul>
     <br class="clear"/>
   </div>
+  <div class="screenlet-body">
   <#if portalPortlets?has_content>
     <#assign orderByList = Static["org.ofbiz.base.util.UtilMisc"].toList("portalPortletId")/>
 
@@ -70,6 +66,7 @@
       </#list>
     </table>
     <#else/>
-    <h2>Please, choose new category again, No portlet in this category.</h2>
+    <h2>${uiLabelMap.CommonNoPortletsInCategory}</h2>
   </#if>
+  </div>
 </div>