svn commit: r688167 - in /ofbiz/trunk: applications/accounting/config/ applications/manufacturing/config/ framework/common/config/ framework/widget/src/org/ofbiz/widget/screen/

Author: jleroux
Date: Fri Aug 22 11:23:42 2008
New Revision: 688167

URL: http://svn.apache.org/viewvc?rev=688167&view=rev
Log:
A couple of i18n and l10n stuff
Following Bilgin's recommendation, I almost successfully tested the iterate-section i18n using [<iterate-section entry-name="ownedFinAccount"...].
Almost, since I was unable to find the right paginate-target value as it's not a screen or a form but a screenlet.
Should we create an entry in the controller in such case?  And if it's the case how, what to do ? In other words how do we call a screenlet ?

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=688167&r1=688166&r2=688167&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Fri Aug 22 11:23:42 2008
@@ -644,6 +644,7 @@
     </property>
     <property key="AccountingApplyServiceCredit">
         <value xml:lang="en">Apply Service Credit</value>
+        <value xml:lang="fr">Alimenter le crédit</value>
         <value xml:lang="ru">Применить сервисный кредит</value>
         <value xml:lang="th">ใช้บริการเครดิต</value>
     </property>
@@ -8525,6 +8526,7 @@
     </property>
     <property key="PageTitleFinancialAccountSummary">
         <value xml:lang="en">Financial Account Summary</value>
+        <value xml:lang="fr">Résumé des comptes financiers</value>
         <value xml:lang="ru">Резюме финансового счета</value>
         <value xml:lang="th">งบกำไรสะสมโดยสรุป</value>
     </property>

Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=688167&r1=688166&r2=688167&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Fri Aug 22 11:23:42 2008
@@ -1381,11 +1381,12 @@
     </property>
     <property key="ManufacturingListOfProductionRunNotes">
         <value xml:lang="en">List Of Production Run Notes</value>
+        <value xml:lang="fr">Liste des notes de l'ordre de fabrication</value>
     </property>    
     <property key="ManufacturingListOfProductionRunRoutingTasks">
         <value xml:lang="en">Tasks</value>
         <value xml:lang="es">Lista de tareas de la corrida de producción</value>
-        <value xml:lang="fr">Liste des opérations de l'Ordre de Fabrication</value>
+        <value xml:lang="fr">Liste des opérations de l'ordre de fabrication</value>
         <value xml:lang="it">Lista delle Operazioni dell'Ordine di Produzione</value>
         <value xml:lang="ro">Lista Operatiilor pe Comanda de Productie</value>
         <value xml:lang="th">งาน</value>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=688167&r1=688166&r2=688167&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Fri Aug 22 11:23:42 2008
@@ -1705,6 +1705,10 @@
         <value xml:lang="zh_CN">禁用</value>
         <value xml:lang="zh">无效</value>
     </property>
+    <property key="CommonDisplaying">
+        <value xml:lang="en">Displaying ${lowCount} - ${highCount} of ${total}</value>
+        <value xml:lang="fr">Affichage de ${lowCount} à ${highCount} sur ${total}</value>
+    </property>
     <property key="CommonDistance">
         <value xml:lang="ar">مسافة</value>
         <value xml:lang="de">Distanz</value>

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java?rev=688167&r1=688166&r2=688167&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java Fri Aug 22 11:23:42 2008
@@ -33,6 +33,7 @@
 
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
+import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;
@@ -340,8 +341,9 @@
 
         }
         if (listSize > 0) {
-            String ofLabel = UtilProperties.getMessage("CommonUiLabels", "CommonOf", (Locale) context.get("locale"));
-            writer.append(" <span class=\"tabletext\">" + (lowIndex + 1) + " - " + (lowIndex + actualPageSize) + " "+ ofLabel + " " + listSize + "</span> \n");
+            Map<String, Integer> messageMap = UtilMisc.toMap("lowCount", Integer.valueOf(lowIndex + 1), "highCount", Integer.valueOf(lowIndex + actualPageSize), "total", Integer.valueOf(listSize));
+            String commonDisplaying = UtilProperties.getMessage("CommonUiLabels", "CommonDisplaying", messageMap, (Locale) context.get("locale"));
+            writer.append(" <span class=\"tabletext\">" + commonDisplaying + "</span> \n");
         }
         if (highIndex < listSize) {
             writer.append(" <a href=\"");