svn commit: r745689 - in /ofbiz/trunk/applications: content/config/ ecommerce/config/ ecommerce/webapp/ecommerce/content/ ecommerce/webapp/ecommerce/forum/ ecommerce/webapp/ecommerce/order/ ecommerce/widget/ ecommerce/widget/blog/ order/config/ order/s...

[mrisaliti]

Author: mrisaliti
Date: Wed Feb 18 23:15:06 2009
New Revision: 745689

URL: http://svn.apache.org/viewvc?rev=745689&view=rev
Log:
A lot of hardcoded labels cleaning and changes some wrong references

Modified:
    ofbiz/trunk/applications/content/config/ContentUiLabels.xml
    ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/ContentForms.xml
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl
    ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml
    ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml
    ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml
    ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml
    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
    ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=745689&r1=745688&r2=745689&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Wed Feb 18 23:15:06 2009
@@ -81,6 +81,11 @@
     <property key="ContentBlog">
         <value xml:lang="en">Blog</value>
         <value xml:lang="fr">Blog</value>
+ <value xml:lang="it">Blog</value>
+    </property>
+ <property key="ContentBlogs">
+        <value xml:lang="en">Blogs</value>
+        <value xml:lang="it">Blogs</value>
     </property>
     <property key="ContentBlogArticle">
         <value xml:lang="en">Article</value>
@@ -106,6 +111,10 @@
         <value xml:lang="en">Blog Name</value>
         <value xml:lang="it">Nome blog</value>
     </property>
+ <property key="ContentBlogPost">
+        <value xml:lang="en">POST</value>
+        <value xml:lang="it">Inviare</value>
+    </property>
     <property key="ContentBlogSummary">
         <value xml:lang="en">Summary</value>
         <value xml:lang="fr">Summario</value>
@@ -629,6 +638,10 @@
         <value xml:lang="it">Messaggi</value>
         <value xml:lang="th">ข้อความ</value>
     </property>
+ <property key="ContentForums">
+        <value xml:lang="en">Forums</value>
+        <value xml:lang="it">Forums</value>
+    </property>
     <property key="ContentForumThread">
         <value xml:lang="de">Thema</value>
         <value xml:lang="en">Thread</value>
@@ -897,6 +910,10 @@
         <value xml:lang="en">PNG</value>
         <value xml:lang="it">PNG</value>
     </property>
+ <property key="ContentPublishToContent">
+        <value xml:lang="en">Publish-to content</value>
+        <value xml:lang="it">Pubblica sul contenuto</value>
+    </property>
     <property key="ContentQueryLine">
         <value xml:lang="ar">أدخل متغيرات المسألة</value>
         <value xml:lang="de">Geben Sie die Suchparamter an</value>

Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml?rev=745689&r1=745688&r2=745689&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml Wed Feb 18 23:15:06 2009
@@ -239,19 +239,69 @@
         <value xml:lang="th">แน่ใจในการรวมรายการสินค้าของคุณ #</value>
         <value xml:lang="zh">确信包括了你的订单 #</value>
     </property>
-    <property key="EcommerceBronze">
-        <value xml:lang="de">Bronze</value>
+ <property key="EcommerceBlogAddResponse">
+        <value xml:lang="en">Add a response:</value>
+        <value xml:lang="it">Aggiungi una risposta:</value>
+    </property>
+ <property key="EcommerceBlogAddResponseMessage">
+        <value xml:lang="en">You must be logged in to add a response.</value>
+        <value xml:lang="it">Devi essere autenticato per aggiungere una risposta.</value>
+    </property>
+ <property key="EcommerceBlogAddThread">
+        <value xml:lang="en">Add a thread:</value>
+        <value xml:lang="it">Aggiungi una discussione:</value>
+    </property>
+ <property key="EcommerceBlogArticle">
+        <value xml:lang="en">Article</value>
+        <value xml:lang="it">Articolo</value>
+    </property>
+ <property key="EcommerceBlogContentNotFound">
+        <value xml:lang="en">Unable to find Blog content!</value>
+        <value xml:lang="it">Non è possibile trovare il contenuto Blog!</value>
+    </property>
+ <property key="EcommerceBlogEntryId">
+        <value xml:lang="en">Blog entry Id</value>
+        <value xml:lang="it">Voce blog</value>
+    </property>
+ <property key="EcommerceBlogFullMessage">
+        <value xml:lang="en">Full message</value>
+        <value xml:lang="it">Messaggio completo</value>
+    </property>
+ <property key="EcommerceBlogLatestResponses">
+        <value xml:lang="en">Latest Responses</value>
+        <value xml:lang="it">Ultime risposte</value>
+    </property>
+ <property key="EcommerceBlogMessageTree">
+        <value xml:lang="en">Message tree</value>
+        <value xml:lang="it">Albero messaggi</value>
+    </property>
+    <property key="EcommerceBlogPostedOn">
+        <value xml:lang="en">Posted on</value>
+        <value xml:lang="it">Inviato il</value>
+    </property>
+ <property key="EcommerceBlogPreview">
+        <value xml:lang="en">Preview</value>
+        <value xml:lang="it">Anteprima</value>
+    </property>
+ <property key="EcommerceBlogPublish">
+        <value xml:lang="en">Publish</value>
+        <value xml:lang="it">Pubblica</value>
+    </property>
+ <property key="EcommerceBlogTopCenter">
+        <value xml:lang="en">Top Center</value>
+        <value xml:lang="it">Alto al centro</value>
+    </property>
+ <property key="EcommerceBlogTopLeft">
+        <value xml:lang="en">Top Left</value>
+        <value xml:lang="it">Alto a sinistra</value>
+    </property>
+ <property key="EcommerceBlogViewArticle">
+        <value xml:lang="en">View Blog Article</value>
+        <value xml:lang="it">Mostra articolo blog</value>
+    </property>
+ <property key="EcommerceBronze">
         <value xml:lang="en">Bronze</value>
-        <value xml:lang="es">Bronce</value>
-        <value xml:lang="fr">Bronze</value>
-        <value xml:lang="hi_IN">कांस्य</value>
         <value xml:lang="it">Bronzo</value>
-        <value xml:lang="ja">Bronze</value>
-        <value xml:lang="nl">Brons</value>
-        <value xml:lang="ro">Bronz</value>
-        <value xml:lang="ru">Бронза</value>
-        <value xml:lang="th">สีบรอนซ์</value>
-        <value xml:lang="zh">铜牌</value>
     </property>
     <property key="EcommerceCartHas">
         <value xml:lang="cs">Košík má</value>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/ContentForms.xml?rev=745689&r1=745688&r2=745689&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/ContentForms.xml (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/ContentForms.xml Wed Feb 18 23:15:06 2009
@@ -23,7 +23,7 @@
     <form name="searchQuery" target="AdminSearch" title="" type="single"
         default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
         <field name="queryLine" title="${uiLabelMap.EcommerceEnterQueryParameters}"><text size="60"/></field>
-        <field name="submitButton" title="Query" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
 
     </form>
     <form name="searchList" type="list" target="" list-name="queryResults"
@@ -32,8 +32,8 @@
         <field name="editContent" title="${uiLabelMap.CommonEmptyHeader}">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit?contentId=${contentId}&amp;drDataResourceId=${drDataResourceId}&amp;contentIdTo=${contentIdTo}"/>
         </field>
-        <field name="contentId" title="${uiLabelMap.ProductContentId}" ><display/></field>
-        <field name="dataResourceId" title="${uiLabelMap.EcommerceDataResourceId}" ><display/></field>
-        <field name="contentName" title="${uiLabelMap.CommonName}" ><display/></field>
+        <field name="contentId"><display/></field>
+        <field name="dataResourceId"><display/></field>
+        <field name="contentName"><display/></field>
     </form>
 </forms>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml?rev=745689&r1=745688&r2=745689&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml Wed Feb 18 23:15:06 2009
@@ -145,7 +145,7 @@
         <field name="description">
             <display/>
         </field>
-        <field name="textData" title="Text" id-name="textData"><display/></field>
+        <field name="textData" title="${uiLabelMap.ContentText}" id-name="textData"><display/></field>
         <field name="privilegeEnumId" >
             <display/>
         </field>
@@ -154,13 +154,13 @@
 
     <form name="findContent" default-entity-name="ContentAssocDataResourceViewFrom" target="FindContent" title="" type="single"
         default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
-        <field name="caContentIdTo" title="Publish-to content" ><text-find/></field>
-        <field name="caMapKey" title="Map Key" ><text-find/></field>
-        <field name="caContentAssocTypeId" title="Assoc Type Id" ><text-find/></field>
+        <field name="caContentIdTo" title="${uiLabelMap.ContentPublishToContent}"><text-find/></field>
+        <field name="caMapKey"><text-find/></field>
+        <field name="caContentAssocTypeId" title="${uiLabelMap.FormFieldTitle_contentAssocTypeId}" ><text-find/></field>
         <field name="caFromDate" title="${uiLabelMap.CommonFromDate}" ><date-find/></field>
-        <field name="contentId" title="Content Id" ><text-find/></field>
-        <field name="dataResourceId" title="Data Resource Id" ><text-find/></field>
-        <field name="contentName" title="Name" ><text-find/></field>
+        <field name="contentId"><text-find/></field>
+        <field name="dataResourceId"><text-find/></field>
+        <field name="contentName"><text-find/></field>
         <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
 <!--
         <field name="createLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
@@ -184,9 +184,9 @@
         <field name="caMapKey" title="Map Key" ><display/></field>
         <field name="caFromDate" title="From Date" ><display/></field>
 -->
-        <field name="contentId" title="Content Id" ><display/></field>
-        <field name="dataResourceId" title="Data Resource Id" ><display/></field>
-        <field name="contentName" title="Name" ><display/></field>
+        <field name="contentId"><display/></field>
+        <field name="dataResourceId"><display/></field>
+        <field name="contentName"><display/></field>
     </form>
 
     <form name="EditContent" target="uploadContentAndImage" title="" type="upload"
@@ -222,7 +222,7 @@
                 <textarea rows="8" cols="80" />
         </field>
 
-        <field name="textData" title="Text" id-name="textData"><textarea rows="20" cols="60"/></field>
+        <field name="textData" title="${uiLabelMap.ContentText}" id-name="textData"><textarea rows="20" cols="60"/></field>
         <field name="statusId" >
             <drop-down allow-empty="false" no-current-selected-key="SUBSCRIBE_BRONZE">
                 <list-options list-name="statusList" key-name="statusId" description="${description}"/>
@@ -401,7 +401,7 @@
         <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId" >
             <display description="ELECTRONIC_TEXT" also-hidden="false" />
         </field>
-        <field name="textData" title="Text" id-name="textData"><textarea rows="20" cols="120"/> </field>
+        <field name="textData" title="${uiLabelMap.ContentText}" id-name="textData"><textarea rows="20" cols="120"/> </field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ImageUpload" target="uploadImage" title="" type="upload"
@@ -459,7 +459,7 @@
         <field name="contentAssocTypeId" >
             <hidden value="${contentAssocTypeId}"/>
         </field>
-       <field name="contentPurposeString" title="Purpose">
+       <field name="contentPurposeString">
                 <hidden value="${contentPurpose}"/>
         </field>
        <field name="targetOperationString" >

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl?rev=745689&r1=745688&r2=745689&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl Wed Feb 18 23:15:06 2009
@@ -377,7 +377,7 @@
                           <div class="tabletext">
                             <#if (orderShipmentInfoSummaryList?size > 1)>${orderShipmentInfoSummary.shipmentPackageSeqId}: </#if>
                             Code: ${orderShipmentInfoSummary.trackingCode?default("[Not Yet Known]")}
-                            <#if orderShipmentInfoSummary.boxNumber?has_content>${uiLabelMap.OrderBoxNubmer}${orderShipmentInfoSummary.boxNumber}</#if>
+                            <#if orderShipmentInfoSummary.boxNumber?has_content>${uiLabelMap.OrderBoxNumber}${orderShipmentInfoSummary.boxNumber}</#if>
                             <#if orderShipmentInfoSummary.carrierPartyId?has_content>(${uiLabelMap.ProductCarrier}: ${orderShipmentInfoSummary.carrierPartyId})</#if>
                           </div>
                         </#list>

Modified: ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml?rev=745689&r1=745688&r2=745689&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml Wed Feb 18 23:15:06 2009
@@ -124,7 +124,7 @@
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <label style="blogheader">Full message:</label>
+                        <label style="blogheader">${uiLabelMap.EcommerceBlogFullMessage}:</label>
                         <container style="blogcontentwrapper">
                         <label>${contentText}</label>
                         </container>
@@ -133,15 +133,15 @@
                                 <if-has-permission permission="CONTENTMGR" action="CREATE"/>
                             </condition>
                             <widgets>
-                                <label style="blogheader">Add response:</label>
+                                <label style="blogheader">${uiLabelMap.EcommerceBlogAddResponse}</label>
                                 <include-form name="AddForumMessage" location="component://ecommerce/widget/ForumForms.xml"/>
                             </widgets>
                             <fail-widgets>
-                                <label style="blogheader">You must be logged in to add a response.</label>
+                                <label style="blogheader">${uiLabelMap.EcommerceBlogAddResponseMessage}</label>
                             </fail-widgets>
                         </section>
                         <container>
-                        <label style="blogheader">Message tree:</label>
+                        <label style="blogheader">${uiLabelMap.EcommerceBlogMessageTree}:</label>
                         </container>
                         <include-tree name="ResponseTree" location="component://ecommerce/widget/ForumTrees.xml" />
                     </decorator-section>
@@ -495,7 +495,7 @@
             <widgets>
                 <decorator-screen name="commonForumDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <label text="Add a thread:"></label>
+                        <label text="${uiLabelMap.EcommerceBlogAddThread}"></label>
                         <include-form name="AddForumMessage" location="component://ecommerce/widget/ForumForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
@@ -517,7 +517,7 @@
             <widgets>
                 <decorator-screen name="commonForumDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <label text="Add a response:"></label>
+                        <label text="${uiLabelMap.EcommerceBlogAddResponse}"></label>
                         <include-form name="AddForumMessage" location="component://ecommerce/widget/ForumForms.xml"/>
                     </decorator-section>
                 </decorator-screen>

Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml?rev=745689&r1=745688&r2=745689&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml Wed Feb 18 23:15:06 2009
@@ -21,16 +21,16 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <form name="findBlogContent" default-entity-name="ContentAssocDataResourceViewFrom" target="CMSContentFind" title="" type="single"
         default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
-        <field name="caContentIdTo" title="Publish-to content">
+        <field name="caContentIdTo" title="${uiLabelMap.ContentPublishToContent}">
             <drop-down>
-                <option key="OFBIZBLOGROOT" description="Blogs"/>
-                <option key="OFBIZFORUMROOT" description="Forums"/>
+                <option key="OFBIZBLOGROOT" description="${uiLabelMap.ContentBlogs}"/>
+                <option key="OFBIZFORUMROOT" description="${uiLabelMap.ContentForums}"/>
             </drop-down>
         </field>
-        <field name="caMapKey" title="Map Key">
+        <field name="caMapKey">
             <text-find/>
         </field>
-        <field name="caContentAssocTypeId" title="Assoc Type Id">
+        <field name="caContentAssocTypeId" title="${uiLabelMap.FormFieldTitle_contentAssocTypeId}">
             <text-find/>
         </field>
         <field name="caFromDate" title="${uiLabelMap.CommonFromDate}">
@@ -49,10 +49,10 @@
             <submit button-type="button"/>
         </field>
         <field name="createBlog" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="New Blog" target="EditBlogArticle"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonNew} ${uiLabelMap.ContentForum}" target="EditBlogArticle"/>
         </field>
         <field name="createForum" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="New Forum" target="EditForumArticle"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonNew} ${uiLabelMap.ContentForum}" target="EditForumArticle"/>
         </field>
     </form>
 
@@ -83,19 +83,19 @@
     <form name="AddBlogResponse" target="createBlogResponse" title="" type="single"
         default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox">
         <auto-fields-entity entity-name="ContentAssocDataResourceViewTo" default-field-type="hidden" map-name="rsp"/>
-        <field name="contentName" title="Short title" entry-name="contentName" map-name="rsp">
+        <field name="contentName" entry-name="contentName" map-name="rsp">
             <text size="40"/>
         </field>
-        <field name="description" title="Description (250 chars max)" map-name="rsp">
+        <field name="description" map-name="rsp">
             <textarea cols="40" rows="6"/>
         </field>
-        <field name="textData" title="Response" map-name="rsp" widget-style="inputBox dojo-ResizableTextArea">
+        <field name="textData" title="${uiLabelMap.EcommerceRespond}" map-name="rsp" widget-style="inputBox dojo-ResizableTextArea">
             <textarea cols="60" rows="12"/>
         </field>
         <field name="statusId">
             <radio no-current-selected-key="CTNT_INITIAL_DRAFT">
-                <option key="CTNT_PUBLISHED" description="POST"/>
-                <option key="CTNT_INITIAL_DRAFT" description="PREVIEW"/>
+                <option key="CTNT_PUBLISHED" description="${uiLabelMap.ContentBlogPost}"/>
+                <option key="CTNT_INITIAL_DRAFT" description="${uiLabelMap.EcommerceBlogPreview}"/>
             </radio>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit">
@@ -144,10 +144,10 @@
         default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox">
         <auto-fields-entity entity-name="Content" default-field-type="hidden" map-name="content"/>
         <auto-fields-entity entity-name="DataResource" default-field-type="hidden" map-name="dataResource"/>
-        <field name="contentName" title="Short title" entry-name="contentName" map-name="rsp">
+        <field name="contentName" entry-name="contentName" map-name="rsp">
             <text size="40"/>
         </field>
-        <field name="description" title="Slightly longer title (250 chars max)">
+        <field name="description">
             <textarea cols="40" rows="6"/>
         </field>
         <field name="contentId" entry-name="contentId" map-name="parameters">
@@ -156,13 +156,13 @@
         <field name="articleContentId" entry-name="articleContentId" map-name="rsp">
             <hidden/>
         </field>
-        <field name="textData" title="Response" map-name="electronicText" widget-style="inputBox dojo-ResizableTextArea">
+        <field name="textData" title="${uiLabelMap.EcommerceRespond}" map-name="electronicText" widget-style="inputBox dojo-ResizableTextArea">
             <textarea cols="60" rows="12"/>
         </field>
         <field name="statusId">
             <radio no-current-selected-key="CTNT_INITIAL_DRAFT">
-                <option key="CTNT_PUBLISHED" description="POST"/>
-                <option key="CTNT_INITIAL_DRAFT" description="PREVIEW"/>
+                <option key="CTNT_PUBLISHED" description="${uiLabelMap.ContentBlogPost}"/>
+                <option key="CTNT_INITIAL_DRAFT" description="${uiLabelMap.EcommerceBlogPreview}"/>
             </radio>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit">
@@ -194,22 +194,22 @@
         default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox">
         <alt-target use-when="contentId!=void" target="updateBlogArticle"/>
         <field name="blogContentId"><hidden value="${parameters.blogContentId}"/></field>
-        <field name="contentId" title="Blog entry Id" use-when="contentId!=void"><display/></field>
-        <field name="contentName" title="Short title"><text size="40"/></field>
-        <field name="description" title="Slightly longer title (250 chars max)"><textarea cols="40" rows="2"/></field>
-        <field name="summaryData" title="Summary" widget-style="inputBox dojo-ResizableTextArea"><textarea cols="60" rows="4"/></field>
-        <field name="articleData" title="Article" widget-style="inputBox dojo-ResizableTextArea"><textarea cols="60" rows="12"/></field>
-        <field name="uploadedFile" title="Image"><file size="25"/></field>
-        <field name="templateDataResourceId" title="Template">
+        <field name="contentId" title="${uiLabelMap.EcommerceBlogEntryId}" use-when="contentId!=void"><display/></field>
+        <field name="contentName"><text size="40"/></field>
+        <field name="description"><textarea cols="40" rows="2"/></field>
+        <field name="summaryData" title="${uiLabelMap.EcommerceSummary}" widget-style="inputBox dojo-ResizableTextArea"><textarea cols="60" rows="4"/></field>
+        <field name="articleData" title="${uiLabelMap.EcommerceBlogArticle}" widget-style="inputBox dojo-ResizableTextArea"><textarea cols="60" rows="12"/></field>
+        <field name="uploadedFile" title="${uiLabelMap.ContentImage}"><file size="25"/></field>
+        <field name="templateDataResourceId" title="${uiLabelMap.ContentTemplate}">
             <drop-down>
-                <option key="BLOG_TPL_TOPLEFT" description="Top Left"/>
-                <option key="BLOG_TPL_TOPCENTER" description="Top Center"/>
+                <option key="BLOG_TPL_TOPLEFT" description="${uiLabelMap.EcommerceBlogTopLeft}"/>
+                <option key="BLOG_TPL_TOPCENTER" description="${uiLabelMap.EcommerceBlogTopCenter}"/>
             </drop-down>
         </field>
         <field name="statusId" title="Status">
             <drop-down no-current-selected-key="CTNT_INITIAL_DRAFT">
-                <option key="CTNT_PUBLISHED" description="Publish"/>
-                <option key="CTNT_INITIAL_DRAFT" description="Preview"/>
+                <option key="CTNT_PUBLISHED" description="${uiLabelMap.EcommerceBlogPublish}"/>
+                <option key="CTNT_INITIAL_DRAFT" description="${uiLabelMap.EcommerceBlogPreview}"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>

Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml?rev=745689&r1=745688&r2=745689&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml Wed Feb 18 23:15:06 2009
@@ -49,7 +49,7 @@
                                 <if-service-permission service-name="genericContentPermission" main-action="CREATE" context-map="crPerm"/>
                             </condition>
                             <widgets>
-                                <link text="Add New" target="NewBlogArticle?blogContentId=${blogContentId}" style="buttontext"/>
+                                <link text="${uiLabelMap.CommonAddNew}" target="NewBlogArticle?blogContentId=${blogContentId}" style="buttontext"/>
                             </widgets>
                         </section>
 
@@ -60,7 +60,7 @@
                 </container>
             </widgets>
             <fail-widgets>
-                <label text="Unable to find Blog content!" style="blogtitle"/>
+                <label text="${uiLabelMap.EcommerceBlogContentNotFound}" style="blogtitle"/>
             </fail-widgets>
         </section>
     </screen>    
@@ -249,7 +249,7 @@
                         </container>
                         <container style="blogcontentwrapper">
                             <container style="responsetext">
-                                <label text="Posted: ${content.createdDate}" style="responsetext"/>
+                                <label text="${uiLabelMap.EcommerceBlogPostedOn}: ${content.createdDate}" style="responsetext"/>
                                 <label text="&lt;p/&gt;"/>
                             </container>
                             <content content-id="${articleContentId}"/>
@@ -435,9 +435,9 @@
             <widgets>
                 <decorator-screen name="CommonBlog" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <label text="Latest Responses"/>
+                        <label text="${uiLabelMap.EcommerceBlogLatestResponses}"/>
                         <iterate-section list="responseList" entry="rsp">
-                            <section name="Blog Responses">
+                            <section name="BlogResponses">
                                 <widgets>
                                     <include-screen name="responseTreeLine"/>                                            
                                 </widgets>
@@ -462,7 +462,7 @@
                             <link text="${uiLabelMap.CommonView}" target="ViewResponse?contentId=${rsp.contentId}&amp;ownerContentId=${rsp.ownerContentId}&amp;articleContentId=${articleContentId}&amp;blogContentId=${parameters.blogContentId}" style="buttontext"/>
                             <container style="responsetext">
                                 <label text="${rsp.description}" style="responsetext"/>
-                                <label text="(Posted on: ${rsp.createdDate})" style="responsetext"/>
+                                <label text="(${uiLabelMap.EcommerceBlogPostedOn}: ${rsp.createdDate})" style="responsetext"/>
                             </container>
                         </container>
                     </widgets>
@@ -477,7 +477,7 @@
                             <link text="${uiLabelMap.CommonView}" target="ViewResponse?contentId=${rsp.contentId}&amp;ownerContentId=${rsp.ownerContentId}&amp;articleContentId=${articleContentId}&amp;blogContentId=${parameters.blogContentId}" style="buttontext"/>
                             <container style="responsetext">
                                 <label text="${rsp.description}" style="responsetext"/>
-                                <label text="(Posted on: ${rsp.createdDate})" style="responsetext"/>
+                                <label text="(${uiLabelMap.EcommerceBlogPostedOn}: ${rsp.createdDate})" style="responsetext"/>
                             </container>
                         </container>
                     </widgets>
@@ -491,10 +491,10 @@
             <widgets>
                 <container>
                     <link text="${rsp.contentName}[${rsp.contentId}]" target="ViewBlogArticle?articleContentId=${articleContentId}&amp;ownerContentId=${rsp.ownerContentId}&amp;blogContentId=${parameters.blogContentId}" style="responseheader"/>
-                    <link text="View Blog Article" target="ViewBlogArticle?articleContentId=${articleContentId}&amp;ownerContentId=${rsp.ownerContentId}&amp;blogContentId=${parameters.blogContentId}" style="buttontext"/>
+                    <link text="${uiLabelMap.EcommerceBlogViewArticle}" target="ViewBlogArticle?articleContentId=${articleContentId}&amp;ownerContentId=${rsp.ownerContentId}&amp;blogContentId=${parameters.blogContentId}" style="buttontext"/>
                     <container style="responsetext">
                         <label text="${rsp.description}" style="responsetext"/>
-                        <label text="(Posted on: ${rsp.createdDate})" style="responsetext"/>
+                        <label text="(${uiLabelMap.EcommerceBlogPostedOn}: ${rsp.createdDate})" style="responsetext"/>
                     </container>
                 </container>
             </widgets>

Modified: ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml?rev=745689&r1=745688&r2=745689&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml Wed Feb 18 23:15:06 2009
@@ -286,6 +286,10 @@
         <value xml:lang="th">ไม่สามารถเลือกทางเลือกของขวัญ, ไม่พบรายการข้อความบัตรสำหรับ # ${alternateGwpLine}. </value>
         <value xml:lang="zh">无法选择另一个礼品，没有找到用于 # ${alternateGwpLine} 的购物车行明细。 </value>
     </property>
+    <property key="OrderCreateCommunicationEventProductPermissionError">
+        <value xml:lang="en">Create Communication Event Product Permission Error</value>
+        <value xml:lang="it">Errore di permesso durante la creazione evento comunicazione prodotto</value>
+    </property>
     <property key="OrderDispatcherOrDelegatorOrCartArgumentIsNull">
         <value xml:lang="en">Dispatcher or Delegator or Cart argument is null</value>
         <value xml:lang="es">El argumento del despachador, el delegador o el carro es nulo</value>

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=745689&r1=745688&r2=745689&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Wed Feb 18 23:15:06 2009
@@ -1524,7 +1524,7 @@
         <value xml:lang="th">กลับสู่หน้าการซื้อสินค้าจากบัตร</value>
         <value xml:lang="zh">返回购物车</value>
     </property>
-    <property key="OrderBesureIncludeOrder">
+    <property key="OrderBeSureIncludeOrder">
         <value xml:lang="cs">Ujistěte se že jste vložili objednávku</value>
         <value xml:lang="de">Seien Sie sicher, Ihre Bestellung einzufügen</value>
         <value xml:lang="en">Be sure to include your order</value>
@@ -1566,6 +1566,10 @@
         <value xml:lang="ru">Платежный адрес</value>
         <value xml:lang="th">ที่อยู่ใบเสร็จรับเงิน</value>
     </property>
+ <property key="OrderBoxNumber">
+        <value xml:lang="en">Box Number</value>
+        <value xml:lang="it">Scatola numero</value>
+    </property>
     <property key="OrderCOD">
         <value xml:lang="cs">Platba v hotovosti při doručení (dobírka)</value>
         <value xml:lang="de">Barzahlung bei Lieferung (Nachnahme)</value>
@@ -2424,6 +2428,10 @@
         <value xml:lang="th">จุดหมายปลายทาง</value>
         <value xml:lang="zh">目的地</value>
     </property>
+    <property key="OrderDigitalProductFiles">
+        <value xml:lang="en">Digital Product Files</value>
+        <value xml:lang="it">Files prodotto digitale</value>
+    </property>
     <property key="OrderDistributor">
         <value xml:lang="cs">Dodavatel</value>
         <value xml:lang="de">Lieferant</value>
@@ -2637,6 +2645,10 @@
         <value xml:lang="th">เข้ารหัส</value>
         <value xml:lang="zh">已输入的代码</value>
     </property>
+    <property key="OrderEntityExceptionSeeLogs">
+        <value xml:lang="en">Entity Exception See Logs</value>
+        <value xml:lang="it">Eccezione entità, controllare i logs</value>
+    </property>
     <property key="OrderEntryDate">
         <value xml:lang="de">Erfassungsdatum</value>
         <value xml:lang="en">Entry Date</value>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml?rev=745689&r1=745688&r2=745689&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml Wed Feb 18 23:15:06 2009
@@ -22,7 +22,7 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
     <simple-method method-name="createCommunicationEventOrder" short-description="Create a CommunicationEventOrder">
         <check-permission permission="ORDERMGR" action="_CREATE">
-            <fail-property resource="OrderUiLabels" property="OrderCreateCommunicationEventProductPermissionError"/>
+            <fail-property resource="OrderErrorUiLabels" property="OrderCreateCommunicationEventProductPermissionError"/>
         </check-permission>
         <check-errors/>
         <make-value value-field="newEntity" entity-name="CommunicationEventOrder"/>

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=745689&r1=745688&r2=745689&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Wed Feb 18 23:15:06 2009
@@ -20,28 +20,44 @@
 
 import java.math.BigDecimal;
 import java.sql.Timestamp;
-import java.text.NumberFormat;
-import java.text.ParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import javax.transaction.Transaction;
 
 import javolution.util.FastList;
 import javolution.util.FastMap;
 import javolution.util.FastSet;
 
-import org.ofbiz.base.util.*;
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.GeneralException;
+import org.ofbiz.base.util.GeneralRuntimeException;
+import org.ofbiz.base.util.UtilDateTime;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilNumber;
+import org.ofbiz.base.util.UtilProperties;
+import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.collections.ResourceBundleMapWrapper;
 import org.ofbiz.common.DataModelConstants;
-import org.ofbiz.common.uom.UomWorker;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntity;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
-import org.ofbiz.entity.transaction.TransactionUtil;
-import org.ofbiz.entity.transaction.GenericTransactionException;
 import org.ofbiz.entity.condition.EntityCondition;
 import org.ofbiz.entity.condition.EntityConditionList;
 import org.ofbiz.entity.condition.EntityExpr;
 import org.ofbiz.entity.condition.EntityOperator;
+import org.ofbiz.entity.transaction.GenericTransactionException;
+import org.ofbiz.entity.transaction.TransactionUtil;
 import org.ofbiz.entity.util.EntityListIterator;
 import org.ofbiz.entity.util.EntityUtil;
 import org.ofbiz.order.shoppingcart.CartItemModifyException;
@@ -63,8 +79,6 @@
 import org.ofbiz.service.ModelService;
 import org.ofbiz.service.ServiceUtil;
 
-import javax.transaction.Transaction;
-
 /**
  * Order Processing Services
  */
@@ -643,10 +657,10 @@
                         UtilMisc.toMap("fixedAssetId", workEffort.get("fixedAssetId")));
                 }
                 catch (GenericEntityException e) {
-                    return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderFixedAssetNotFoundFixedAssetId ", UtilMisc.toMap("fixedAssetId",workEffort.get("fixedAssetId")), locale));
+                    return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderFixedAssetNotFoundFixedAssetId", UtilMisc.toMap("fixedAssetId",workEffort.get("fixedAssetId")), locale));
                 }
                 if (fixedAsset == null) {
-                    return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderFixedAssetNotFoundFixedAssetId ", UtilMisc.toMap("fixedAssetId",workEffort.get("fixedAssetId")), locale));
+                    return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderFixedAssetNotFoundFixedAssetId", UtilMisc.toMap("fixedAssetId",workEffort.get("fixedAssetId")), locale));
                 }
                 // see if this fixed asset has a calendar, when no create one and attach to fixed asset
                 Debug.logInfo("find the techdatacalendar",module);
@@ -1985,7 +1999,7 @@
         try {
             orderItems = delegator.findByAnd("OrderItem", fields);
         } catch (GenericEntityException e) {
-            return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderErrorCannotGetOrderItemEntity ",locale) + e.getMessage());
+            return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderErrorCannotGetOrderItemEntity",locale) + e.getMessage());
         }
 
         if (UtilValidate.isNotEmpty(orderItems)) {
@@ -2567,7 +2581,7 @@
             orderHeader = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", orderId));
         } catch (GenericEntityException e) {
             Debug.logError(e, "Problem getting order header detial", module);
-            return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderCannotGetOrderHeader ", locale) + e.getMessage());
+            return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderCannotGetOrderHeader", locale) + e.getMessage());
         }
         if (orderHeader != null) {
             Map result = ServiceUtil.returnSuccess();

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl?rev=745689&r1=745688&r2=745689&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl Wed Feb 18 23:15:06 2009
@@ -128,29 +128,6 @@
                   <input type="text" name="userLoginId" value="${requestParameters.USERNAME?if_exists}" size="20" maxlength="250"/>
                 </td>
               </tr>
-              <#--
-              <tr>
-                <td width="26%" align="right"><div>${uiLabelMap.OrderPassword}</div></td>
-                <td width="5">&nbsp;</td>
-                <td width="74%">
-                  <input type="password" name="PASSWORD" value="" size="20" maxlength="50">
-                *</td>
-              </tr>
-              <tr>
-                <td width="26%" align="right"><div>${uiLabelMap.OrderConfirm} Password</div></td>
-                <td width="5">&nbsp;</td>
-                <td width="74%">
-                  <input type="password" name="CONFIRM_PASSWORD" value="" size="20" maxlength="50">
-                *</td>
-              </tr>
-              <tr>
-                <td width="26%" align="right"><div>${uiLabelMap.OrderPassword} Hint</div></td>
-                <td width="5">&nbsp;</td>
-                <td width="74%">
-                  <input type="text" name="PASSWORD_HINT" value="${requestParameters.PASSWORD_HINT?if_exists}" size="40" maxlength="100">
-                </td>
-              </tr>
-              -->
               </form>
             </table>
           </td>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=745689&r1=745688&r2=745689&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl Wed Feb 18 23:15:06 2009
@@ -401,7 +401,7 @@
            <option value="<@ofbizUrl>massApproveOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderApproveOrder}</option>
            <option value="<@ofbizUrl>massHoldOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderHold}</option>
            <option value="<@ofbizUrl>massProcessOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderProcessOrder}</option>
-           <option value="<@ofbizUrl>massCancelOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderCancel}</option>
+           <option value="<@ofbizUrl>massCancelOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderCancelOrder}</option>
            <option value="<@ofbizUrl>massRejectOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderRejectOrder}</option>
            <option value="<@ofbizUrl>massPickOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderPickOrders}</option>
            <option value="<@ofbizUrl>massPrintOrders?hideFields=${requestParameters.hideFields?default('N')}${paramList}</@ofbizUrl>">${uiLabelMap.CommonPrint}</option>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml?rev=745689&r1=745688&r2=745689&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml Wed Feb 18 23:15:06 2009
@@ -36,7 +36,7 @@
     <screen name="OrderReportList">
         <section>
             <actions>
-                <set field="title" value="Order Reports"/>
+                <set field="titleProperty" value="OrderReports"/>
                 <set field="headerItem" value="reports"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/reports/ReportList.groovy"/>
             </actions>