You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2009/02/09 23:13:58 UTC
svn commit: r742770 [1/2] - in /ofbiz/trunk: applications/accounting/config/
applications/accounting/webapp/accounting/payment/
applications/accounting/widget/ applications/accounting/widget/ap/
applications/accounting/widget/ar/ applications/content/c...
Author: mrisaliti
Date: Mon Feb 9 22:13:57 2009
New Revision: 742770
URL: http://svn.apache.org/viewvc?rev=742770&view=rev
Log:
A lot of hardcoded labels cleaning and changes some wrong references
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
ofbiz/trunk/applications/accounting/widget/GlScreens.xml
ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
ofbiz/trunk/applications/accounting/widget/Menus.xml
ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
ofbiz/trunk/applications/content/config/ContentUiLabels.xml
ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl
ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml
ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl
ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl
ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml
ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
ofbiz/trunk/applications/content/widget/content/ContentForms.xml
ofbiz/trunk/applications/content/widget/content/DataResourceMenus.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/checkoutshippingoptions.ftl
ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml
ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml
ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml
ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml
ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml
ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml
ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Mon Feb 9 22:13:57 2009
@@ -154,7 +154,7 @@
<value xml:lang="nl">Ingaves Boekhoudtransacties</value>
<value xml:lang="th">รายà¸à¸²à¸£à¸à¸±à¸à¸à¸µà¸£à¸²à¸¢à¸£à¸±à¸</value>
</property>
- <property key="AccountingAcctgTranss">
+ <property key="AccountingAcctgTrans">
<value xml:lang="en">Accounting Transactions</value>
<value xml:lang="fr">Transactions comptables</value>
<value xml:lang="it">Prime Note</value>
@@ -420,6 +420,10 @@
<value xml:lang="th">à¸à¹à¸à¸ªà¸±à¸à¸à¸²</value>
<value xml:lang="zh">ååæ¡æ¬¾</value>
</property>
+ <property key="AccountingAgreementItemProductsForReport">
+ <value xml:lang="en">Agreement Item Products For Report</value>
+ <value xml:lang="it">Prodotti riga contratto per i report</value>
+ </property>
<property key="AccountingAgreementItemSeqId">
<value xml:lang="ar">رÙ
ز اÙتسÙسÙÙ ÙبÙد إتÙاÙ</value>
<value xml:lang="en">Agreement Item Seq Id</value>
@@ -432,6 +436,10 @@
<value xml:lang="th">รหัสรายà¸à¸²à¸£à¸à¹à¸à¸ªà¸±à¸à¸à¸²</value>
<value xml:lang="zh">ååæ¡æ¬¾é¡ºåºç¼å·</value>
</property>
+ <property key="AccountingAgreementItemSupplierProductsForReport">
+ <value xml:lang="en">Agreement Item Supplier Products For Report</value>
+ <value xml:lang="it">Prodotti fornitore riga contratto per i report</value>
+ </property>
<property key="AccountingAgreementItemTerms">
<value xml:lang="ar">ÙصÙÙ</value>
<value xml:lang="de">Bedingungen</value>
@@ -2653,17 +2661,12 @@
<value xml:lang="zh">åºå®èµäº§</value>
</property>
<property key="AccountingFixedAssetCalendar">
- <value xml:lang="ar">رزÙ
اÙØ©</value>
- <value xml:lang="de">Kalender</value>
- <value xml:lang="en">Calendar</value>
- <value xml:lang="es">Calendario</value>
- <value xml:lang="fr">Calendrier d'immobilisation</value>
- <value xml:lang="it">Calendario</value>
- <value xml:lang="nl">Kalender</value>
- <value xml:lang="ro">Calendar</value>
- <value xml:lang="ru">ÐалендаÑÑ</value>
- <value xml:lang="th">à¸à¸à¸´à¸à¸´à¸</value>
- <value xml:lang="zh">æ¥å</value>
+ <value xml:lang="en">Fixed Asset Calendar</value>
+ <value xml:lang="it">Calendario cespite</value>
+ </property>
+ <property key="AccountingFixedAssetClassEnumId">
+ <value xml:lang="en">Fixed Asset Class Enum Id</value>
+ <value xml:lang="it">Classe cespite</value>
</property>
<property key="AccountingFixedAssetDepreciation">
<value xml:lang="de">Abschreibung</value>
@@ -2884,6 +2887,10 @@
<value xml:lang="ru">ÐакÑпоÑнÑе Ð·Ð°ÐºÐ°Ð·Ñ </value>
<value xml:lang="th">รายà¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²</value>
</property>
+ <property key="AccountingFixedAssetMaintSeqId">
+ <value xml:lang="en">Fixed Asset Maint Seq Id</value>
+ <value xml:lang="it">Riga manutenzione cespite</value>
+ </property>
<property key="AccountingFixedAssetMaintType">
<value xml:lang="ar">ÙÙع اÙصÙاÙØ©</value>
<value xml:lang="en">Maintenance Type</value>
@@ -2923,6 +2930,10 @@
<value xml:lang="th">à¸à¸²à¸£à¸à¸³à¸£à¸¸à¸à¸£à¸±à¸à¸©à¸²</value>
<value xml:lang="zh">ç»´ä¿®ä¿å
»</value>
</property>
+ <property key="AccountingFixedAssetManufacturerId">
+ <value xml:lang="en">Fixed Asset Manufacturer Id</value>
+ <value xml:lang="it">Produttore cespite</value>
+ </property>
<property key="AccountingFixedAssetMessage1">
<value xml:lang="ar">*) Ùارغة, ÙÙ٠اÙØد اÙØ£Ùص٠Ù
٠اÙأص٠اÙثابت Ù
عرض</value>
<value xml:lang="en">*) empty, but maximum from fixed Asset capacity shown</value>
@@ -3497,6 +3508,10 @@
<value xml:lang="it">Valore ereditato</value>
<value xml:lang="nl">Overgenomen waarde</value>
</property>
+ <property key="AccountingInstanceOfProductId">
+ <value xml:lang="en">Instance Of Product Id</value>
+ <value xml:lang="it">Istanza del prodotto</value>
+ </property>
<property key="AccountingInvNr">
<value xml:lang="ar">رÙÙ
اÙÙاتÙرة</value>
<value xml:lang="en">Inv.Nr</value>
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Mon Feb 9 22:13:57 2009
@@ -355,7 +355,7 @@
</entity-options>
</drop-down>
</field>
- <field name="amountToApply" parameter-name="amountApplied" tooltip="${AccountingUiLabels.AccountingLeaveEmptyForMaximumAmount}"><text/></field>
+ <field name="amountToApply" parameter-name="amountApplied" tooltip="${uiLabelMap.AccountingLeaveEmptyForMaximumAmount}"><text/></field>
<field name="invoiceProcessing" use-when=""${uiConfigMap.invoiceProcessing}".equals("Y")"><check/></field>
<field name="invoiceProcessing" use-when=""${uiConfigMap.invoiceProcessing}".equals("N")"><check/></field>
<field name="applyButton" widget-style="smallSubmit">
Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Mon Feb 9 22:13:57 2009
@@ -96,7 +96,7 @@
</decorator-screen>
</widgets>
<fail-widgets>
- <label style="h3">${uiLabelMap.AcccountingViewPermissionError}</label>
+ <label style="h3">${uiLabelMap.AccountingViewPermissionError}</label>
</fail-widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Mon Feb 9 22:13:57 2009
@@ -44,7 +44,7 @@
</widgets>
<fail-widgets>
- <label style="h3">${uiLabelMap.AcccountingViewPermissionError}</label>
+ <label style="h3">${uiLabelMap.AccountingViewPermissionError}</label>
</fail-widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Mon Feb 9 22:13:57 2009
@@ -66,7 +66,7 @@
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
- <label style="h3" text="${uiLabelMap.AcccountingViewPermissionError}"/>
+ <label style="h3" text="${uiLabelMap.AccountingViewPermissionError}"/>
</fail-widgets>
</section>
</decorator-section>
@@ -112,7 +112,7 @@
</section>
</widgets>
<fail-widgets>
- <label style="h3">${uiLabelMap.AcccountingViewPermissionError}</label>
+ <label style="h3">${uiLabelMap.AccountingViewPermissionError}</label>
</fail-widgets>
</section>
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Mon Feb 9 22:13:57 2009
@@ -44,7 +44,7 @@
</section>
</widgets>
<fail-widgets>
- <label style="h3" text="${uiLabelMap.AcccountingViewPermissionError}"/>
+ <label style="h3" text="${uiLabelMap.AccountingViewPermissionError}"/>
</fail-widgets>
</section>
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Mon Feb 9 22:13:57 2009
@@ -59,7 +59,7 @@
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
- <label style="h3" text="${uiLabelMap.AcccountingViewPermissionError}"/>
+ <label style="h3" text="${uiLabelMap.AccountingViewPermissionError}"/>
</fail-widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Mon Feb 9 22:13:57 2009
@@ -80,7 +80,7 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label text="${uiLabelMap.AccountingAcctgTranss}"/>
+ <label text="${uiLabelMap.AccountingAcctgTrans}"/>
</container>
</container>
<container style="screenlet-body">
@@ -100,7 +100,7 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label text="${uiLabelMap.AccountingAcctgTranss}"/>
+ <label text="${uiLabelMap.AccountingAcctgTrans}"/>
</container>
</container>
<container style="screenlet-body">
Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Mon Feb 9 22:13:57 2009
@@ -860,7 +860,7 @@
<sub-hyperlink description="${taxAuthPartyId}" target="/partymgr/control/viewprofile?partyId=${taxAuthPartyId}" target-type="inter-app" link-style="buttontext"/>
</display-entity>
</field>
- <field name="glAccountId" title="${uiLabelMap.${uiLabelMap.AccountingGlAccountId}}">
+ <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
<drop-down allow-empty="false">
<entity-options description="${glAccountId} ${accountName}" entity-name="GlAccountOrganizationAndClass">
<entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Mon Feb 9 22:13:57 2009
@@ -48,10 +48,11 @@
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
- <label style="h3">${uiLabelMap.AcccountingViewPermissionError}</label>
+ <label style="h3">${uiLabelMap.AccountingViewPermissionError}</label>
</fail-widgets>
</section>
</decorator-section>
+
</decorator-screen>
</widgets>
</section>
Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Mon Feb 9 22:13:57 2009
@@ -480,7 +480,7 @@
<menu-item name="AccountReconciliations" title="${uiLabelMap.AccountingAcctRecons}">
<link target="findGlAccountReconciliations?organizationPartyId=${organizationPartyId}"/>
</menu-item>
- <menu-item name="FindAcctgTrans" title="${uiLabelMap.AccountingAcctgTranss}">
+ <menu-item name="FindAcctgTrans" title="${uiLabelMap.AccountingAcctgTrans}">
<link target="FindAcctgTrans?organizationPartyId=${organizationPartyId}"/>
</menu-item>
<menu-item name="FindAcctgTransEntries" title="${uiLabelMap.AccountingAcctgTransEntries}">
Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Mon Feb 9 22:13:57 2009
@@ -230,7 +230,7 @@
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
- <label style="h3" text="${uiLabelMap.AcccountingViewPermissionError}"/>
+ <label style="h3" text="${uiLabelMap.AccountingViewPermissionError}"/>
</fail-widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Mon Feb 9 22:13:57 2009
@@ -93,7 +93,7 @@
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
- <label style="h3" text="${uiLabelMap.AcccountingViewPermissionError}"/>
+ <label style="h3" text="${uiLabelMap.AccountingViewPermissionError}"/>
</fail-widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Mon Feb 9 22:13:57 2009
@@ -19,6 +19,10 @@
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <property key="ContentAbsoluteFile">
+ <value xml:lang="en">Absolute File</value>
+ <value xml:lang="it">File assoluto</value>
+ </property>
<property key="ContentAnswer">
<value xml:lang="ar">اÙجÙاب</value>
<value xml:lang="de">Antwort</value>
@@ -105,6 +109,14 @@
<value xml:lang="th">CMS</value>
<value xml:lang="zh">å
容管çç³»ç»</value>
</property>
+ <property key="ContentCMSAddSubContent">
+ <value xml:lang="en">CMS Content Add Sub Content</value>
+ <value xml:lang="it">CMS aggiungi sotto contenuto</value>
+ </property>
+ <property key="ContentCMSEditPage">
+ <value xml:lang="en">CMS Content Edit Page</value>
+ <value xml:lang="it">CMS aggiorna pagina</value>
+ </property>
<property key="ContentCMSNotExist">
<value xml:lang="de">Es gibt keinen Inhalt PUBLISH_POINT (Veröffentlichungsort) für diese Webseite!</value>
<value xml:lang="en">There is no Content PUBLISH_POINT for this WebSite!</value>
@@ -112,6 +124,10 @@
<value xml:lang="it">Non c'è nessun Contenuto PUBLISH_POINT per questo Sito Web!</value>
<value xml:lang="th">à¹à¸¡à¹à¸¡à¸µà¸«à¸±à¸§à¸à¹à¸ PUBLISH_POINT สำหรัà¸à¹à¸§à¹à¸à¹à¸à¸à¹à¸à¸µà¹</value>
</property>
+ <property key="ContentCMSSearchPage">
+ <value xml:lang="en">CMS Search Page</value>
+ <value xml:lang="it">CMS pagina di ricerca</value>
+ </property>
<property key="ContentCategory">
<value xml:lang="ar">اÙÙئة</value>
<value xml:lang="de">Kategorie</value>
@@ -152,6 +168,10 @@
<value xml:lang="th">à¹à¸à¸à¸ªà¸²à¸£à¸à¸à¸¡à¸à¸´à¸§à¹à¸à¸à¸£à¹</value>
<value xml:lang="zh">åæææ¡£</value>
</property>
+ <property key="ContentCompDocAddDocumentInstancePageForTemplate">
+ <value xml:lang="en">Add Composite Document Instance Page for Template</value>
+ <value xml:lang="it">Aggiungi composizione documenti pagina istanza per template.</value>
+ </property>
<property key="ContentCompDocApprovals">
<value xml:lang="de">Genehmigungen</value>
<value xml:lang="en">Approvals</value>
@@ -296,6 +316,10 @@
<value xml:lang="en">Create New Art.</value>
<value xml:lang="fr">Créer un nouvel article</value>
</property>
+ <property key="ContentDataBaseText">
+ <value xml:lang="en">DataBase Text</value>
+ <value xml:lang="it">Testo database</value>
+ </property>
<property key="ContentDataResource">
<value xml:lang="ar">Ù
Ùرد Ù
عÙÙÙ
ات</value>
<value xml:lang="de">Datenressource</value>
@@ -391,6 +415,10 @@
<value xml:lang="it">Tipo Dati</value>
<value xml:lang="th">à¸à¸£à¸°à¹à¸ à¸à¸à¹à¸à¸¡à¸¹à¸¥</value>
</property>
+ <property key="ContentDocumentType">
+ <value xml:lang="en">Document Type</value>
+ <value xml:lang="it">Tipo documento</value>
+ </property>
<property key="ContentEditProductStore">
<value xml:lang="ar">تØرÙر Ù
خز٠اÙÙ
ÙتÙج</value>
<value xml:lang="de">Produktladen bearbeiten</value>
@@ -435,6 +463,14 @@
<value xml:lang="th">à¹à¸à¸¥à¹ Path</value>
<value xml:lang="zh">æ件路å¾</value>
</property>
+ <property key="ContentFileRelToOFBizHome">
+ <value xml:lang="en">File Rel. to OFBIZ_HOME</value>
+ <value xml:lang="it">File relativo alla OFBIZ_HOME</value>
+ </property>
+ <property key="ContentFileRelToWebappRoot">
+ <value xml:lang="en">File Rel. to webapp root</value>
+ <value xml:lang="it">File relativo alla webapp root</value>
+ </property>
<property key="ContentForum">
<value xml:lang="ar">Ù
ÙتدÙ</value>
<value xml:lang="de">Forum</value>
@@ -524,6 +560,10 @@
<value xml:lang="it">Discussione</value>
<value xml:lang="th">Thread</value>
</property>
+ <property key="ContentGIF">
+ <value xml:lang="en">GIF</value>
+ <value xml:lang="it">GIF</value>
+ </property>
<property key="ContentGoToContent">
<value xml:lang="en">Go to Content</value>
<value xml:lang="fr">Aller au contenu</value>
@@ -540,6 +580,10 @@
<value xml:lang="th">à¹à¸à¸¢à¸±à¸à¹à¸«à¸¥à¹à¸à¸à¸µà¹à¸¡à¸²à¸à¸à¸à¸à¹à¸à¸¡à¸¹à¸¥</value>
<value xml:lang="zh">转å°æ°æ®èµæº</value>
</property>
+ <property key="ContentGoToFind">
+ <value xml:lang="en">Goto Find"</value>
+ <value xml:lang="it">Torna alla ricerca</value>
+ </property>
<property key="ContentHtml">
<value xml:lang="ar">Html</value>
<value xml:lang="de">Html</value>
@@ -551,6 +595,10 @@
<value xml:lang="th">Html</value>
<value xml:lang="zh">Html</value>
</property>
+ <property key="ContentHtmlText">
+ <value xml:lang="en">Html Text</value>
+ <value xml:lang="it">Teso html</value>
+ </property>
<property key="ContentImage">
<value xml:lang="ar">صÙرة</value>
<value xml:lang="de">Bild</value>
@@ -594,6 +642,10 @@
<value xml:lang="th">à¸à¸±à¸à¸à¸µà¹à¸à¹à¸²à¸ªà¸¹à¹à¸£à¸«à¸±à¸ª</value>
<value xml:lang="zh">为è¾å
¥çæ è¯å»ºç«ç´¢å¼</value>
</property>
+ <property key="ContentJPEG">
+ <value xml:lang="en">JPEG</value>
+ <value xml:lang="it">JPEG</value>
+ </property>
<property key="ContentLayout">
<value xml:lang="ar">اÙÙضعÙØ©</value>
<value xml:lang="de">Layout</value>
@@ -672,6 +724,10 @@
<value xml:lang="it">Tipo Mime Template</value>
<value xml:lang="th">รูà¸à¹à¸à¸à¸à¸£à¸°à¹à¸ à¸à¹à¸à¸à¸à¸³à¸¥à¸à¸</value>
</property>
+ <property key="ContentMSWord">
+ <value xml:lang="en">MS Word</value>
+ <value xml:lang="it">MS Word</value>
+ </property>
<property key="ContentNavigate">
<value xml:lang="de">Navigieren</value>
<value xml:lang="en">Navigate</value>
@@ -699,6 +755,14 @@
<value xml:lang="th">หัวà¸à¹à¸ PDF</value>
<value xml:lang="zh">PDFå
容æ è¯</value>
</property>
+ <property key="ContentPDFSurveyName">
+ <value xml:lang="en">PDF/Survey Name</value>
+ <value xml:lang="it">PDF/Nome sondaggio</value>
+ </property>
+ <property key="ContentPDFFilePath">
+ <value xml:lang="en">Enter a PDF file path to automatically create a survey.</value>
+ <value xml:lang="it">Inserire un path file PDF che automaticamente creerà un sondaggio.</value>
+ </property>
<property key="ContentParent">
<value xml:lang="de">Ãbergeordneter Inhalt</value>
<value xml:lang="en">Parent Content</value>
@@ -727,6 +791,18 @@
<value xml:lang="fr">Liste d'alias de chemin d'accès</value>
<value xml:lang="it">Lista path alias</value>
</property>
+ <property key="ContentPDFFile">
+ <value xml:lang="en">PDF File</value>
+ <value xml:lang="it">File PDF</value>
+ </property>
+ <property key="ContentPlainText">
+ <value xml:lang="en">Plain Text</value>
+ <value xml:lang="it">Testo fisso</value>
+ </property>
+ <property key="ContentPNG">
+ <value xml:lang="en">PNG</value>
+ <value xml:lang="it">PNG</value>
+ </property>
<property key="ContentQueryLine">
<value xml:lang="ar">أدخ٠Ù
تغÙرات اÙÙ
سأÙØ©</value>
<value xml:lang="de">Geben Sie die Suchparamter an</value>
@@ -1126,6 +1202,22 @@
<value xml:lang="th">รูà¸à¹à¸à¸</value>
<value xml:lang="zh">模æ¿</value>
</property>
+ <property key="ContentTemplateChild">
+ <value xml:lang="en">Template Child</value>
+ <value xml:lang="it">Template figlio</value>
+ </property>
+ <property key="ContentTemplateInstanceChild">
+ <value xml:lang="en">Instance Child</value>
+ <value xml:lang="it">Istanza figlia</value>
+ </property>
+ <property key="ContentTemplateRoot">
+ <value xml:lang="en">Root Template</value>
+ <value xml:lang="it">Template principale</value>
+ </property>
+ <property key="ContentTemplateRootInstance">
+ <value xml:lang="en">Root Instance</value>
+ <value xml:lang="it">Istanza principale</value>
+ </property>
<property key="ContentTemplates">
<value xml:lang="ar">ÙÙ
اذج</value>
<value xml:lang="de">Vorlagen</value>
@@ -1146,6 +1238,10 @@
<value xml:lang="th">à¸à¸±à¸§à¸à¸±à¸à¸©à¸£</value>
<value xml:lang="zh">ææ¬</value>
</property>
+ <property key="ContentTIFF">
+ <value xml:lang="en">TIFF</value>
+ <value xml:lang="it">TIFF</value>
+ </property>
<property key="ContentTree">
<value xml:lang="ar">شجرة</value>
<value xml:lang="de">Baum</value>
Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl Mon Feb 9 22:13:57 2009
@@ -156,7 +156,7 @@
</tr>
<tr>
<td colspan="1">
- <input type="submit" name="submitBtn" value="Update"/>
+ <input type="submit" name="submitBtn" value="${uiLabelMap.CommonUpdate}"/>
</td>
</tr>
</table>
Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml Mon Feb 9 22:13:57 2009
@@ -42,9 +42,9 @@
</actions>
<field name="editContent" title="${uiLabelMap.CommonEmptyHeader}">
- <hyperlink also-hidden="false" description="Edit" target="EditAddContent?MASTER_contentId=${contentId}&MASTER_drDataResourceId=${drDataResourceId}&MASTER_caContentIdTo=${caContentIdTo}&MASTER_caContentAssocTypeId=${caContentAssocTypeId}&MASTER_caFromDate=${caFromDate}"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditAddContent?MASTER_contentId=${contentId}&MASTER_drDataResourceId=${drDataResourceId}&MASTER_caContentIdTo=${caContentIdTo}&MASTER_caContentAssocTypeId=${caContentAssocTypeId}&MASTER_caFromDate=${caFromDate}"/>
<!--
- <hyperlink also-hidden="false" description="Edit" target="EditContent?caContentIdTo=${caContentIdTo}&caFromDate=${caFromDate}&contentId=${contentId}&drDataResourceId=${drDataResourceId}&caContentId=${contentId}&contentIdStart=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContent?caContentIdTo=${caContentIdTo}&caFromDate=${caFromDate}&contentId=${contentId}&drDataResourceId=${drDataResourceId}&caContentId=${contentId}&contentIdStart=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}"/>
-->
</field>
<field name="caContentIdTo"><display/></field>
@@ -380,7 +380,7 @@
<form name="searchList" type="list" target="" list-name="queryResults" paginate-target="/AdminSearch"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="editContent" title="${uiLabelMap.CommonEmptyHeader}">
- <hyperlink also-hidden="false" description="Edit" target="CMSContentEdit?contentId=${contentId}&drDataResourceId=${drDataResourceId}&contentIdTo=${contentIdTo}"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit?contentId=${contentId}&drDataResourceId=${drDataResourceId}&contentIdTo=${contentIdTo}"/>
</field>
<field name="contentId"><display/></field>
<field name="dataResourceId"><display/></field>
Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl Mon Feb 9 22:13:57 2009
@@ -190,7 +190,7 @@
<#if 0 < mostRecentList?size >
<tr>
<td colspan="5">
- <input type="submit" name="submitBtn" value="Update"/>
+ <input type="submit" name="submitBtn" value="${uiLabelMap.CommonUpdate}"/>
</td>
</tr>
</#if>
@@ -252,7 +252,7 @@
</tr>
<tr>
<td>
- <input type="submit" name="submitBtn" value="Update"/>
+ <input type="submit" name="submitBtn" value="${uiLabelMap.CommonUpdate}"/>
</td>
</tr>
</table>
Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Mon Feb 9 22:13:57 2009
@@ -110,30 +110,30 @@
</field>
<field name="drDataResourceTypeId" >
<drop-down no-current-selected-key="LOCAL_FILE">
- <option key="LOCAL_FILE" description="Absolute File"/>
- <option key="OFBIZ_FILE" description="File Rel. to OFBIZ_HOME"/>
- <option key="CONTEXT_FILE" description="File Rel. to webapp root"/>
- <option key="ELECTRONIC_TEXT" description="DB TEXT"/>
+ <option key="LOCAL_FILE" description="${uiLabelMap.ContentAbsoluteFile}"/>
+ <option key="OFBIZ_FILE" description="${uiLabelMap.ContentFileRelToOFBizHome}"/>
+ <option key="CONTEXT_FILE" description="${uiLabelMap.ContentFileRelToWebappRoot}"/>
+ <option key="ELECTRONIC_TEXT" description="${uiLabelMap.ContentDataBaseText}"/>
</drop-down>
</field>
<field name="drMimeTypeId" >
<drop-down no-current-selected-key="text/html">
- <option key="text/html" description="Html Text" />
- <option key="text/plain" description="Plain Text" />
+ <option key="text/html" description="${uiLabelMap.ContentHtmlText}" />
+ <option key="text/plain" description="${uiLabelMap.ContentPlainText}" />
</drop-down>
</field>
<field name="drDataResourceTypeId" >
<drop-down no-current-selected-key="LOCAL_FILE">
- <option key="LOCAL_FILE" description="Absolute File"/>
- <option key="OFBIZ_FILE" description="File Rel. to OFBIZ_HOME"/>
- <option key="CONTEXT_FILE" description="File Rel. to webapp root"/>
- <option key="ELECTRONIC_TEXT" description="DB TEXT"/>
+ <option key="LOCAL_FILE" description="${uiLabelMap.ContentAbsoluteFile}"/>
+ <option key="OFBIZ_FILE" description="${uiLabelMap.ContentFileRelToOFBizHome}"/>
+ <option key="CONTEXT_FILE" description="${uiLabelMap.ContentFileRelToWebappRoot}"/>
+ <option key="ELECTRONIC_TEXT" description="${uiLabelMap.ContentDataBaseText}"/>
</drop-down>
</field>
<field name="drMimeTypeId" >
<drop-down no-current-selected-key="text/html">
- <option key="text/html" description="Html Text" />
- <option key="text/plain" description="Plain Text" />
+ <option key="text/html" description="${uiLabelMap.ContentHtmlText}" />
+ <option key="text/plain" description="${uiLabelMap.ContentPlainText}" />
</drop-down>
</field>
<field name="drObjectInfo" title="File Path">
@@ -142,7 +142,7 @@
<field name="textData" title="Text (Use '<>' to enter plain text)" id-name="textData">
<textarea rows="24" cols="80" />
</field>
- <field name="submitButton" title="Create" widget-style="smallSubmit">
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
</form>
@@ -164,7 +164,7 @@
</field>
<field name="contentName"><display/></field>
<field name="description"><display/></field>
- <field name="drObjectInfo" title="Template File"><display/></field>
+ <field name="drObjectInfo"><display/></field>
<!--
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeLayout?contentId=${contentId}&contentIdTo=${contentIdTo}&contentAssocTypeId=${contentAssocTypeId}&fromDate=${fromDate}"/>
@@ -179,7 +179,7 @@
</field>
<field name="contentName"><display/></field>
<field name="description"><display/></field>
- <field name="drObjectInfo" title="Template File"><display/></field>
+ <field name="drObjectInfo"><display/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeLayout?contentId=${contentId}&contentIdTo=${caContentIdTo}&contentAssocTypeId=${caContentAssocTypeId}&fromDate=${caFromDate}"/>
</field>
@@ -242,7 +242,7 @@
<field name="lastModifiedDate" position="2">
<display/>
</field>
- <field name="submitButton" title="Update" widget-style="smallSubmit">
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
</form>
@@ -271,7 +271,7 @@
<field name="lastModifiedDate" position="2">
<display/>
</field>
- <field name="submitButton" title="Update" widget-style="smallSubmit">
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
</form>
@@ -283,10 +283,10 @@
</field>
<field name="drMimeTypeId" >
<drop-down>
- <option key="image/gif" description="GIF" />
- <option key="image/jpeg" description="JPEG" />
- <option key="image/png" description="PNG" />
- <option key="image/tiff" description="TIFF" />
+ <option key="image/gif" description="${uiLabelMap.ContentGIF}"/>
+ <option key="image/jpeg" description="${uiLabelMap.ContentJPEG}"/>
+ <option key="image/png" description="${uiLabelMap.ContentPNG}"/>
+ <option key="image/tiff" description="${uiLabelMap.ContentTIFF}"/>
</drop-down>
</field>
<field name="drObjectInfo" title="Image File Name">
@@ -307,7 +307,7 @@
<field name="lastModifiedDate" position="2">
<display/>
</field>
- <field name="submitButton" title="Update" widget-style="smallSubmit">
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
</form>
@@ -321,10 +321,10 @@
</field>
<field name="drMimeTypeId" >
<drop-down>
- <option key="image/gif" description="GIF" />
- <option key="image/jpeg" description="JPEG" />
- <option key="image/png" description="PNG" />
- <option key="image/tiff" description="TIFF" />
+ <option key="image/gif" description="${uiLabelMap.ContentGIF}" />
+ <option key="image/jpeg" description="${uiLabelMap.ContentJPEG}" />
+ <option key="image/png" description="${uiLabelMap.ContentPNG}" />
+ <option key="image/tiff" description="${uiLabelMap.ContentTIFF}" />
</drop-down>
</field>
<field name="drObjectInfo" title="Image File Name">
@@ -333,7 +333,7 @@
<field name="imageData" entity-name="ImageDataResource">
<file />
</field>
- <field name="submitButton" title="Create" widget-style="smallSubmit">
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
</form>
@@ -362,18 +362,18 @@
<field name="lastModifiedDate" position="2">
<display/>
</field>
- <field name="submitButton" title="Update" widget-style="smallSubmit">
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
</form>
<form name="ListRelatedLayouts" default-entity-name="ContentDataResourceView" list-name="entityList" target="" title="" type="list" paginate-target="FindLayout"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <field name="contentId" title="Edit" widget-style="buttontext">
+ <field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${contentId}" target="EditLayout?contentId=${contentId}&drDataResourceId=${drDataResourceId}"/>
</field>
<field name="contentName"><display/></field>
<field name="description"><display/></field>
- <field name="drObjectInfo" title="Template File"><display/></field>
+ <field name="drObjectInfo"><display/></field>
</form>
<form name="EditLayoutSubContent" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutSubContent" title="" type="single"
@@ -397,10 +397,10 @@
</field>
<field name="drDataResourceTypeId" >
<drop-down no-current-selected-key="ELECTRONIC_TEXT">
- <option key="LOCAL_FILE" description="Absolute File"/>
- <option key="OFBIZ_FILE" description="File Rel. to OFBIZ_HOME"/>
- <option key="CONTEXT_FILE" description="File Rel. to webapp root"/>
- <option key="ELECTRONIC_TEXT" description="DataBase Text"/>
+ <option key="LOCAL_FILE" description="${uiLabelMap.ContentAbsoluteFile}"/>
+ <option key="OFBIZ_FILE" description="${uiLabelMap.ContentFileRelToOFBizHome}"/>
+ <option key="CONTEXT_FILE" description="${uiLabelMap.ContentFileRelToWebappRoot}"/>
+ <option key="ELECTRONIC_TEXT" description="${uiLabelMap.ContentDataBaseText}"/>
</drop-down>
</field>
<field name="drDataTemplateTypeId" >
@@ -411,14 +411,14 @@
</field>
<field name="drMimeTypeId">
<drop-down no-current-selected-key="text/html">
- <option key="text/html" description="Html Text" />
- <option key="text/plain" description="Plain Text" />
+ <option key="text/html" description="${uiLabelMap.ContentHtmlText}" />
+ <option key="text/plain" description="${uiLabelMap.ContentPlainText}" />
</drop-down>
</field>
- <field name="drObjectInfo" title="${UiLabelMap.ContentFilePath}">
+ <field name="drObjectInfo" title="${uiLabelMap.ContentFilePath}">
<text />
</field>
- <field name="textData" id-name="textData">
+ <field name="textData" id-name="textData" title="${uiLabelMap.FormFieldTitle_textDataTitle}">
<textarea rows="24" cols="80" default-value="${context.textData}"/>
</field>
<field name="createdByUserLogin" position="1">
Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl Mon Feb 9 22:13:57 2009
@@ -123,7 +123,7 @@
</tr>
<tr><td colspan="2"> </td></tr>
<tr>
- <td colspan="2" align="center"><input id="submit" type="button" onclick="javascript:saveMetaInfo(cmsmetaform);" class="smallSubmit" value="Save"/></td>
+ <td colspan="2" align="center"><input id="submit" type="button" onclick="javascript:saveMetaInfo(cmsmetaform);" class="smallSubmit" value="${uiLabeMap.CommonSave}"/></td>
</tr>
</table>
</form>
\ No newline at end of file
Modified: ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Mon Feb 9 22:13:57 2009
@@ -135,7 +135,7 @@
<screen name="EditAddContent">
<section>
<actions>
- <set field="title" value="CMS Content Edit Page"/>
+ <set field="titleProperty" value="ContentCMSEditPage"/>
<set field="entityOperation" value="_UPDATE"/>
<set field="targetOperation" value="CONTENT_UPDATE|CONTENT_CREATE|CONTENT_CREATE_SUB"/>
<set field="requiredRoles" value="OWNER|BLOG_AUTHOR|BLOG_EDITOR|BLOG_ADMIN|BLOG_PUBLISHER"/>
@@ -165,13 +165,13 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label text="CMS Content Edit Page"/>
+ <label text="${uiLabelMap.ContentCMSEditPage}"/>
</container>
</container>
<container style="screenlet-body">
<section>
<widgets>
- <link text="Goto Find" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&${CMSContentFindQueryString}" style="tabletext"/>
+ <link text="${uiLabelMap.ContentGoToFind}" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&${CMSContentFindQueryString}" style="tabletext"/>
<include-form name="EditAddContentStuff" location="component://content/webapp/content/cms/CMSForms.xml" />
<content content-id="${contentId}" enable-edit-name="notfound" edit-request="EditAddSubContent?MASTER_contentId=${MASTER_contentId}&MASTER_caContentIdTo=${MASTER_caContentIdTo}&MASTER_caContentAssocTypeId=${MASTER_caContentAssocTypeId}&MASTER_caFromDate=${MASTER_caFromDate}&MASTER_drDataResourceId=${MASTER_drDataResourceId}&caContentIdTo=${caContentIdTo}"/>
</widgets>
@@ -187,7 +187,7 @@
<screen name="EditAddSubContent">
<section>
<actions>
- <set field="title" value="CMS Content Add Sub Content"/>
+ <set field="titleProperty" value="ContentCMSAddSubContent"/>
<set field="entityOperation" value="_UPDATE"/>
<set field="targetOperation" value="CONTENT_UPDATE|CONTENT_CREATE|CONTENT_CREATE_SUB"/>
<set field="requiredRoles" value="OWNER|BLOG_AUTHOR|BLOG_EDITOR|BLOG_ADMIN|BLOG_PUBLISHER"/>
@@ -211,13 +211,13 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label text="CMS Content Add Sub Content"/>
+ <label text="${uiLabelMap.ContentCMSAddSubContent}"/>
</container>
</container>
<container style="screenlet-body">
<section>
<widgets>
- <link text="Goto Find" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&${CMSContentFindQueryString}" style="tabletext"/>
+ <link text="${uiLabelMap.ContentGoToFind}" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&${CMSContentFindQueryString}" style="tabletext"/>
<include-form name="EditAddSubContentStuff" location="component://content/webapp/content/cms/CMSForms.xml" />
</widgets>
</section>
@@ -235,8 +235,7 @@
<script location="component://content/widget/GetMenuContext.groovy"/>
<script location="component://content/webapp/content/WEB-INF/actions/cms/AdvancedSearchPrep.groovy"/>
<script location="component://content/webapp/content/WEB-INF/actions/cms/Search.groovy"/>
- <set field="title" value="CMS Search Page"/>
- <set field="titleProperty" value="PageTitleSearchContent"/>
+ <set field="titleProperty" value="ContentCMSSearchPage"/>
<set field="currentCMSMenuItemName" value="search" to-scope="user"/>
<property-map map-name="uiLabelMap" resource="ProductUiLabels"/>
</actions>
@@ -246,7 +245,7 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label text="CMS Search Page"/>
+ <label text="${uiLabelMap.ContentCMSSearchPage}"/>
</container>
</container>
<container style="screenlet-body">
@@ -273,8 +272,7 @@
<section>
<actions>
<script location="component://content/widget/GetMenuContext.groovy"/>
- <set field="title" value="CMS Search Page"/>
- <set field="titleProperty" value="PageTitleSearchContent"/>
+ <set field="titleProperty" value="ContentCMSSearchPage"/>
<set field="currentCMSMenuItemName" value="index" to-scope="user"/>
</actions>
<widgets>
@@ -283,7 +281,7 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label text="CMS Search Page"/>
+ <label text="${uiLabelMap.ContentCMSSearchPage}"/>
</container>
</container>
<container style="screenlet-body">
@@ -305,8 +303,7 @@
<section>
<actions>
<script location="component://content/widget/GetMenuContext.groovy"/>
- <set field="title" value="CMS Search Page"/>
- <set field="titleProperty" value="PageTitleSearchContent"/>
+ <set field="titleProperty" value="ContentCMSSearchPage"/>
<set field="forumId" from-field="parameters.contentId"/>
<set field="defaultSiteId" value="WebStoreFORUM"/>
<set field="currentCMSMenuItemName" value="subsites" to-scope="user"/>
@@ -319,7 +316,7 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label text="CMS Search Page"/>
+ <label text="${uiLabelMap.ContentCMSSearchPage}"/>
</container>
</container>
<container style="screenlet-body">
Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Mon Feb 9 22:13:57 2009
@@ -28,10 +28,10 @@
<field name="contentName"><text-find/></field>
<field name="contentTypeId">
<drop-down no-current-selected-key="COMPDOC_TEMPLATE">
- <option key="COMPDOC_TEMPLATE" description="Root Template"/>
- <option key="COMPDOC_INSTANCE" description="Root Instance"/>
- <option key="TEMPLATE" description="Template Child"/>
- <option key="DOCUMENT" description="Instance Child"/>
+ <option key="COMPDOC_TEMPLATE" description="${uiLabelMap.ContentTemplateRoot}"/>
+ <option key="COMPDOC_INSTANCE" description="${uiLabelMap.ContentTemplateRootInstance}"/>
+ <option key="TEMPLATE" description="${uiLabelMap.ContentTemplateChild}"/>
+ <option key="DOCUMENT" description="${uiLabelMap.ContentTemplateInstanceChild}"/>
</drop-down>
</field>
<!-- <field name="rootonly" map-name="dummy" title="Root CompDocs Only"><check/></field> -->
@@ -73,12 +73,12 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="contentId"><display/></field>
<field name="contentName"><display/></field>
- <field name="rootContentId" title="Content Id To"><display/></field>
- <field name="caContentAssocTypeId" title="Content Assoc Type ID"><display/></field>
- <field name="caFromDate" title="From Date"><display/></field>
+ <field name="rootContentId" title="${uiLabelMap.FormFieldTitle_contentIdTo}"><display/></field>
+ <field name="caContentAssocTypeId" title="${uiLabelMap.FormFieldTitle_contentAssocTypeId}"><display/></field>
+ <field name="caFromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
<field name="caThruDate"><hidden/></field>
<field name="editTemplate" widget-style="buttontext">
- <hyperlink also-hidden="false" description="Edit" target="EditRootCompDoc?rootContentId=${contentId}"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc?rootContentId=${contentId}"/>
</field>
<field name="templateTree" widget-style="buttontext">
<hyperlink also-hidden="false" description="Tree" target="ViewCompDocInstanceTree?rootContentId=${contentId}"/>
@@ -320,27 +320,27 @@
<field name="thruDate"><date-time/></field>
<field name="sequenceNum"><text/></field>
- <field name="mimeTypeId" title="Document Type" use-when=""DOCUMENT".equals(contentTypeId) && "SURVEY".equals(templateDataResourceTypeId)">
+ <field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}" use-when=""DOCUMENT".equals(contentTypeId) && "SURVEY".equals(templateDataResourceTypeId)">
<hidden value="application/vnd.ofbiz.survey.response"/>
</field>
- <field name="displayMimeTypeId" map-name="empty" title="Document Type" use-when=""DOCUMENT".equals(contentTypeId) && "SURVEY".equals(templateDataResourceTypeId)" widget-style="tabletext">
+ <field name="displayMimeTypeId" map-name="empty" title="${uiLabelMap.ContentDocumentType}" use-when=""DOCUMENT".equals(contentTypeId) && "SURVEY".equals(templateDataResourceTypeId)" widget-style="tabletext">
<display description="Survey Response"/>
</field>
- <field name="mimeTypeId" title="Document Type" use-when=""DOCUMENT".equals(contentTypeId) && !"SURVEY".equals(templateDataResourceTypeId)" widget-style="tabletext">
+ <field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}" use-when=""DOCUMENT".equals(contentTypeId) && !"SURVEY".equals(templateDataResourceTypeId)" widget-style="tabletext">
<display-entity entity-name="MimeType" description="${description}"/>
</field>
- <field name="mimeTypeId" title="Document Type" use-when=""TEMPLATE".equals(contentTypeId)" widget-style="smallSelect">
+ <field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}" use-when=""TEMPLATE".equals(contentTypeId)" widget-style="smallSelect">
<drop-down allow-empty="false">
- <option key="application/msword" description="MS Word"/>
- <option key="application/pdf" description="PDF File"/>
- <option key="application/vnd.ofbiz.survey" description="Survey"/>
- <option key="text/html" description="HTML Text"/>
- <option key="text/plain" description="Plain Text"/>
- <option key="image/jpeg" description="JPEG"/>
- <option key="image/gif" description="GIF"/>
- <option key="image/tiff" description="TIFF"/>
- <option key="image/png" description="PNG"/>
- <option key="application/octet-stream" description="Other"/>
+ <option key="application/msword" description="${uiLabelMap.ContentMSWord}"/>
+ <option key="application/pdf" description="${uiLabelMap.ContentPDFFile}"/>
+ <option key="application/vnd.ofbiz.survey" description="${uiLabelMap.ContentSurvey}"/>
+ <option key="text/html" description="${uiLabelMap.ContentHtmlText}"/>
+ <option key="text/plain" description="${uiLabelMap.ContentPlainText}"/>
+ <option key="image/jpeg" description="${uiLabelMap.ContentJPEG}"/>
+ <option key="image/gif" description="${uiLabelMap.ContentGIF}"/>
+ <option key="image/tiff" description="${uiLabelMap.ContentTIFF}"/>
+ <option key="image/png" description="${uiLabelMap.ContentPNG}"/>
+ <option key="application/octet-stream" description="${uiLabelMap.ContentResourceOther}"/>
</drop-down>
</field>
<field name="rootContentId"><hidden/></field>
@@ -363,16 +363,16 @@
<field name="mimeTypeId" map-name="dataResource" widget-style="tabletext"
use-when=""TEMPLATE".equals(contentTypeId)">
<drop-down allow-empty="false">
- <option key="application/msword" description="MS Word"/>
- <option key="application/pdf" description="PDF File"/>
- <option key="application/vnd.ofbiz.survey" description="Survey"/>
- <option key="text/html" description="HTML Text"/>
- <option key="text/plain" description="Plain Text"/>
- <option key="image/jpeg" description="JPEG"/>
- <option key="image/gif" description="GIF"/>
- <option key="image/tiff" description="TIFF"/>
- <option key="image/png" description="PNG"/>
- <option key="application/octet-stream" description="Other"/>
+ <option key="application/msword" description="${uiLabelMap.ContentMSWord}"/>
+ <option key="application/pdf" description="${uiLabelMap.ContentPDFFile}"/>
+ <option key="application/vnd.ofbiz.survey" description="${uiLabelMap.ContentSurvey}"/>
+ <option key="text/html" description="${uiLabelMap.ContentHtmlText}"/>
+ <option key="text/plain" description="${uiLabelMap.ContentPlainText}"/>
+ <option key="image/jpeg" description="${uiLabelMap.ContentJPEG}"/>
+ <option key="image/gif" description="${uiLabelMap.ContentGIF}"/>
+ <option key="image/tiff" description="${uiLabelMap.ContentTIFF}"/>
+ <option key="image/png" description="${uiLabelMap.ContentPNG}"/>
+ <option key="application/octet-stream" description="${uiLabelMap.ContentResourceOther}"/>
</drop-down>
</field>
<field name="mimeTypeId" map-name="dataResource" widget-style="tabletext"
@@ -425,11 +425,11 @@
<field name="instanceOfContentId" map-name="itemContent" use-when="contentTypeId.equals("DOCUMENT")" title="Instance of Content" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field>
<field name="contentIdTo" widget-style="tabletext" title="Parent Content ID"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field>
<field name="contentAssocTypeId" widget-style="tabletext"><display-entity entity-name="ContentAssocType" also-hidden="false"/></field>
- <field name="fromDate" title="From Date" widget-style="tabletext"><display/></field>
- <field name="thruDate" title="Thru Date"><display/></field>
+ <field name="fromDate" title="${uiLabelMap.CommonFromDate}" widget-style="tabletext"><display/></field>
+ <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
<field name="sequenceNum" title="Sequence Num"><display/></field>
- <field name="mimeTypeId" map-name="dataResource" title="Document Type" widget-style="tabletext">
+ <field name="mimeTypeId" map-name="dataResource" title="${uiLabelMap.ContentDocumentType}" widget-style="tabletext">
<display-entity entity-name="MimeType" key-field-name="mimeTypeId" description="${description}"/>
</field>
<field name="relatedDetailId" map-name="dataResource" title="Survey ID" use-when="dataResource!=null&&"SURVEY".equals(dataResource.getString("dataResourceTypeId"))">
@@ -472,7 +472,7 @@
<field name="contentApprovalId"><display/></field>
<field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="approvalCount > 0">
- <hyperlink also-hidden="false" description="Edit" target="EditContentRevisionItem?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&itemContentId=${itemContentId}&rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContentRevisionItem?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&itemContentId=${itemContentId}&rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
</field>
<field name="create" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="Create" target="EditContentRevisionItem"/>
@@ -506,8 +506,8 @@
<field name="dataResourceTypeId" map-name="dataResource"><hidden/></field>
<field name="mimeTypeId" map-name="dataResource"><hidden/></field>
<!-- <field name="objectInfo" title="File Name" map-name="dataResource"><display also-hidden="false"/></field> -->
- <field name="pdfName" title="PDF/Survey Name"><text/></field>
- <field name="imageData" title="Enter a PDF file path to automatically create a survey."><file size="60"/></field>
+ <field name="pdfName" title="${uiLabelMap.ContentPDFSurveyName}"><text/></field>
+ <field name="imageData" title="${uiLabelMap.ContentPDFFilePath}"><file size="60"/></field>
<field name="rootContentId"><hidden/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpload}" widget-style="smallSubmit"><submit/></field>
</form>
@@ -523,7 +523,7 @@
<field name="dataResourceId" map-name="dataResource"><hidden/></field>
<field name="dataResourceTypeId" map-name="dataResource"><hidden/></field>
<field name="mimeTypeId" map-name="dataResource"><hidden/></field>
- <field name="textData" title="Text Data"><textarea rows="30" cols="60"/></field>
+ <field name="textData" title="${uiLabelMap.FormFieldTitle_textDataTitle}"><textarea rows="30" cols="60"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit/></field>
</form>
@@ -538,7 +538,7 @@
<field name="dataResourceId" map-name="dataResource"><hidden/></field>
<field name="dataResourceTypeId" map-name="dataResource"><hidden/></field>
<field name="mimeTypeId" map-name="dataResource"><hidden/></field>
- <field name="objectInfo" title="Survey Id"><lookup target-form-name="LookupSurvey"/></field>
+ <field name="objectInfo" title="${uiLabelMap.ContentSurveySurveyId}"><lookup target-form-name="LookupSurvey"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit/></field>
</form>
</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml Mon Feb 9 22:13:57 2009
@@ -83,7 +83,7 @@
</condition>
<link target="ViewCompDocInstanceTree?rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
- <menu-item name="edit" title="Edit">
+ <menu-item name="edit" title="${uiLabelMap.CommonEdit}">
<link target="EditChildCompDoc?contentId=${contentId}&itemContentRevisionSeqId=${itemContentRevisionSeqId}&rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}&caFromDate=${parameters.caFromDate}"/>
</menu-item>
</menu>
@@ -93,7 +93,7 @@
<menu-item name="edit-inplace" title="${contentName}[${contentId}]" widget-style="h2">
<link target="EditRootCompDoc?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
- <menu-item name="edit-link" title="Edit">
+ <menu-item name="edit-link" title="${uiLabelMap.CommonEdit}">
<link target="EditRootCompDoc?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<menu-item name="child" title="+Child">
@@ -122,7 +122,7 @@
<menu-item name="edit-inplace" title="${contentName} [${contentId}]">
<link target="EditChildCompDoc?contentId=${contentId}&rootContentId=${rootContentId}&caFromDate=${fromDate}&contentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
- <menu-item name="edit-link" title="Edit">
+ <menu-item name="edit-link" title="${uiLabelMap.CommonEdit}">
<link target="EditChildCompDoc?contentId=${contentId}&rootContentId=${rootContentId}&caFromDate=${fromDate}&contentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<!-- only one level for now, ie don't worry about an hierarchy, still not sure what that will mean or look like
@@ -160,7 +160,7 @@
<menu-item name="edit-inplace" title="${instanceContent.contentName}[${instanceContent.contentId}]" widget-style="h2">
<link target="EditRootCompDoc?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
- <menu-item name="edit" title="Edit">
+ <menu-item name="edit" title="${uiLabelMap.CommonEdit}">
<link target="EditRootCompDoc?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<menu-item name="viewtree" title="View Template Tree">
Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Mon Feb 9 22:13:57 2009
@@ -417,7 +417,7 @@
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
<container>
- <link target="FindCompDoc?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="Find" style="buttontext"/>
+ <link target="FindCompDoc?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="${uiLabelMap.CommonFind}" style="buttontext"/>
<link target="AddRootCompDocTemplate?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="Create New Root CompDoc Template" style="buttontext"/>
</container>
</decorator-section>
@@ -932,7 +932,7 @@
<set from-field="templateContent.contentName" field="contentName"/>
<set field="menuName" value="tree"/>
- <set field="title" value="Add Composite Document Instance Page for Template: ${rootContentId}"/>
+ <set field="title" value="${uiLabelMap.ContentCompDocAddDocumentInstancePageForTemplate}: ${rootContentId}"/>
</actions>
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
@@ -1042,7 +1042,7 @@
<set from-field="parameters.rootContentRevisionSeqId" default-value="${mostRecentRevisionSeqId}" field="rootContentRevisionSeqId"/>
<set field="menuName" value="tree"/>
- <set field="title" value="Root Template ${rootContentId}, rev. ${rootContentRevisionSeqId}"/>
+ <set field="title" value="${uiLabelMap.ContentTemplateRoot} ${rootContentId}, ${uiLabelMap.ContentCompDocRev} ${rootContentRevisionSeqId}"/>
<set field="currentMenuItemName" value="viewtree"/>
</actions>
<widgets>
Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Mon Feb 9 22:13:57 2009
@@ -178,7 +178,7 @@
<entity-options description="${description}" entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId"/>
</drop-down>
</field>
- <field name="submitButton" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="contentTypeId">
<drop-down allow-empty="false">
<entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId"/>
Modified: ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml Mon Feb 9 22:13:57 2009
@@ -25,7 +25,7 @@
<menu-item name="adddataresource" title="Add" >
<link target="AddDataResource" name="AddDataResource" target-window="_top" style="tabButton" />
</menu-item>
- <menu-item name="finddataresource" title="Find" >
+ <menu-item name="finddataresource" title="${uiLabelMap.CommonFind}" >
<link target="FindDataResource" name="FindDataResource" target-window="_top" style="tabButton" />
</menu-item>
<menu-item name="browsedataresource" title="Browse" >
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=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/ContentForms.xml (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/ContentForms.xml Mon Feb 9 22:13:57 2009
@@ -30,7 +30,7 @@
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"
paginate-target="/AdminSearch">
<field name="editContent" title="${uiLabelMap.CommonEmptyHeader}">
- <hyperlink also-hidden="false" description="Edit" target="CMSContentEdit?contentId=${contentId}&drDataResourceId=${drDataResourceId}&contentIdTo=${contentIdTo}"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit?contentId=${contentId}&drDataResourceId=${drDataResourceId}&contentIdTo=${contentIdTo}"/>
</field>
<field name="contentId" title="${uiLabelMap.ProductContentId}" ><display/></field>
<field name="dataResourceId" title="${uiLabelMap.EcommerceDataResourceId}" ><display/></field>
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=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml Mon Feb 9 22:13:57 2009
@@ -157,11 +157,11 @@
<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="caFromDate" title="From Date" ><date-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="submitButton" title="Find" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
<!--
<field name="createLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="Create New" target="AddContent"/>
@@ -174,9 +174,9 @@
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"
paginate-target="/FindContent">
<field name="editContent" title="${uiLabelMap.CommonEmptyHeader}">
- <hyperlink also-hidden="false" description="Edit" target="EditContent?contentId=${contentId}&drDataResourceId=${drDataResourceId}"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContent?contentId=${contentId}&drDataResourceId=${drDataResourceId}"/>
<!--
- <hyperlink also-hidden="false" description="Edit" target="EditContent?caContentIdTo=${caContentIdTo}&caFromDate=${caFromDate}&contentId=${contentId}&drDataResourceId=${drDataResourceId}&caContentId=${contentId}&contentIdStart=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContent?caContentIdTo=${caContentIdTo}&caFromDate=${caFromDate}&contentId=${contentId}&drDataResourceId=${drDataResourceId}&caContentId=${contentId}&contentIdStart=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}"/>
-->
</field>
<!--
@@ -338,12 +338,12 @@
<field name="createdDate" position="2"><display/></field>
<field name="lastModifiedByUserLogin" position="1"><display/></field>
<field name="lastModifiedDate" position="2"><display/></field>
- <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="createLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" position="1">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonCreateNew}" target="AddContent"/>
</field>
<field name="findContent" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" position="2">
- <hyperlink also-hidden="false" description="Find" target="FindContent"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.CommonFind}" target="FindContent"/>
</field>
<field name="nodeTrailCsv" map-name="dummy">
<hidden value="${nodeTrailCsv}"/>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl Mon Feb 9 22:13:57 2009
@@ -170,7 +170,7 @@
</tr>
<tr>
<td colspan="2">
- <div class="tabletext">${uiLabelMap. OrderEmailSentToFollowingAddresses}:</div>
+ <div class="tabletext">${uiLabelMap.OrderEmailSentToFollowingAddresses}:</div>
<div class="tabletext">
<b>
<#list emailList as email>
Modified: ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml Mon Feb 9 22:13:57 2009
@@ -542,14 +542,14 @@
<container style="responseSelected">
<label text="${rsp.contentName}" style="responseheader" />
<label text=" - ${rsp.description} [${rsp.contentId}]" style="responsetext" />
- <link text="View" target="ViewForumMessage?forumId=${parameters.forumId}&threadContentId=${parameters.threadContentId}&responseContentId=${rsp.contentId}&contentAssocTypeId=RESPONSE" style="buttontext"/>
+ <link text="${uiLabelMap.CommonView}" target="ViewForumMessage?forumId=${parameters.forumId}&threadContentId=${parameters.threadContentId}&responseContentId=${rsp.contentId}&contentAssocTypeId=RESPONSE" style="buttontext"/>
</container>
</widgets>
<fail-widgets>
<container>
<label text="${rsp.contentName}" style="responseheader" />
<label text=" - ${rsp.description} [${rsp.contentId}]" style="responsetext" />
- <link text="View" target="ViewForumMessage?forumId=${parameters.forumId}&threadContentId=${parameters.threadContentId}&responseContentId=${rsp.contentId}&contentAssocTypeId=RESPONSE" style="buttontext"/>
+ <link text="${uiLabelMap.CommonView}" target="ViewForumMessage?forumId=${parameters.forumId}&threadContentId=${parameters.threadContentId}&responseContentId=${rsp.contentId}&contentAssocTypeId=RESPONSE" style="buttontext"/>
</container>
</fail-widgets>
</section>
Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml?rev=742770&r1=742769&r2=742770&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml Mon Feb 9 22:13:57 2009
@@ -33,7 +33,7 @@
<field name="caContentAssocTypeId" title="Assoc Type Id">
<text-find/>
</field>
- <field name="caFromDate" title="From Date">
+ <field name="caFromDate" title="${uiLabelMap.CommonFromDate}">
<date-find/>
</field>
<field name="contentId" title="Content Id">
@@ -45,7 +45,7 @@
<field name="contentName" title="Name">
<text-find/>
</field>
- <field name="submitButton" title="Find" widget-style="smallSubmit">
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
<field name="createBlog" title=" " widget-style="buttontext">
@@ -67,7 +67,7 @@
</actions>
<field name="editContent" title="${uiLabelMap.CommonEmptyHeader}">
- <hyperlink also-hidden="false" description="Edit" target="CMSContentEdit?contentId=${contentId}&drDataResourceId=${drDataResourceId}&contentIdTo=${contentIdTo}"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit?contentId=${contentId}&drDataResourceId=${drDataResourceId}&contentIdTo=${contentIdTo}"/>
</field>
<field name="contentId" title="Content Id">
<display/>
Re: svn commit: r742770 [1/2] - in /ofbiz/trunk: applications/accounting/config/ applications/accounting/webapp/accounting/payment/ applications/accounting/widget/ applications/accounting/widget/ap/ applications/accounting/widget/ar/ applications/content/c...
Posted by "risalitim@gmail.com" <ri...@gmail.com>.
Hi Adrian,
I have made a mistake after copy the label
AccountingFixedAssetCalendar to AccountingFixedAssetClassEnumId and
then remove it from AccountingFixedAssetCalendar.
I have fixed into rev. 742961.
Thanks
Marco
Il giorno 09/feb/09, alle ore 23:33, Adrian Crum ha scritto:
> Marco,
>
> Why are we removing all of the other translations?
>
> -Adrian
>
> mrisaliti@apache.org wrote:
>> Author: mrisaliti
>> Date: Mon Feb 9 22:13:57 2009
>> New Revision: 742770
>> URL: http://svn.apache.org/viewvc?rev=742770&view=rev
>> Log:
>> A lot of hardcoded labels cleaning and changes some wrong references
>
>> Modified: ofbiz/trunk/applications/accounting/config/
>> AccountingUiLabels.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=742770&r1=742769&r2=742770&view=diff
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- ofbiz/trunk/applications/accounting/config/
>> AccountingUiLabels.xml (original)
>> +++ ofbiz/trunk/applications/accounting/config/
>> AccountingUiLabels.xml Mon Feb 9 22:13:57 2009
>> <property key="AccountingFixedAssetCalendar">
>> - <value xml:lang="ar">رزÙ
> اÙØ©</value>
>> - <value xml:lang="de">Kalender</value>
>> - <value xml:lang="en">Calendar</value>
>> - <value xml:lang="es">Calendario</value>
>> - <value xml:lang="fr">Calendrier d'immobilisation</value>
>> - <value xml:lang="it">Calendario</value>
>> - <value xml:lang="nl">Kalender</value>
>> - <value xml:lang="ro">Calendar</value>
>> - <value xml:lang="ru">ÐалендаÑÑ</value>
>> - <value xml:lang="th">à¸à¸à¸´à¸à¸´à¸</value>
>> - <value xml:lang="zh">æ¥å</value>
>> + <value xml:lang="en">Fixed Asset Calendar</value>
>> + <value xml:lang="it">Calendario cespite</value>
>> + </property>
>> + <property key="AccountingFixedAssetClassEnumId">
>> + <value xml:lang="en">Fixed Asset Class Enum Id</value>
>> + <value xml:lang="it">Classe cespite</value>
>> </property>
>> <property key="AccountingFixedAssetDepreciation">
>> <value xml:lang="de">Abschreibung</value>
Re: svn commit: r742770 [1/2] - in /ofbiz/trunk: applications/accounting/config/
applications/accounting/webapp/accounting/payment/ applications/accounting/widget/
applications/accounting/widget/ap/ applications/accounting/widget/ar/ applications/content/c...
Posted by Adrian Crum <ad...@hlmksw.com>.
Marco,
Why are we removing all of the other translations?
-Adrian
mrisaliti@apache.org wrote:
> Author: mrisaliti
> Date: Mon Feb 9 22:13:57 2009
> New Revision: 742770
>
> URL: http://svn.apache.org/viewvc?rev=742770&view=rev
> Log:
> A lot of hardcoded labels cleaning and changes some wrong references
> Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=742770&r1=742769&r2=742770&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
> +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Mon Feb 9 22:13:57 2009
> <property key="AccountingFixedAssetCalendar">
> - <value xml:lang="ar">رزÙ
اÙØ©</value>
> - <value xml:lang="de">Kalender</value>
> - <value xml:lang="en">Calendar</value>
> - <value xml:lang="es">Calendario</value>
> - <value xml:lang="fr">Calendrier d'immobilisation</value>
> - <value xml:lang="it">Calendario</value>
> - <value xml:lang="nl">Kalender</value>
> - <value xml:lang="ro">Calendar</value>
> - <value xml:lang="ru">ÐалендаÑÑ</value>
> - <value xml:lang="th">à¸à¸à¸´à¸à¸´à¸</value>
> - <value xml:lang="zh">æ¥å</value>
> + <value xml:lang="en">Fixed Asset Calendar</value>
> + <value xml:lang="it">Calendario cespite</value>
> + </property>
> + <property key="AccountingFixedAssetClassEnumId">
> + <value xml:lang="en">Fixed Asset Class Enum Id</value>
> + <value xml:lang="it">Classe cespite</value>
> </property>
> <property key="AccountingFixedAssetDepreciation">
> <value xml:lang="de">Abschreibung</value>