Author: mrisaliti
Date: Fri Feb 13 22:22:34 2009 New Revision: 744265 URL: http://svn.apache.org/viewvc?rev=744265&view=rev Log: A lot of hardcoded labels cleaning and changes some wrong references Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/viewcontent.ftl ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl ofbiz/trunk/applications/order/config/OrderUiLabels.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=744265&r1=744264&r2=744265&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Fri Feb 13 22:22:34 2009 @@ -24,12 +24,18 @@ <form name="BaseSummaryOptions" type="single" header-row-style="header-row" default-table-style="basic-table"> <field name="month" required-field="true"> <drop-down allow-empty="false"> - <option key="01" description="1-January"/><option key="02" description="2-February"/> - <option key="03" description="3-March"/><option key="04" description="4-April"/> - <option key="05" description="5-May"/><option key="06" description="6-June"/> - <option key="07" description="7-July"/><option key="08" description="8-August"/> - <option key="09" description="9-September"/><option key="10" description="10-October"/> - <option key="11" description="11-November"/><option key="12" description="12-December"/> + <option key="01" description="${uiLabelMap.CommonJanuary}"/> + <option key="02" description="${uiLabelMap.CommonFebruary}"/> + <option key="03" description="${uiLabelMap.CommonMarch}"/> + <option key="04" description="${uiLabelMap.CommonApril}"/> + <option key="05" description="${uiLabelMap.CommonMay}"/> + <option key="06" description="${uiLabelMap.CommonJune}"/> + <option key="07" description="${uiLabelMap.CommonJuly}"/> + <option key="08" description="${uiLabelMap.CommonAugust}"/> + <option key="09" description="${uiLabelMap.CommonSeptember}"/> + <option key="10" description="${uiLabelMap.CommonOctober}"/> + <option key="11" description="${uiLabelMap.CommonNovember}"/> + <option key="12" description="${uiLabelMap.CommonDecember}"/> </drop-down> </field> <field name="year" required-field="true"><text size="4"/></field> Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml?rev=744265&r1=744264&r2=744265&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml (original) +++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml Fri Feb 13 22:22:34 2009 @@ -1905,6 +1905,10 @@ <value xml:lang="fr">Adresse d'expédition principale</value> <value xml:lang="it">Indirizzo primario di spedizione</value> </property> + <property key="EcommerceProductNotConfigured"> + <value xml:lang="en">Product not configured</value> + <value xml:lang="it">Prodotto non configurato</value> + </property> <property key="EcommerceProductNumber"> <value xml:lang="de">Produktnummer</value> <value xml:lang="en">Product Number</value> @@ -2831,6 +2835,10 @@ <value xml:lang="th">à¸à¸¹à¸à¸µà¹à¸ªà¹à¸</value> <value xml:lang="zh">æµè§å·²åéåå·²æ¥æ¶</value> </property> + <property key="EcommerceYourGiftCardReloaded"> + <value xml:lang="en">Your Gift Card Reloaded Have</value> + <value xml:lang="it">La tua carta regalo è stata ricaricata</value> + </property> <property key="EcommerceYouHave"> <value xml:lang="de">Sie haben</value> <value xml:lang="en">You Have</value> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/viewcontent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/viewcontent.ftl?rev=744265&r1=744264&r2=744265&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/viewcontent.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/viewcontent.ftl Fri Feb 13 22:22:34 2009 @@ -115,9 +115,9 @@ <td> ${indent} <#if content.contentTypeId == "WEB_SITE_PUB_PT" > - <a class="tabButton" href="<@ofbizUrl>showcontenttree?contentId=${content.contentId?if_exists}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonBackto}</a> ${content.contentName?if_exists} + <a class="tabButton" href="<@ofbizUrl>showcontenttree?contentId=${content.contentId?if_exists}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}</a> ${content.contentName?if_exists} <#else> - <a class="tabButton" href="<@ofbizUrl>viewcontent?contentId=${content.contentId?if_exists}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonBackto}</a> ${content.contentName?if_exists} + <a class="tabButton" href="<@ofbizUrl>viewcontent?contentId=${content.contentId?if_exists}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}</a> ${content.contentName?if_exists} </#if> <#local indent = indent + " "> [${content.contentId?if_exists}] Modified: ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl?rev=744265&r1=744264&r2=744265&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl (original) +++ ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl Fri Feb 13 22:22:34 2009 @@ -43,79 +43,79 @@ <br/><br/> </tr> <tr width="100%"> - <td width="20%">${uiLabelMap.CommonFirstName?if_exists}</td> + <td width="20%">${uiLabelMap.CommonFirstName}</td> <td width="30%"><h3>${contactInfo1.firstName?if_exists}</h3></td> <td width="30%"><h3>${contactInfo2.firstName?if_exists}</h3></td> <td width="20%"></td> </tr> <tr width="100%"> - <td width="20%">${uiLabelMap.CommonLastName?if_exists}</td> + <td width="20%">${uiLabelMap.CommonLastName}</td> <td width="30%"><h3>${contactInfo1.lastName?if_exists}</h3></td> <td width="30%"><h3>${contactInfo2.lastName?if_exists}</h3></td> <td width="20%"></td> </tr><br/> <tr> - <td width="30"><br/><h3>${uiLabelMap.PartyGeneralCorrespondenceAddress?if_exists}</h3></td> + <td width="30"><br/><h3>${uiLabelMap.PartyGeneralCorrespondenceAddress}</h3></td> <td width="30"></td> <tr> - <td width="20%" >${uiLabelMap.CommonAddress1?if_exists}</td> + <td width="20%" >${uiLabelMap.CommonAddress1}</td> <td width="30%">${contactInfo1.address1?if_exists}</td> <td width="30%">${contactInfo2.address1?if_exists}</td> <td width="20%"><input type="checkbox" name="useAddress2" value="Y"/></td> </tr> <tr> - <td width="20%" >${uiLabelMap.CommonAddress2?if_exists}</td> + <td width="20%" >${uiLabelMap.CommonAddress2}</td> <td width="30%">${contactInfo1.address2?if_exists}</td> <td width="30%">${contactInfo2.address2?if_exists}</td> <td width="20%"></td> </tr> <tr> - <td width="20%" >${uiLabelMap.CommonCity?if_exists}</td> + <td width="20%" >${uiLabelMap.CommonCity}</td> <td width="30%">${contactInfo1.city?if_exists}</td> <td width="30%">${contactInfo2.city?if_exists}</td> <td width="20%"></td> </tr> <tr> - <td width="20%">${uiLabelMap.CommonState?if_exists}</td> + <td width="20%">${uiLabelMap.CommonState}</td> <td width="30%">${contactInfo1.state?if_exists}</td> <td width="30%">${contactInfo2.state?if_exists}</td> <td width="20%"></td> </tr> <tr> - <td width="20%">${uiLabelMap.CommonZipPostalCode?if_exists}</td> + <td width="20%">${uiLabelMap.CommonZipPostalCode}</td> <td width="30%">${contactInfo1.postalCode?if_exists}</td> <td width="30%">${contactInfo2.postalCode?if_exists}</td> <td width="20%"></td> </tr> <tr> - <td width="20%" >${uiLabelMap.CommonCountry?if_exists}</td> + <td width="20%" >${uiLabelMap.CommonCountry}</td> <td width="30%">${contactInfo1.country?if_exists}</td> <td width="30%">${contactInfo2.country?if_exists}</td> <td width="20%"></td> </tr><br/> - <tr><td><br/><h3>${uiLabelMap.PartyPrimaryPhone?if_exists}</h3></td></tr> + <tr><td><br/><h3>${uiLabelMap.PartyPrimaryPhone}</h3></td></tr> <tr> - <td width="20%">${uiLabelMap.PartyCountryCode?if_exists}</td> + <td width="20%">${uiLabelMap.PartyCountryCode}</td> <td width="30%">${contactInfo1.countryCode?if_exists}</td> <td width="30%">${contactInfo2.countryCode?if_exists}</td> <td width="10%"><input type="checkbox" name="useContactNum2" value="Y"/></td> </tr> <tr> - <td width="20%" >${uiLabelMap.PartyAreaCode?if_exists}</td> + <td width="20%" >${uiLabelMap.PartyAreaCode}</td> <td width="30%">${contactInfo1.areaCode?if_exists}</td> <td width="30%">${contactInfo2.areaCode?if_exists}</td> <td width="20%"></td> </tr> <tr> - <td width="20%" >${uiLabelMap.PartyPhoneNumber?if_exists}</td> + <td width="20%" >${uiLabelMap.PartyPhoneNumber}</td> <td width="30%">${contactInfo1.contactNumber?if_exists}</td> <td width="30%">${contactInfo2.contactNumber?if_exists}</td> <td width="20%"></td> </tr> <tr> - <td width="20%" >${uiLabelMap.CommonEmail?if_exists}</td> + <td width="20%" >${uiLabelMap.CommonEmail}</td> <td width="30%">${contactInfo1.primaryEmail?if_exists}</td> <td width="30%">${contactInfo2.primaryEmail?if_exists}</td> <td width="10%"><input type="checkbox" name="useEmail2" value="Y"/></td> Modified: ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl?rev=744265&r1=744264&r2=744265&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl (original) +++ ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl Fri Feb 13 22:22:34 2009 @@ -28,79 +28,79 @@ <br/><br/> </tr> <tr width="100%"> - <td width="20%">${uiLabelMap.CommonFirstName?if_exists}</td> + <td width="20%">${uiLabelMap.CommonFirstName}</td> <td width="30%"><h3>${contactInfo1.firstName?if_exists}</h3></td> <td width="30%"><h3>${contactInfo2.firstName?if_exists}</h3></td> <td width="20%"></td> </tr> <tr width="100%"> - <td width="20%">${uiLabelMap.CommonLastName?if_exists}</td> + <td width="20%">${uiLabelMap.CommonLastName}</td> <td width="30%"><h3>${contactInfo1.lastName?if_exists}</h3></td> <td width="30%"><h3>${contactInfo2.lastName?if_exists}</h3></td> <td width="20%"></td> </tr><br/> <tr> - <td width="30"><br/><h3>${uiLabelMap.PartyGeneralCorrespondenceAddress?if_exists}</h3></td> + <td width="30"><br/><h3>${uiLabelMap.PartyGeneralCorrespondenceAddress}</h3></td> <td width="30"></td> <tr> - <td width="20%" >${uiLabelMap.CommonAddress1?if_exists}</td> + <td width="20%" >${uiLabelMap.CommonAddress1}</td> <td width="30%">${contactInfo1.address1?if_exists}</td> <td width="30%">${contactInfo2.address1?if_exists}</td> <td width="20%"><input type="checkbox" name="useAddress2" value="Y"/></td> </tr> <tr> - <td width="20%" >${uiLabelMap.CommonAddress2?if_exists}</td> + <td width="20%" >${uiLabelMap.CommonAddress2}</td> <td width="30%">${contactInfo1.address2?if_exists}</td> <td width="30%">${contactInfo2.address2?if_exists}</td> <td width="20%"></td> </tr> <tr> - <td width="20%" >${uiLabelMap.CommonCity?if_exists}</td> + <td width="20%" >${uiLabelMap.CommonCity}</td> <td width="30%">${contactInfo1.city?if_exists}</td> <td width="30%">${contactInfo2.city?if_exists}</td> <td width="20%"></td> </tr> <tr> - <td width="20%">${uiLabelMap.CommonState?if_exists}</td> + <td width="20%">${uiLabelMap.CommonState}</td> <td width="30%">${contactInfo1.state?if_exists}</td> <td width="30%">${contactInfo2.state?if_exists}</td> <td width="20%"></td> </tr> <tr> - <td width="20%">${uiLabelMap.CommonZipPostalCode?if_exists}</td> + <td width="20%">${uiLabelMap.CommonZipPostalCode}</td> <td width="30%">${contactInfo1.postalCode?if_exists}</td> <td width="30%">${contactInfo2.postalCode?if_exists}</td> <td width="20%"></td> </tr> <tr> - <td width="20%" >${uiLabelMap.CommonCountry?if_exists}</td> + <td width="20%" >${uiLabelMap.CommonCountry}</td> <td width="30%">${contactInfo1.country?if_exists}</td> <td width="30%">${contactInfo2.country?if_exists}</td> <td width="20%"></td> </tr><br/> - <tr><td><br/><h3>${uiLabelMap.PartyPrimaryPhone?if_exists}</h3></td></tr> + <tr><td><br/><h3>${uiLabelMap.PartyPrimaryPhone}</h3></td></tr> <tr> - <td width="20%">${uiLabelMap.PartyCountryCode?if_exists}</td> + <td width="20%">${uiLabelMap.PartyCountryCode}</td> <td width="30%">${contactInfo1.countryCode?if_exists}</td> <td width="30%">${contactInfo2.countryCode?if_exists}</td> <td width="10%"><input type="checkbox" name="useContactNum2" value="Y"/></td> </tr> <tr> - <td width="20%" >${uiLabelMap.PartyAreaCode?if_exists}</td> + <td width="20%" >${uiLabelMap.PartyAreaCode}</td> <td width="30%">${contactInfo1.areaCode?if_exists}</td> <td width="30%">${contactInfo2.areaCode?if_exists}</td> <td width="20%"></td> </tr> <tr> - <td width="20%" >${uiLabelMap.PartyPhoneNumber?if_exists}</td> + <td width="20%" >${uiLabelMap.PartyPhoneNumber}</td> <td width="30%">${contactInfo1.contactNumber?if_exists}</td> <td width="30%">${contactInfo2.contactNumber?if_exists}</td> <td width="20%"></td> </tr> <tr> - <td width="20%" >${uiLabelMap.CommonEmail?if_exists}</td> + <td width="20%" >${uiLabelMap.CommonEmail}</td> <td width="30%">${contactInfo1.primaryEmail?if_exists}</td> <td width="30%">${contactInfo2.primaryEmail?if_exists}</td> <td width="10%"><input type="checkbox" name="useEmail2" value="Y"/></td> @@ -112,7 +112,7 @@ </tr> </table> <#else> - <h3>${uiLabelMap.SfaNoLeadsSelectedToMerged?if_exists}</h3> + <h3>${uiLabelMap.SfaNoLeadsSelectedToMerged}</h3> </#if> </td> </tr> Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=744265&r1=744264&r2=744265&view=diff ============================================================================== --- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original) +++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Fri Feb 13 22:22:34 2009 @@ -1169,6 +1169,10 @@ <value xml:lang="zh">æ订åæç»æ·»å å°è´ç©å表</value> <value xml:lang="zh_CN">æ·»å 订å项ç®å°è´ç©æ¸ å</value> </property> + <property key="OrderAddQntToOrder"> + <value xml:lang="en">to Order</value> + <value xml:lang="it">all'ordine</value> + </property> <property key="OrderAddToCart"> <value xml:lang="cs">pÅidat do koÅ¡Ãku</value> <value xml:lang="de">In den Warenkorb legen</value> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml?rev=744265&r1=744264&r2=744265&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml Fri Feb 13 22:22:34 2009 @@ -122,7 +122,7 @@ </field> <field name="addToCart" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="additem/editShoppingList?shoppingListId=${shoppingListId}&shoppingListItemSeqId=${shoppingListItemSeqId}&add_product_id=${productId}&quantity=${quantity}&configId=${configId}" - description="Add ${quantity} to Order" also-hidden="false"/> + description="${uiLabelMap.CommonAdd} ${quantity} ${uiLabelMap.OrderAddQntToOrder}" also-hidden="false"/> </field> </form> <form name="AddFromShoppingListAll" type="single" target=""> Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml?rev=744265&r1=744264&r2=744265&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml (original) +++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml Fri Feb 13 22:22:34 2009 @@ -69,10 +69,10 @@ <form name="ProductStocktake" type="single" target="updateproductstocktake" default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> <field name="facilityId"><hidden/></field> - <field name="productId" title="Product"><display/></field> - <field name="productName" title="Name" entry-name="product.productName"><display/></field> + <field name="productId"><display/></field> + <field name="productName" entry-name="product.productName"><display/></field> <field name="atp_qoh" title="ATP/QOH" entry-name="quantitySummary.atp_qoh"><display/></field> - <field name="locationSeqId" title="Location" entry-name="locationSeqId"><display/></field> + <field name="locationSeqId" entry-name="locationSeqId"><display/></field> <!--<field name="submitButton" title="Submit" widget-style="standardSubmit"><submit button-type="button"/></field>--> </form> <form name="UpdateProductStocktake" type="list" @@ -83,8 +83,8 @@ <field name="facilityId"><hidden/></field> <field name="atp_qoh" title="ATP/QOH" entry-name="atp_qoh"><display/></field> <field name="locationSeqId"><hidden/></field> - <field name="locationSeqIdNew" title="Location" entry-name="locationSeqId"><text size="10" default-value=""/></field> - <field name="quantity" title="Quantity" required-field="true" entry-name="totalQuantityOnHand"><text size="6" default-value=""/></field> + <field name="locationSeqIdNew" entry-name="locationSeqId"><text size="10" default-value=""/></field> + <field name="quantity" required-field="true" entry-name="totalQuantityOnHand"><text size="6" default-value=""/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="removeProductFromCategory?productId=${productId}&productCategoryId=${productCategoryId}&fromDate=${fromDate}" @@ -94,11 +94,11 @@ <form name="MainMenu" type="single" target="menu"> <field name="facilityId"><hidden/></field> - <field name="m1" title="Facility : ${facilityId}" position="1"><display/></field> + <field name="m1" title="${uiLabelMap.FacilityFacility} : ${facilityId}" position="1"><display/></field> <field name="receipt" title="1. Goods Receipt"> <submit button-type="text-link"/> </field> - <field name="picking" title="2. Picking" position="1"> + <field name="picking" title="2. ${uiLabelMap.ProductPicking}" position="1"> <submit button-type="text-link"/> </field> </form> Modified: ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl?rev=744265&r1=744264&r2=744265&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl (original) +++ ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl Fri Feb 13 22:22:34 2009 @@ -36,7 +36,7 @@ <div class="screenlet-body"> <table class="basic-table" cellspacing="0"> <tr valign="bottom" class="header-row"> - <td width="10%"><b>${uiLabelMap.EcommerceProduct}</b></td> + <td width="10%"><b>${uiLabelMap.ProductProduct}</b></td> <td width="10%" align="center"><b>${uiLabelMap.OagisInventoryLevelDateTime}</b></td> <td width="10%" align="right"><b>${uiLabelMap.OrderReturnItemInventoryStatus}</b></td> <td width="10%" align="right"><b>${uiLabelMap.OrderQuantity} (Inventory)</b></td> |
Free forum by Nabble | Edit this page |