svn commit: r545461 [1/2] - in /ofbiz/trunk: applications/accounting/config
Locked
svn commit: r545461 [1/2] - in /ofbiz/trunk: applications/accounting/config
 
|
Author: jacopoc
Date: Fri Jun 8 02:06:47 2007 New Revision: 545461 URL: http://svn.apache.org/viewvc?view=rev&rev=545461 Log: A bunch of i18n and i10n improvements by Marco Risaliti: OFBIZ-1062 and OFBIZ-1057 Added: ofbiz/trunk/applications/humanres/config/HumanResUiLabels_it.properties (with props) ofbiz/trunk/framework/example/config/ExampleEntityLabels.properties (with props) ofbiz/trunk/framework/example/config/ExampleEntityLabels_it.properties (with props) ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels_it.properties (with props) Modified: ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.properties ofbiz/trunk/applications/accounting/config/AccountingEntityLabels_it.properties ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml ofbiz/trunk/applications/accounting/widget/AdminScreens.xml ofbiz/trunk/applications/content/config/ContentUiLabels.properties ofbiz/trunk/applications/content/config/ContentUiLabels_it.properties ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml ofbiz/trunk/applications/content/webapp/content/website/WebSiteTabBar.ftl ofbiz/trunk/applications/content/widget/WebSiteScreens.xml ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/footer.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java ofbiz/trunk/framework/common/config/CommonUiLabels.properties ofbiz/trunk/framework/common/config/CommonUiLabels_it.properties ofbiz/trunk/framework/example/config/ExampleUiLabels.properties ofbiz/trunk/framework/example/config/ExampleUiLabels_it.properties ofbiz/trunk/framework/example/entitydef/entitymodel.xml ofbiz/trunk/framework/example/widget/example/CommonScreens.xml ofbiz/trunk/framework/example/widget/example/ExampleForms.xml ofbiz/trunk/framework/exampleext/ofbiz-component.xml ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FacilityForms.xml Modified: ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.properties?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.properties (original) +++ ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.properties Fri Jun 8 02:06:47 2007 @@ -80,6 +80,7 @@ InvoiceType.description.SALES_INVOICE=Sales Invoice InvoiceType.description.CUST_RTN_INVOICE=Customer Return InvoiceType.description.COMMISSION_INVOICE=Commission +InvoiceType.description.INTEREST_INVOICE=Interest PaymentType.description.DISBURSEMENT=Disbursement PaymentType.description.CUSTOMER_REFUND=Customer Refund @@ -95,6 +96,10 @@ PaymentType.description.CUSTOMER_PAYMENT=Customer Payment PaymentType.description.CUSTOMER_DEPOSIT=Customer Deposit PaymentType.description.GC_DEPOSIT=Gift Certificate Deposit +PaymentType.description.COMMISSION_PAYMENT=Commission Payment +PaymentType.description.INTEREST_RECEIPT=Interest Receipt +PaymentType.description.POS_PAID_IN=POS Paid In +PaymentType.description.POS_PAID_OUT=POS Paid Out FixedAssetType.description.EQUIPMENT=Equipment FixedAssetType.description.PRODUCTION_EQUIPMENT=The fixed asset used in the operation-routing definition @@ -277,3 +282,14 @@ GlResourceType.description.SERVICES=Services GlResourceType.description.FINISHED_GOODS=Finished Goods GlResourceType.description.DELIVERED_GOODS=Delivered Goods + +FinAccountType.description.BANK_ACCOUNT=Bank Account +FinAccountType.description.DEPOSIT_ACCOUNT=Deposit Account +FinAccountType.description.GIFTCERT_ACCOUNT=Gift Certificate +FinAccountType.description.INVESTMENT_ACCOUNT=Investment Account +FinAccountType.description.REPLENISH_ACCOUNT=Replenish Account +FinAccountType.description.SVCCRED_ACCOUNT=Service Credit Account + +FinAccountTransType.description.DEPOSIT=Deposit +FinAccountTransType.description.WITHDRAWAL=Withdraw +FinAccountTransType.description.ADJUSTMENT=Adjustment \ No newline at end of file Modified: ofbiz/trunk/applications/accounting/config/AccountingEntityLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingEntityLabels_it.properties?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingEntityLabels_it.properties (original) +++ ofbiz/trunk/applications/accounting/config/AccountingEntityLabels_it.properties Fri Jun 8 02:06:47 2007 @@ -80,6 +80,7 @@ InvoiceType.description.SALES_INVOICE=Vendita InvoiceType.description.CUST_RTN_INVOICE=Resi Cliente InvoiceType.description.COMMISSION_INVOICE=Provvigioni +InvoiceType.description.INTEREST_INVOICE=Interessi PaymentType.description.DISBURSEMENT=Rimborsati PaymentType.description.CUSTOMER_REFUND=Resi Clienti @@ -95,6 +96,10 @@ PaymentType.description.CUSTOMER_PAYMENT=Cliente PaymentType.description.CUSTOMER_DEPOSIT=Deposito Cliente PaymentType.description.GC_DEPOSIT=Deposito Certificato Omaggio +PaymentType.description.COMMISSION_PAYMENT=Pagamento Provvigioni +PaymentType.description.INTEREST_RECEIPT=Ricevuta Interessi +PaymentType.description.POS_PAID_IN=Pagamento POS Ingresso +PaymentType.description.POS_PAID_OUT=Pagamento POS Uscita FixedAssetType.description.EQUIPMENT=Attrezzature FixedAssetType.description.PRODUCTION_EQUIPMENT=I cespiti usati nella definizione operazione-rotta @@ -277,3 +282,14 @@ GlResourceType.description.SERVICES=Servizi GlResourceType.description.FINISHED_GOODS=Beni Finiti GlResourceType.description.DELIVERED_GOODS=Beni Consegnabili + +FinAccountType.description.BANK_ACCOUNT=Conto Bancario +FinAccountType.description.DEPOSIT_ACCOUNT=Conto Deposito +FinAccountType.description.GIFTCERT_ACCOUNT=Certificato Omaggio +FinAccountType.description.INVESTMENT_ACCOUNT=Conto Investimento +FinAccountType.description.REPLENISH_ACCOUNT=Conto Rifornimento +FinAccountType.description.SVCCRED_ACCOUNT=Conto Servizio Credito + +FinAccountTransType.description.DEPOSIT=Deposito +FinAccountTransType.description.WITHDRAWAL=Withdraw +FinAccountTransType.description.ADJUSTMENT=Aggiustamento \ No newline at end of file Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Fri Jun 8 02:06:47 2007 @@ -43,6 +43,8 @@ AccountingAccountNumber=Account Number AccountingAccountType=Account Type AccountingAccounts=Accounts +AccountingActualCurrencyAmount=Actual Currency Amount +AccountingActualCurrencyUomId=Actual Currency Uom Id AccountingAdmin=Admin AccountingAssignPaymentToInvoice=Assign Payment to This Invoice AccountingAddNewCreditCard=Add New Credit Card @@ -162,7 +164,6 @@ AccountingFiscalMonth11=11-Nov AccountingFiscalMonth12=12-Dec AccountingFixedAsset=Fixed Asset -AccountingFixedAssetAllocatedDate=Allocated Date AccountingFixedAssetCalendar=Calendar AccountingFixedAssetChildren=Children AccountingFixedAssetEdit=Create/Update Fixed Asset @@ -419,7 +420,12 @@ AccountingFixedAssetMaintMessage3=If Maintenance Template is specified with Product Maintenance, this will be set/reset automatically PageTitleEditAgreement=Edit Agreement +PageTitleEditAgreementGeographicalApplic=Edit Agreement Geographical Applic PageTitleEditAgreementItem=Edit Agreement Item +PageTitleEditAgreementItemTerm=Edit Agreement Item Term +PageTitleEditAgreementItemParty=Edit Agreement Item Party +PageTitleEditAgreementItemProduct=Edit Agreement Item Product +PageTitleEditAgreementPromoAppl=Edit Agreement Promo Appl PageTitleEditAgreementTerm=Edit Agreement Term PageTitleEditBillingAccount=Edit Billing Account PageTitleEditBillingAccountInvoices=Edit Billing Account Invoices @@ -443,7 +449,12 @@ PageTitleFindPayment=Find Payment PageTitleInvoiceOverview=Invoice Overview PageTitleListAccounts=List Accounts +PageTitleListAgreementGeographicalApplic=List Agreement Geographical Applic PageTitleListAgreementItems=List Agreement Items +PageTitleListAgreementItemParties=List Agreement Item Parties +PageTitleListAgreementItemProducts=List Agreement Item Products +PageTitleListAgreementItemTerms=List Agreement Item Terms +PageTitleListAgreementPromoAppls=List Agreement Promo Appls PageTitleListAgreementTerms=List Agreement Terms PageTitleListFixedAssets=List Fixed Assets PageTitleListFixedAssetChildren=Fixed Asset Children @@ -454,6 +465,7 @@ PageTitleListEditInvoiceApplications=List Edit Invoice Applications PageTitleListInvoices=List Invoices PageTitleListInvoiceRoles=List Invoice Roles +PageTitleListPaymentApplications=List Payment Applications PageTitleLogin=Login PageTitleLookupBillingAccount=Lookup Billing Account by Name PageTitleLookupFixedAsset=Lookup Fixed Asset @@ -781,6 +793,35 @@ FormFieldTitle_parentInvoiceId=Parent Invoice Id FormFieldTitle_parentInvoiceItemSeqId=Parent Invoice Item Seq Id FormFieldTitle_workEffortId=Work Effort Id +FormFieldTitle_textValue=Text Value +FormFieldTitle_maxQuantity=Max Quantity +FormFieldTitle_minQuantity=Min Quantity +FormFieldTitle_transDescription=Trans Description +FormFieldTitle_resultBadCardNumber=Result Bad Card Number +FormFieldTitle_resultBadExpire=Result Bad Expire +FormFieldTitle_resultDeclined=Result Declined +FormFieldTitle_resultNsf=Result Nsf +FormFieldTitle_allocatedDate=Allocated Date +FormFieldTitle_refundPaymentMethodId=Refund Payment Method Id +FormFieldTitle_finAccountCode=Fin Account Code +FormFieldTitle_finAccountId=Fin Account Id +FormFieldTitle_finAccountName=Fin Account Name +FormFieldTitle_finAccountPin=Fin Account Pin +FormFieldTitle_finAccountTransId=Fin Account Trans Id +FormFieldTitle_finAccountTypeId=Fin Account Type Id +FormFieldTitle_ownerPartyId=Owner Party Id +FormFieldTitle_postToGlAccountId=Post To Gl Account Id +FormFieldTitle_isFrozen=Is Frozen +FormFieldTitle_isRefundable=Is Refundable +FormFieldTitle_replenishLevel=Replenish Level +FormFieldTitle_replenishPaymentId=Replenish Payment Id +FormFieldTitle_actualBalance=Actual Balance +FormFieldTitle_availableBalance=Available Balance +FormFieldTitle_entryDate=Entry Date +FormFieldTitle_finAccountTransTypeId=Fin Account Trans Type Id +FormFieldTitle_performedByPartyId=Performed By Party Id +FormFieldTitle_finAccountAuthId=Fin Account Auth Id +FormFieldTitle_authorizationDate=Authorization Date AccountingFinAccount=Financial Account AccountingFinAccounts=Financial Accounts Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties Fri Jun 8 02:06:47 2007 @@ -43,6 +43,8 @@ AccountingAccountNumber=Numero Conto AccountingAccountType=Tipo Conto AccountingAccounts=Conti +AccountingActualCurrencyAmount=Attuale Importo in Valuta +AccountingActualCurrencyUomId=Attuale Udm Valuta AccountingAdmin=Amministra AccountingAssignPaymentToInvoice=Assegna Pagamento a Questa Fattura AccountingAddNewCreditCard=Aggiungi Nuova Carta Credito @@ -292,6 +294,7 @@ AccountingPaidDate=Data Pagato AccountingPartyBilledFrom=Soggetto Fatturazione Da AccountingPartyBilledTo=Soggetto Fatturazione A +AccountingPartyFixedAssetAssignments=Assegnazioni AccountingPartyIdFrom=Codice Soggetto Da AccountingPartyIdTo=Codice Soggetto A AccountingPartyMustBeInternalOrganization=Soggetto dovrebbe essere una Organizzazione Interna (impostata in PartyRole) @@ -405,7 +408,12 @@ AccountingFixedAssetMaintMessage2=Solamente usato se applicabile, pu\u00f2 essere usato Tipo Manutenzione invece PageTitleEditAgreement=Aggiorna Contratto +PageTitleEditAgreementGeographicalApplic=Aggiorna Contratto Applicazioni Geografiche PageTitleEditAgreementItem=Aggiorna Riga Contratto +PageTitleEditAgreementItemTerm=Aggiorna Termini Riga Contratto +PageTitleEditAgreementItemParty=Aggiorna Soggetto Riga Contratto +PageTitleEditAgreementItemProduct=Aggiorna Prodotto Riga Contratto +PageTitleEditAgreementPromoAppl=Aggiorna Applicazioni Promozionali Contratto PageTitleEditAgreementTerm=Aggiorna Termine Contratto PageTitleEditBillingAccount=Aggiorna Conto Fatturazione PageTitleEditBillingAccountInvoices=Aggiorna Conto Fatturazione Fatture @@ -429,7 +437,12 @@ PageTitleFindPayment=Ricerca Pagamento PageTitleInvoiceOverview=Visione Fattura PageTitleListAccounts=Lista Conti +PageTitleListAgreementGeographicalApplic=Lista Applicazioni Geografiche Contratto PageTitleListAgreementItems=Lista Righe Contratto +PageTitleListAgreementItemParties=Lista Soggetti Riga Contratto +PageTitleListAgreementItemProducts=Lista Prodotti Riga Contratto +PageTitleListAgreementItemTerms=Lista Termini Riga Contratto +PageTitleListAgreementPromoAppls=Lista Applicazioni Promozionali Contratto PageTitleListAgreementTerms=Lista Termini Contratto PageTitleListFixedAssets=Lista Cespiti PageTitleListFixedAssetChildren=Figli Cespiti @@ -440,6 +453,7 @@ PageTitleListEditInvoiceApplications=Aggiorna Applicazioni Fattura PageTitleListInvoices=Lista Fatture PageTitleListInvoiceRoles=Lista Ruoli Fattura +PageTitleListPaymentApplications=Lista Applicazioni Pagamento PageTitleLogin=Login PageTitleLookupBillingAccount=Ricerca Conto Fatturazione per Nome PageTitleLookupFixedAsset=Ricerca Cespite @@ -448,6 +462,7 @@ PageTitleMain=Pagina Principale PageTitlePaymentOverview=Visione Pagamento +PageTitleEditPartyFixedAssetAssignments=Aggiorna Assegnamenti Cespiti Soggetto PageTitleFindTaxAuthority=Ricerca Autorit\u00e0 Tasse PageTitleEditTaxAuthority=Aggiorna Autorit\u00e0 Tasse PageTitleEditTaxAuthorityCategories=Aggiorna Autorit\u00e0 Tasse Categorie Prodotto @@ -466,6 +481,18 @@ PageTitleAddGlAccount=Aggiungi Conto Gl PageTitleUnpostedTransactions=Transazione non Contabilizzate +AccountingFinAccount=Conto Finanziario +AccountingFinAccounts=Conti Finanziari +AccountingFindFinAccount=Ricerca Conto Finanziario +AccountingEditFinAccount=Crea/Aggiorna Conto Finanziario +AccountingFinAccountTransations=Transazioni +AccountingFinAccountAuth=Autorizzazioni +PageTitleFinAccount=Conto Finanziario +PageTitleEditFinAccount=Aggiorna Conto Finanziario +PageTitleEditFinAccountRole=Aggiorna Ruolo Conto Finanziario +PageTitleEditFinAccountTrans=Aggiorna Transazione Conto Finanziario +PageTitleEditFinAccountAuths=Aggiorna Autorit\u00e0 Conto Finanziario + PartyPartyId=Codice Soggetto PartyRoles=Ruoli PartyRoleTypeId=Tipo Ruolo @@ -647,7 +674,6 @@ FormFieldTitle_orderPaymentPreferenceId=Codice Preferenza Pagamento Ordine FormFieldTitle_paymentGatewayResponseId=Codice Risposta Gateway Pagamento FormFieldTitle_paymentServiceTypeEnumId=Tipo Servizio Pagamento -FormFieldTitle_paymentMethodId=Tipo Metodo Pagamento FormFieldTitle_transCodeEnumId=Numero Codice Transazione FormFieldTitle_referenceNum=Numero Riferimento FormFieldTitle_altReference=Riferimento Alternativo @@ -736,3 +762,32 @@ FormFieldTitle_parentInvoiceId=Fattura Principale FormFieldTitle_parentInvoiceItemSeqId=Riga Fattura Principale FormFieldTitle_workEffortId=Impegno di Lavoro +FormFieldTitle_textValue=Testo Valore +FormFieldTitle_maxQuantity=Quantit\u00E0 Massima +FormFieldTitle_minQuantity=Quantit\u00E0 Minima +FormFieldTitle_transDescription=Descrizione Transazione +FormFieldTitle_resultBadCardNumber=Risultato Numero Carta Errata +FormFieldTitle_resultBadExpire=Risultato Errato Scaduto +FormFieldTitle_resultDeclined=Risultato Declinato +FormFieldTitle_resultNsf=Risultato Nsf +FormFieldTitle_allocatedDate=Data Allocazione +FormFieldTitle_refundPaymentMethodId=Metodo di Pagamento Resi +FormFieldTitle_finAccountCode=Codice Conto Finanziario +FormFieldTitle_finAccountId=Conto Finanziario +FormFieldTitle_finAccountName=Nome Conto Finanziario +FormFieldTitle_finAccountPin=Pin Conto Finanziario +FormFieldTitle_finAccountTransId=Codice Transazione Conto Finanziario +FormFieldTitle_finAccountTypeId=Tipo Conto Finanziario +FormFieldTitle_ownerPartyId=Soggetto Proprietario +FormFieldTitle_postToGlAccountId=Contabilizza su Conto Gl +FormFieldTitle_isFrozen=E' Congelato +FormFieldTitle_isRefundable=E' Rimborsabile +FormFieldTitle_replenishLevel=Livello Rifornimento +FormFieldTitle_replenishPaymentId=Pagamento Rifornimento +FormFieldTitle_actualBalance=Bilancio Corrente +FormFieldTitle_availableBalance=Bilancio Disponibile +FormFieldTitle_entryDate=Data Inserimento +FormFieldTitle_finAccountTransTypeId=Tipo Transazione Conto Finanziario +FormFieldTitle_performedByPartyId=Eseguito Dal Soggetto +FormFieldTitle_finAccountAuthId=Autorizzazione Conto Finanziario +FormFieldTitle_authorizationDate=Data Autorizzazione \ No newline at end of file Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Fri Jun 8 02:06:47 2007 @@ -480,7 +480,10 @@ <key-map field-name="attrName"/> </relation> </entity> - <entity entity-name="FinAccountTransType" package-name="org.ofbiz.accounting.finaccount" title="Financial Account Transaction Type Entity"> + <entity entity-name="FinAccountTransType" + package-name="org.ofbiz.accounting.finaccount" + default-resource-name="AccountingEntityLabels" + title="Financial Account Transaction Type Entity"> <field name="finAccountTransTypeId" type="id-ne"></field> <field name="parentTypeId" type="id-ne"></field> <field name="hasTable" type="indicator"></field> @@ -505,7 +508,10 @@ <key-map field-name="finAccountTransTypeId"/> </relation> </entity> - <entity entity-name="FinAccountType" package-name="org.ofbiz.accounting.finaccount" title="Financial Account Type Entity"> + <entity entity-name="FinAccountType" + package-name="org.ofbiz.accounting.finaccount" + default-resource-name="AccountingEntityLabels" + title="Financial Account Type Entity"> <field name="finAccountTypeId" type="id-ne"></field> <field name="parentTypeId" type="id-ne"></field> <field name="replenishEnumId" type="id-ne"></field> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml Fri Jun 8 02:06:47 2007 @@ -119,8 +119,8 @@ </entity-options> </drop-down> </field> - <field name="createButton" use-when="partyAcctgPreference==null"><submit/></field> - <field name="updateButton" use-when="partyAcctgPreference!=null"><submit/></field> + <field name="createButton" use-when="partyAcctgPreference==null" title="${uiLabelMap.CommonAdd}"><submit/></field> + <field name="updateButton" use-when="partyAcctgPreference!=null" title="${uiLabelMap.CommonUpdate}"><submit/></field> <!-- otherwise, we just display the fields. there is no submit button because we shouldn't try to create it again and don't support an update option right now--> <field name="fiscalYearStartMonth" use-when="partyAcctgPreference!=null"><display/></field> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml Fri Jun 8 02:06:47 2007 @@ -454,7 +454,7 @@ <field name="roleTypeId" title="${uiLabelMap.FormFieldTitle_roleTypeId}"><display/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> - <field name="allocatedDate" title="${uiLabelMap.AccountingFixedAssetAllocatedDate}"><date-time/></field> + <field name="allocatedDate"><date-time/></field> <field name="statusId" title="${uiLabelMap.FormFieldTitle_statusId}"> <drop-down allow-empty="false"> <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId"> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Fri Jun 8 02:06:47 2007 @@ -357,7 +357,7 @@ <field name="paymentId"><lookup target-form-name="LookupPayment"/></field> <field name="billingAccountId"><hidden/></field> <field name="amountToApply"><text size="10" disabled="true"/></field> - <field name="updateButton" widget-style="buttontext"><submit button-type="text-link"/></field> + <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field> <field name="removeButton" title="" widget-style="buttontext" use-when="paymentApplicationId!=null"> <hyperlink description="${uiLabelMap.CommonRemove}" target="removeInvoiceApplication?paymentApplicationId=${paymentApplicationId}&invoiceId=${invoiceId}"/> </field> 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?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Fri Jun 8 02:06:47 2007 @@ -204,8 +204,8 @@ </entity-options> </drop-down> </field> - <field name="actualAmount" position="1"><text/></field> - <field position="2" name="actualCurrencyUomId"> + <field name="actualAmount" position="1" title="${uiLabelMap.AccountingActualCurrencyAmount}"><text/></field> + <field position="2" name="actualCurrencyUomId" title="${uiLabelMap.AccountingActualCurrencyUomId}"> <drop-down allow-empty="true" no-current-selected-key="${defaultCurrencyUomId}"> <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom"> <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/> @@ -222,7 +222,7 @@ <field name="overrideGlAccountId" position="2"><lookup target-form-name="LookupGlAccount"/></field> <field name="finAccountTransId"><ignored/></field> <field name="actualAmount"><ignored/></field> - <field position="1" name="updateButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field position="1" name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="editPaymentApplicationsInv" default-entity-name="PaymentApplication" list-name="paymentApplicationsInv" target="updatePaymentApplication" type="list" separate-columns="false"> Modified: ofbiz/trunk/applications/accounting/widget/AdminScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AdminScreens.xml?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AdminScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AdminScreens.xml Fri Jun 8 02:06:47 2007 @@ -309,7 +309,7 @@ <section> <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="Mark Checks Sent"/> + <set field="titleProperty" value="AccountingSendChecks"/> <set field="tabButtonItem" value="ChecksTabButton"/> <set field="checksTabButtonItem" value="SendChecksTabButton"/> <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.properties?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/content/config/ContentUiLabels.properties (original) +++ ofbiz/trunk/applications/content/config/ContentUiLabels.properties Fri Jun 8 02:06:47 2007 @@ -56,7 +56,14 @@ ContentTemplates=Templates ContentTypeAttr=Type Attribute ContentCMS=CMS +ContentCMSNotExist=There is no Content PUBLISH_POINT for this WebSite! ContentCompDoc=CompDoc +ContentCompDocApprovalsFor=Content Approvals for +ContentCompDocApprovals=Approvals +ContentCompDocRev=rev. +ContentCompDocRevisions=Revisions +ContentCompDocViewTree=View Tree +ContentCompDocViewWaitingApprovals=View Waiting Approvals ContentPDF=PDF Content ID ContentFilePath=File Path ContentFile=File @@ -75,6 +82,10 @@ ContentUpdatePermissionError=You do not have permission to view this page. ("CONTENTMGR_UPDATE" or "CONTENTMGR_ADMIN" needed) ContentTree=Tree ContentLayout=Layout +ContentType=Content Type +ContentParent=Parent Content +ContentMapKey=MapKey +ContentCloneLayout=Clone Layout ForumGroupCreate=Create new forumgroup ForumAddTo=Add forum to @@ -94,6 +105,7 @@ PageTitleAddRole=Add a Role PageTitleAddWorkEffortContent=Add workeffort content PageTitleEditAssociation=Edit an association +PageTitleEditCMSContent=CMS Content Edit PageTitleEditContent=Edit Content PageTitleEditContentAssoc=Edit Content Association PageTitleEditContentAssocType=Edit Content Association Type @@ -111,10 +123,17 @@ PageTitleEditContentWorkEffort=Edit Content WorkEffort PageTitleEditDataResource=Edit Data Resource PageTitleEditDataResourceAttribute=Edit Data Resource Attribute +PageTitleEditDataResourceCategory=Edit Data Resource Category +PageTitleEditDataResourceCharacterSet=Edit Character Set +PageTitleEditDataResourceFileExtension=Edit File Extension +PageTitleEditDataResourceMetaDataPredicate=Edit Meta Data Predicate +PageTitleEditDataResourceMimeType=Edit Mime Type +PageTitleEditDataResourceMimeTypeHtmlTemplate=Edit Mime Type Html Template PageTitleEditDataResourceProductFeatures=Edit Data Resource Product Features PageTitleEditDataResourceRole=Edit Data Resource Role PageTitleEditDataResourceText=Edit Data Resource Text PageTitleEditDataResourceType=Edit Data Resource Type +PageTitleEditDataResourceTypeAttr=Edit Data Resource Type Attribute PageTitleEditDataResourceUpload=Edit Data Resource Upload PageTitleEditDataResourceUrl=Edit Data Resource Url PageTitleEditElectronicText=Edit Electronic Text @@ -123,9 +142,12 @@ PageTitleCreateSurvey=Create Survey PageTitleEditSurvey=Edit Survey PageTitleEditSurveyQuestions=Edit Survey Questions +PageTitleFindCMSContent=CMS Content Find PageTitleFindCompDoc=Find CompDoc PageTitleFindSurvey=Find Survey PageTitleEditWebSite=Edit WebSite +PageTitleEditWebSiteCMS=Edit WebSite CMS +PageTitleEditWebSiteContent=Edit WebSite Content PageTitleEditWebSiteParties=Edit WebSite Parties PageTitleFindDataResource=Find Data Resource PageTitleFindContent=Search Content @@ -152,6 +174,11 @@ PageTitleViewSurveyResponses=View Survey Responses PageTitleEditSurveyResponse=Edit Survey Response PageTitleUploadImageDataResource=Upload Image +PageTitleWebSiteContent=WebSite Content +PageTitleAutoCreateContentPublishPoints=Auto-Create Content Publish Points +PageTitleEditLayout=Edit Layout +PageTitleFindLayout=Find Layout +PageTitleListLayout=List Layout PartyParties=Parties PartyPartyId=Party Id @@ -335,3 +362,7 @@ FormFieldTitle_weightFactor=Weight Factor FormFieldTitle_duration=Duration FormFieldTitle_durationUomId=Duration Uom Id +FormFieldTitle_webSiteContentTypeId=Web Site Content Type Id +FormFieldTitle_mainAction=Main Action +FormFieldTitle_resourceDescription=Resource Description +FormFieldTitle_dataResourceId=Data Resource Id \ No newline at end of file Modified: ofbiz/trunk/applications/content/config/ContentUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels_it.properties?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/content/config/ContentUiLabels_it.properties (original) +++ ofbiz/trunk/applications/content/config/ContentUiLabels_it.properties Fri Jun 8 02:06:47 2007 @@ -30,6 +30,7 @@ ContentWebSites=Siti Web ContentCategory=Categoria ContentCharacterSet=Set di Caratteri +ContentCreateFile=Creare File ContentDataResource=Risorsa Dati ContentDataResourceAttribute=Attributo ContentDataResourceHtml=Html @@ -42,6 +43,7 @@ ContentMetadata=Metadati ContentMetaDataPred=Predicato MetaData ContentMimeType=Tipo Mime +ContentMimeTypeHtmlTemplate=Tipo Mime Template ContentContent=Contenuto ContentContentManagerApplication=Applicazione Gestione Contenuti ContentSubContent=Sotto-Contenuto @@ -54,7 +56,14 @@ ContentTemplates=Templates ContentTypeAttr=Tipo Attributo ContentCMS=CMS -ContentCompDoc=CompDoc +ContentCMSNotExist=Non c'è nessun Contenuto PUBLISH_POINT per questo Sito Web! +ContentCompDoc=Composizione Documenti +ContentCompDocApprovalsFor=Approvazioni Contenuto +ContentCompDocApprovals=Approvazioni +ContentCompDocRev=rev. +ContentCompDocRevisions=Revisioni +ContentCompDocViewTree=Mostra Albero +ContentCompDocViewWaitingApprovals=Mostra Approvazioni in Attesa ContentPDF=Contenuto PDF ContentFilePath=Percorso File ContentFile=File @@ -72,6 +81,10 @@ ContentViewPermissionError=Tu non sei autorizzato a vedere questa pagina. ("CONTENTMGR_VIEW" o "CONTENTMGR_ADMIN" necessari) ContentTree=Albero ContentLayout=Layout +ContentType=Tipo Contenuto +ContentParent=Contenuto Padre +ContentMapKey=Chiave Mappa +ContentCloneLayout=Clona Layout ForumGroupCreate=Creare nuovo gruppo forum ForumAddTo=Aggiungi al forum @@ -90,23 +103,35 @@ PageTitleAddPurpose=Aggiungi una Funzione PageTitleAddRole=Aggiungi un Ruolo PageTitleEditAssociation=Aggiorna una associazione +PageTitleEditCMSContent=Aggiorna Contenuto CMS PageTitleEditContent=Aggiorna Contenuto PageTitleEditContentAssoc=Aggiorna Associazione Contenuto +PageTitleEditContentAssocType=Aggiorna Tipo Associazione Contenuto PageTitleEditContentAssocPredicate=Aggiorna Associazione Contenuto Predicato PageTitleEditContentAttribute=Aggiorna Attributo Contenuto +PageTitleEditContentTypeAttribute=Aggiorna Attributo Tipo Contenuto PageTitleEditContentMetadata=Aggiorna Metadata Contenuto PageTitleEditContentOperation=Aggiorna Operazione Contenuto PageTitleEditContentPurpose=Aggiorna Funzione Contenuto +PageTitleEditContentPurposeType=Aggiorna Contenuto Tipo Funzione PageTitleEditContentPurposeOperation=Aggiorna Funzione Operazione Contenuto PageTitleEditContentRole=Aggiorna Ruolo Contenuto PageTitleEditContentType=Aggiorna Tipo Contenuto PageTitleEditContentUserPermissions=Permessi +PageTitleEditContentWorkEffort=Aggiorna Contenuto Impegni di Lavoro PageTitleEditDataResource=Aggiorna Risorsa Dati PageTitleEditDataResourceAttribute=Aggiorna Attributo Risorsa Dati +PageTitleEditDataResourceCategory=Aggiorna Categoria Risorsa Dati +PageTitleEditDataResourceCharacterSet=Aggiorna Set di Caratteri +PageTitleEditDataResourceFileExtension=Aggiorna Estensione File +PageTitleEditDataResourceMetaDataPredicate=Aggiorna Predicato Meta Data +PageTitleEditDataResourceMimeType=Aggiorna Tipo Mime +PageTitleEditDataResourceMimeTypeHtmlTemplate=Aggiorna Tipo Mime Template Html PageTitleEditDataResourceProductFeatures=Aggiorna Caratteristiche Prodotto Risorsa Dati PageTitleEditDataResourceRole=Aggiorna Ruolo Risorsa Dati PageTitleEditDataResourceText=Aggiorna Testo Risorsa Dati PageTitleEditDataResourceType=Aggiorna Tipo Risorsa Dati +PageTitleEditDataResourceTypeAttr=Aggiorna Attributo Tipo Risorsa Dati PageTitleEditDataResourceUpload=Aggiorna Caricamento Risorsa Dati PageTitleEditDataResourceUrl=Aggiorna Url Risorsa Dati PageTitleEditElectronicText=Aggiorna Testo Elettronico @@ -115,9 +140,12 @@ PageTitleCreateSurvey=Creare Sondaggio PageTitleEditSurvey=Aggiorna Sondaggio PageTitleEditSurveyQuestions=Aggiorna Domande Sondaggio -PageTitleFindCompDoc=Ricerca CompDoc +PageTitleFindCMSContent=Ricerca Contenuto CMS +PageTitleFindCompDoc=Ricerca Composizione Documenti PageTitleFindSurvey=Ricerca Sondaggio PageTitleEditWebSite=Aggiorna Sito Web +PageTitleEditWebSiteCMS=Aggiorna CMS Sito Web +PageTitleEditWebSiteContent=Aggiorna Contenuto Sito Web PageTitleEditWebSiteParties=Aggiorna Soggetti Sito Web PageTitleFindDataResource=Ricerca Risorsa Dati PageTitleFindContent=Ricerca Contenuto @@ -144,6 +172,11 @@ PageTitleViewSurveyResponses=Mostra Risposte Sondaggio PageTitleEditSurveyResponse=Aggiorna Risposta Sondaggio PageTitleUploadImageDataResource=Carica Immagine +PageTitleWebSiteContent=Contenuto Sito Web +PageTitleAutoCreateContentPublishPoints=Creazioni-Automatica Contenuto Punti Pubblicati +PageTitleEditLayout=Aggiorna Layout +PageTitleFindLayout=Ricerca Layout +PageTitleListLayout=Lista Layout PartyParties=Soggetti PartyPartyId=Codice Soggetto @@ -328,3 +361,7 @@ FormFieldTitle_weightFactor=Fattore Peso FormFieldTitle_duration=Durata FormFieldTitle_durationUomId=Udm Durata +FormFieldTitle_webSiteContentTypeId=Tipo Contenuto Sito Web +FormFieldTitle_mainAction=Azione Principale +FormFieldTitle_resourceDescription=Descrizione Risorsa +FormFieldTitle_dataResourceId=Risorsa Dati \ No newline at end of file Modified: ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl Fri Jun 8 02:06:47 2007 @@ -66,7 +66,7 @@ <td valign="middle" align="left"> <div class="boxhead"> <input type="text" name="webSitePublishPoint" size="20" value="${webSitePublishPoint?if_exists}"> - <input type="submit" value="ReGet"/> + <input type="submit" value="${uiLabelMap.CommonRefresh}"/> <input type="hidden" name="partyId" value="${partyId?if_exists}"/> <input type="hidden" name="userLoginId" value="${userLoginId?if_exists}"/> </div> @@ -81,7 +81,7 @@ <form name="siteRoleForm" mode="POST" action="<@ofbizUrl>updateSiteRoles</@ofbizUrl>"> <table width='100%' border='0' cellspacing='0' cellpadding='4' class='boxoutside'> <tr> - <td class="">Site</td> + <td class="">${uiLabelMap.ContentWebSite}</td> <#list blogRoleIdList as roleTypeId> <td class="">${roleTypeId}</td> </#list> @@ -104,7 +104,7 @@ </#list> <tr> <td> -<div class="smallSubmit" ><a href="javascript:submitRows('${rowCount?if_exists}')">Update</a></div> + <div class="smallSubmit" ><a href="javascript:submitRows('${rowCount?if_exists}')">${uiLabelMap.CommonUpdate}</a></div> </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?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Fri Jun 8 02:06:47 2007 @@ -72,7 +72,7 @@ <field name="description" > <display/> </field> - <field name="drObjectInfo" title="File Path"> + <field name="drObjectInfo" title="${uiLabelMap.ContentFilePath}"> <display /> </field> <!-- @@ -88,16 +88,16 @@ <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> <field name="createLink" title="" widget-style="buttontext" position="1"> - <hyperlink also-hidden="false" description="Create New" + <hyperlink also-hidden="false" description="${uiLabelMap.CommonCreateNew}" target="EditLayoutTemplate?mode=add&contentIdTo=TEMPLATE_MASTER"/> </field> --> <field name="cloneLayout" title="" widget-style="buttontext" position="2" > - <hyperlink also-hidden="false" description="Clone Layout" + <hyperlink also-hidden="false" description="${uiLabelMap.ContentCloneLayout}" target="cloneLayout?contentId=${currentValue.contentId}"/> </field> </form> @@ -184,19 +184,19 @@ <field name="contentId" position="1" > </field> - <field name="contentTypeIdDisplay" title="Content Type" position="2" map-name="dummy"> + <field name="contentTypeIdDisplay" title="${uiLabelMap.ContentType}" position="2" map-name="dummy"> <display description="DOCUMENT"/> </field> - <field name="contentIdToDisplay" title="Parent Content" position="3" map-name="dummy"> + <field name="contentIdToDisplay" title="${uiLabelMap.ContentParent}" position="3" map-name="dummy"> <display description="${contentIdTo}"/> </field> - <field name="mapKeyDisplay" title="MapKey" position="4" map-name="dummy"> + <field name="mapKeyDisplay" title="${uiLabelMap.ContentMapKey}" position="4" map-name="dummy"> <display description="${mapKey}"/> </field> <field name="contentTypeId" > <hidden value="DOCUMENT"/> </field> - <field name="drDataResourceId" title="Data Resource Id" > + <field name="drDataResourceId" title="${uiLabelMap.FormFieldTitle_dataResourceId}" > <display/> </field> <field name="contentName"> Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml Fri Jun 8 02:06:47 2007 @@ -62,22 +62,22 @@ <field name="roleTypeId"><hidden/></field> <field name="partyId"><hidden/></field> - <field name="webSiteId" title="WebSite ID"><display also-hidden="true"/></field> + <field name="webSiteId"><display also-hidden="true"/></field> <!-- <field name="contentId" title="Content ID" widget-style="linktext"> <hyperlink description="${contentId}" target="EditContent?contentId=${contentId}" also-hidden="true"/> </field> --> - <field name="contentId" title="Content"> + <field name="contentId"> <display-entity entity-name="Content" description="${contentName}" key-field-name="contentId"> <sub-hyperlink target="EditContent?contentId=${contentId}" description=" [${contentId}]" link-style="linktext"/> </display-entity> </field> - <field name="webSiteContentTypeId" title="Type"> + <field name="webSiteContentTypeId"> <display-entity entity-name="WebSiteContentType"/> </field> - <field name="fromDate" title="From Date"><display/></field> + <field name="fromDate"><display/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="" widget-style="buttontext"> @@ -136,7 +136,7 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="" widget-style="buttontext"> <hyperlink target="removeWebSiteRole?webSiteId=${webSiteRole.webSiteId}&partyId=${webSiteRole.partyId}&roleTypeId=${webSiteRole.roleTypeId}&fromDate=${webSiteRole.fromDate}" - description="[Delete]" also-hidden="false"/> + description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/> </field> </form> <form name="AutoCreateWebsiteContent" type="single" target="autoCreateWebSiteContent" title=""> @@ -148,6 +148,6 @@ </entity-options> </check> </field> - <field name="submitButton" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> </forms> Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteTabBar.ftl?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/website/WebSiteTabBar.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteTabBar.ftl Fri Jun 8 02:06:47 2007 @@ -23,9 +23,9 @@ <#if webSite?has_content> <div class='tabContainer'> <a href="<@ofbizUrl>EditWebSite?webSiteId=${webSite.webSiteId}</@ofbizUrl>" class="${selectedClassMap.EditWebSite?default(unselectedClassName)}">${uiLabelMap.ContentWebSite}</a> - <a href="<@ofbizUrl>ListWebSiteContent?webSiteId=${webSite.webSiteId}</@ofbizUrl>" class="${selectedClassMap.ListWebSiteContent?default(unselectedClassName)}">Content</a> + <a href="<@ofbizUrl>ListWebSiteContent?webSiteId=${webSite.webSiteId}</@ofbizUrl>" class="${selectedClassMap.ListWebSiteContent?default(unselectedClassName)}">${uiLabelMap.ContentContent}</a> <a href="<@ofbizUrl>EditWebSiteParties?webSiteId=${webSite.webSiteId}</@ofbizUrl>" class="${selectedClassMap.EditWebSiteParties?default(unselectedClassName)}">${uiLabelMap.PartyParties}</a> - <a href="<@ofbizUrl>WebSiteCms?webSiteId=${webSite.webSiteId}</@ofbizUrl>" class="${selectedClassMap.WebSiteCMS?default(unselectedClassName)}">CMS</a> + <a href="<@ofbizUrl>WebSiteCms?webSiteId=${webSite.webSiteId}</@ofbizUrl>" class="${selectedClassMap.WebSiteCMS?default(unselectedClassName)}">${uiLabelMap.ContentCMS}</a> </div> <div><span class="head1">${uiLabelMap.ContentWebSite} </span><span class="head2"><#if (webSite.siteName)?has_content>"${webSite.siteName}"</#if> [${uiLabelMap.CommonId}:${webSite.webSiteId}]</span></div> </#if> Modified: ofbiz/trunk/applications/content/widget/WebSiteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebSiteScreens.xml?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Fri Jun 8 02:06:47 2007 @@ -126,14 +126,14 @@ <section> <widgets> <container style="widget-container"> - <label style="head1">WebSite Content</label> + <label style="head1">${uiLabelMap.PageTitleWebSiteContent}</label> <include-form name="ListWebSiteContent" location="component://content/webapp/content/website/WebSiteForms.xml"/> </container> <container style="widget-container"> <include-form name="CreateWebSiteContent" location="component://content/webapp/content/website/WebSiteForms.xml"/> </container> <container style="widget-container"> - <label style="head2">Auto-Create Content Publish Points</label> + <label style="head2">${uiLabelMap.PageTitleAutoCreateContentPublishPoints}</label> <include-form name="AutoCreateWebsiteContent" location="component://content/webapp/content/website/WebSiteForms.xml"/> </container> </widgets> @@ -205,7 +205,7 @@ </widgets> <fail-widgets> <container id="norender" style="tableheadtext"> - <label text="There is no Content PUBLISH_POINT for this WebSite!"/> + <label text="${uiLabelMap.ContentCMSNotExist}"/> </container> </fail-widgets> </section> Modified: ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Fri Jun 8 02:06:47 2007 @@ -24,7 +24,7 @@ <screen name="CMSContentFind"> <section> <actions> - <set field="title" value="CMS Content Find Page"/> + <set field="titleProperty" value="PageTitleFindCMSContent"/> <set field="entityName" value="ContentAssocDataResourceViewFrom"/> <service service-name="urlEncodeArgs" result-map-name="result"> <field-map env-name="requestParameters" field-name="mapIn"/> @@ -48,8 +48,7 @@ <section> <actions> <script location="component://content/widget/getMenuContext.bsh"/> - <set field="title" value="CMS Content Edit Page"/> - <set field="titleProperty" value="PageTitleEditContent"/> + <set field="titleProperty" value="PageTitleEditCMSContent"/> <entity-one entity-name="Content" value-name="currentValue"> <field-map field-name="contentId" env-name="parameters.contentId"/> </entity-one> Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml (original) +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml Fri Jun 8 02:06:47 2007 @@ -26,7 +26,7 @@ <menu name="find" default-title-style="tabButton" default-selected-style="tabButtonSelected" default-menu-item-name="content" default-associated-content-id="${userLogin.userLoginId}" selected-menuitem-context-field-name="currentMenuItemName" title="" type="simple"> - <menu-item name="find" title="Find"> + <menu-item name="find" title="${uiLabelMap.CommonFind}"> <link target="FindCompDocTemplate"/> </menu-item> </menu> Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Fri Jun 8 02:06:47 2007 @@ -45,12 +45,12 @@ </service> <set field="contentApprovalList" from-field="result.contentApprovalList"/> - <set field="title" value="Content Approvals for ${contentId}, rev. ${contentRevisionSeqId}"/> + <set field="title" value="${uiLabelMap.ContentCompDocApprovalsFor} ${contentId}, ${uiLabelMap.ContentCompDocRev} ${contentRevisionSeqId}"/> </actions> <widgets> <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml"> <decorator-section name="body"> - <container><link target="ListWaitingContentApproval?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}" text="View Waiting Approvals" style="buttontext"/></container> + <container><link target="ListWaitingContentApproval?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}" text="${uiLabelMap.ContentCompDocViewWaitingApprovals}" style="buttontext"/></container> <section> <condition><if-compare field-name="content.contentTypeId" operator="equals" value="COMPDOC_INSTANCE"/></condition> <widgets><include-screen name="rootInstanceApprovalStatus"/></widgets> @@ -65,7 +65,7 @@ <set from-field="parameters.contentRevisionSeqId" default-value="${parameters.rootContentRevisionSeqId}" field="rootContentRevisionSeqId"/> </actions> <widgets> - <label text="Add" style="head1"/> + <label text="${uiLabelMap.CommonAdd}" style="head1"/> <include-form name="AddContentApproval" location="component://content/widget/compdoc/CompDocForms.xml"/> </widgets> </section> Modified: ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml Fri Jun 8 02:06:47 2007 @@ -40,7 +40,7 @@ <screen name="EditCharacterSet"> <section> <actions> - <set field="titleProperty" value="PageTitleEditCharacterSet"/> + <set field="titleProperty" value="PageTitleEditDataResourceCharacterSet"/> <set field="headerItem" value="DataResourceSetupMenu"/> <set field="tabButtonItem" to-scope="user" value="EditCharacterSet"/> </actions> @@ -74,7 +74,7 @@ <screen name="EditFileExtension"> <section> <actions> - <set field="titleProperty" value="PageTitleEditFileExtension"/> + <set field="titleProperty" value="PageTitleEditDataResourceFileExtension"/> <set field="headerItem" value="DataResourceSetupMenu"/> <set field="tabButtonItem" to-scope="user" value="EditFileExtension"/> </actions> @@ -91,7 +91,7 @@ <screen name="EditMetaDataPredicate"> <section> <actions> - <set field="titleProperty" value="PageTitleEditMetaDataPredicate"/> + <set field="titleProperty" value="PageTitleEditDataResourceMetaDataPredicate"/> <set field="headerItem" value="DataResourceSetupMenu"/> <set field="tabButtonItem" to-scope="user" value="EditMetaDataPredicate"/> </actions> @@ -108,7 +108,7 @@ <screen name="EditMimeType"> <section> <actions> - <set field="titleProperty" value="PageTitleEditMimeType"/> + <set field="titleProperty" value="PageTitleEditDataResourceMimeType"/> <set field="headerItem" value="DataResourceSetupMenu"/> <set field="tabButtonItem" to-scope="user" value="EditMimeType"/> </actions> @@ -125,7 +125,7 @@ <screen name="EditMimeTypeHtmlTemplate"> <section> <actions> - <set field="titleProperty" value="PageTitleEditMimeTypeHtmlTemplate"/> + <set field="titleProperty" value="PageTitleEditDataResourceMimeTypeHtmlTemplate"/> <set field="headerItem" value="DataResourceSetupMenu"/> <set field="tabButtonItem" to-scope="user" value="EditMimeTypeHtmlTemplate"/> </actions> @@ -142,7 +142,7 @@ <screen name="EditDataCategory"> <section> <actions> - <set field="titleProperty" value="PageTitleEditMimeType"/> + <set field="titleProperty" value="PageTitleEditDataResourceCategory"/> <set field="headerItem" value="DataResourceSetupMenu"/> <set field="tabButtonItem" to-scope="user" value="EditDataCategory"/> <script location="component://content/webapp/content/WEB-INF/actions/datasetup/datacategoryprep.bsh"/> Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties (original) +++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties Fri Jun 8 02:06:47 2007 @@ -240,6 +240,7 @@ EcommerceOfPromotion=of Promotion EcommerceOnSale=On Sale EcommerceOrderInLast=order(s) in the last +EcommerceOrderNotActive=Order Not Activ EcommerceOwningDepartment=Owning Department EcommerceParentList=Parent List EcommercePassword=With the password you set during registration. @@ -281,6 +282,7 @@ EcommerceReturnRequestNb=Your return request # EcommerceSave=Save EcommerceSearchNumber=Search # +EcommerceSeeStorePoliciesHere=See Store Policies Here EcommerceSelectFrequency=Select Frequency EcommerceSelectInterval=Select Interval EcommerceSelectedGiftWrap="Selected Gift Wrap is not available for all items. The items which are available have been selected, the others remain unchanged." @@ -494,6 +496,8 @@ PageTitleGiftCardLink=Gift Card Link PageTitleLastViewProducts=Last View Products PageTitleLogin=Login +PageTitleListRequests=List Requests +PageTitleListQuotes=List Quotes PageTitleMain=Main Page PageTitleMessageDetail=Message Detail PageTitleMessageList=Message List Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties (original) +++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties Fri Jun 8 02:06:47 2007 @@ -232,6 +232,7 @@ EcommerceOfPromotion=di Promozione EcommerceOnSale=In Vendita EcommerceOrderInLast=ordine(i) negli ultimi +EcommerceOrderNotActive=Ordine Non Attivo EcommerceOwningDepartment=Divisione Posseduta EcommerceParentList=Lista Padre EcommercePassword=La password verr\u00e0 impostata durante la registrazione. @@ -271,6 +272,7 @@ EcommerceReturnRequestNb=La tua richiesta # EcommerceSave=Risparmio EcommerceSearchNumber=Ricerca # +EcommerceSeeStorePoliciesHere=Vedi Politiche Negozio Qui EcommerceSelectFrequency=Seleziona Frequenza EcommerceSelectInterval=Seleziona Intervallo EcommerceSelectedGiftWrap="Selezione Omaggio non disponivile per tutte le righe. Le righe che sono disponibile saranno selezionate, le altre rimarrano invariate." @@ -449,7 +451,8 @@ OrderVerifyConfiguration=Verifica Configurazione OrderWhereShallWeShipIt=Dove vuoi spedire OrderYesIsAGift=Si, E' un'Omaggio - +OrderSalesHistory=Storia Ordini per gli ordini inseriti da te +OrderPurchaseHistory=Storia Ordini per gli ordini inviati da te PageTitleAddContent=Aggiungi Contenuto PageTitleAddResponse=Aggiungi Risposta PageTitleAdditionalInfo=Informazioni Aggiuntive @@ -478,6 +481,8 @@ PageTitleGiftCardLink=Link Carta Omaggio PageTitleLastViewProducts=Ultimi Prodotti Visti PageTitleLogin=Login +PageTitleListRequests=Lista Richieste +PageTitleListQuotes=Lista Preventivi PageTitleMain=Pagina Principale PageTitleMessageDetail=Dettagli Messaggio PageTitleMessageList=Lista Messaggio @@ -520,7 +525,7 @@ PartyAllPhoneNumbers=Tutti numeri di telefono PartyAllowAddressSolicitation=Ammettere Indirizzo Sollecito PartyAllowSolicitation=Ammettere Sollecito -PartyAlreadyHaveAccount=Se tu hai ancora un conto +PartyAlreadyHaveAccount=Se tu hai già un'utente, PartyAreaCode=Codice Area PartyAttentionName=Attenzione Di PartyBasicInformation=Informazioni Base @@ -633,6 +638,7 @@ ProductAllKeyword=Tutte le Chiavi ProductAnyKeyword=Qualsiasi Chiave ProductBeTheFirstToReviewThisProduct=Essere Il Primo Per Rivedere Questo Prodotto! +ProductBrowseBlogs=Sfogliare Blogs ProductBrowseCategories=Sfogliare Categorie ProductBrowseContent=Sfogliare Contenuti ProductBrowseForums=Sfogliare Forums Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl Fri Jun 8 02:06:47 2007 @@ -78,7 +78,7 @@ <#else> <b>${uiLabelMap.PartyPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}"</b> </#if> - (Since:${partyContactMechPurpose.fromDate.toString()}) + (${uiLabelMap.CommonSince}:${partyContactMechPurpose.fromDate.toString()}) <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpires}:${partyContactMechPurpose.thruDate.toString()})</#if> </div></td> <td bgcolor='white'><div><a href='<@ofbizUrl>deletePartyContactMechPurpose?contactMechId=${contactMechId}&contactMechPurposeTypeId=${partyContactMechPurpose.contactMechPurposeTypeId}&fromDate=${partyContactMechPurpose.fromDate.toString()?html}&DONE_PAGE=${donePage}&useValues=true</@ofbizUrl>' class='buttontext'> ${uiLabelMap.CommonDelete} </a></div></td> @@ -181,7 +181,7 @@ <input type="text" class='inputBox' size="4" maxlength="10" name="countryCode" value="${telecomNumberData.countryCode?if_exists}"> - <input type="text" class='inputBox' size="4" maxlength="10" name="areaCode" value="${telecomNumberData.areaCode?if_exists}"> - <input type="text" class='inputBox' size="15" maxlength="15" name="contactNumber" value="${telecomNumberData.contactNumber?if_exists}"> - ext <input type="text" class='inputBox' size="6" maxlength="10" name="extension" value="${partyContactMechData.extension?if_exists}"> + ${uiLabelMap.PartyExtension} <input type="text" class='inputBox' size="6" maxlength="10" name="extension" value="${partyContactMechData.extension?if_exists}"> </div> </td> </tr> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl Fri Jun 8 02:06:47 2007 @@ -218,7 +218,7 @@ <input type="text" class='inputBox' name="CUSTOMER_HOME_COUNTRY" value="${requestParameters.CUSTOMER_HOME_COUNTRY?if_exists}" size="4" maxlength="10"> - <input type="text" class='inputBox' name="CUSTOMER_HOME_AREA" value="${requestParameters.CUSTOMER_HOME_AREA?if_exists}" size="4" maxlength="10"> - <input type="text" class='inputBox' name="CUSTOMER_HOME_CONTACT" value="${requestParameters.CUSTOMER_HOME_CONTACT?if_exists}" size="15" maxlength="15"> - ext <input type="text" class='inputBox' name="CUSTOMER_HOME_EXT" value="${requestParameters.CUSTOMER_HOME_EXT?if_exists}" size="6" maxlength="10"> + ${uiLabelMap.PartyExtension} <input type="text" class='inputBox' name="CUSTOMER_HOME_EXT" value="${requestParameters.CUSTOMER_HOME_EXT?if_exists}" size="6" maxlength="10"> <br/> <select name="CUSTOMER_HOME_ALLOW_SOL" class='selectBox'> <option>${requestParameters.CUSTOMER_HOME_ALLOW_SOL?default("${uiLabelMap.CommonY}")}</option> @@ -233,7 +233,7 @@ <input type="text" class='inputBox' name="CUSTOMER_WORK_COUNTRY" value="${requestParameters.CUSTOMER_WORK_COUNTRY?if_exists}" size="4" maxlength="10"> - <input type="text" class='inputBox' name="CUSTOMER_WORK_AREA" value="${requestParameters.CUSTOMER_WORK_AREA?if_exists}" size="4" maxlength="10"> - <input type="text" class='inputBox' name="CUSTOMER_WORK_CONTACT" value="${requestParameters.CUSTOMER_WORK_CONTACT?if_exists}" size="15" maxlength="15"> - ext <input type="text" class='inputBox' name="CUSTOMER_WORK_EXT" value="${requestParameters.CUSTOMER_WORK_EXT?if_exists}" size="6" maxlength="10"> + ${uiLabelMap.PartyExtension} <input type="text" class='inputBox' name="CUSTOMER_WORK_EXT" value="${requestParameters.CUSTOMER_WORK_EXT?if_exists}" size="6" maxlength="10"> <br/> <select name="CUSTOMER_WORK_ALLOW_SOL" class='selectBox'> <option>${requestParameters.CUSTOMER_WORK_ALLOW_SOL?default("${uiLabelMap.CommonY}")}</option> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/footer.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/footer.ftl?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/footer.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/footer.ftl Fri Jun 8 02:06:47 2007 @@ -30,6 +30,6 @@ <div class="tabletext">Powered by <a href="http://ofbiz.apache.org" class="tabletext" target="_blank">Apache OFBiz</a></div> </div> <br/> -<div class="tabletext" align="center"><a href="<@ofbizUrl>policies</@ofbizUrl>">See Store Policies Here</a></div> +<div class="tabletext" align="center"><a href="<@ofbizUrl>policies</@ofbizUrl>">${uiLabelMap.EcommerceSeeStorePoliciesHere}</a></div> </body> </html> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl Fri Jun 8 02:06:47 2007 @@ -89,10 +89,10 @@ <div class="screenlet-body"> <div class="tabletext" align="center">${uiLabelMap.CommonCheckoutAnonymousMsg}:</div> <form method="post" action="<@ofbizUrl>setCustomer</@ofbizUrl>" style="margin: 0;"> - <div align="center"><input type="submit" class="smallSubmit" value="Checkout"/></div> + <div align="center"><input type="submit" class="smallSubmit" value="${uiLabelMap.EcommerceCheckout}"/></div> </form> <form method="post" action="<@ofbizUrl>quickAnonSetCustomer</@ofbizUrl>" style="margin: 0;"> - <div align="center"><input type="submit" class="smallSubmit" value="Quick Checkout"/></div> + <div align="center"><input type="submit" class="smallSubmit" value="${uiLabelMap.EcommerceCheckoutQuick}"/></div> </form> </div> </div> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl Fri Jun 8 02:06:47 2007 @@ -63,8 +63,8 @@ </td> <td width="5"> </td> <td align="left" valign="top" width="80%"> - <#if orderHeader?has_content> - <div class="tabletext">${localOrderReadHelper.getStatusString()}</div> + <#if orderHeader?has_content> + <div class="tabletext">${localOrderReadHelper.getStatusString(locale)}</div> <#else> <div class="tabletext"><b>${uiLabelMap.OrderNotYetOrdered}</b></div> </#if> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl Fri Jun 8 02:06:47 2007 @@ -64,7 +64,7 @@ <td width="5"> </td> <td align="left" valign="top" width="80%"> <#if orderHeader?has_content> - <div class="tabletext">${localOrderReadHelper.getStatusString()}</div> + <div class="tabletext">${localOrderReadHelper.getStatusString(locale)}</div> <#else> <div class="tabletext"><b>${uiLabelMap.OrderNotYetOrdered}</b></div> </#if> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Fri Jun 8 02:06:47 2007 @@ -28,8 +28,7 @@ obj.submit(); } </script> - - +<br/> <div class="screenlet"> <div class="screenlet-header"> <div class="boxlink"> @@ -158,7 +157,7 @@ <div class="boxhead"> ${uiLabelMap.EcommerceShoppingListReorder} - ${shoppingList.listName} <#if shoppingList.isActive?default("N") == "N"> - <font color="yellow">[${uiLabelMap.OrderNotActive}]</font> + <font color="yellow">[${uiLabelMap.EcommerceOrderNotActive}]</font> </#if> </div> </div> Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties (original) +++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties Fri Jun 8 02:06:47 2007 @@ -131,3 +131,33 @@ PageTitleListEmplPositionResponsibilities=List EmplPosition Responsibilities PageTitleListEmplPositionReportingStructs=ListEmplPositionReportingStructs PageTitleListValidResponsibilities=List ValidResponsibilities + +FormFieldTitle_statusId=Status Id +FormFieldTitle_budgetId=Budget Id +FormFieldTitle_budgetItemSeqId=Budget Item Seq Id +FormFieldTitle_estimatedFromDate=Estimated From Date +FormFieldTitle_estimatedThruDate=Estimated Thru Date +FormFieldTitle_salaryFlag=Salary Flag +FormFieldTitle_exemptFlag=Exempt Flag +FormFieldTitle_fulltimeFlag=Fulltime Flag +FormFieldTitle_temporaryFlag=Temporary Flag +FormFieldTitle_actualFromDate=Actual From Date +FormFieldTitle_actualThruDate=Actual Thru Date +FormFieldTitle_responsibilityTypeId=Responsibility Type Id +FormFieldTitle_comments=Comments +FormFieldTitle_emplPositionIdManagedBy=Empl Position Id Managed By +FormFieldTitle_primaryFlag=Primary Flag +FormFieldTitle_emplPositionTypeId=Empl Position Type Id +FormFieldTitle_roleTypeIdFrom=Role Type Id From +FormFieldTitle_roleTypeIdTo=Role Type Id To +FormFieldTitle_partyIdFrom=Party Id From +FormFieldTitle_partyIdTo=Party Id To +FormFieldTitle_terminationReasonId=Termination Reason Id +FormFieldTitle_unemploymentClaimId=Unemployment Claim Id +FormFieldTitle_unemploymentClaimDate=Unemployment Claim Date +FormFieldTitle_emplPositionId=Empl Position Id +FormFieldTitle_employmentAppSourceTypeId=Employment App Source Type Id +FormFieldTitle_applyingPartyId=Applying Party Id +FormFieldTitle_referredByPartyId=Referred By Party Id +FormFieldTitle_applicationDate=Application Date +FormFieldTitle_applicationId=Application Id \ No newline at end of file Added: ofbiz/trunk/applications/humanres/config/HumanResUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels_it.properties?view=auto&rev=545461 ============================================================================== --- ofbiz/trunk/applications/humanres/config/HumanResUiLabels_it.properties (added) +++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels_it.properties Fri Jun 8 02:06:47 2007 @@ -0,0 +1,162 @@ +############################################################################### +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +############################################################################### +# +# OFBiz UiLabel Properties used for the Human Resources module +# +HumanResServices.PartyQualFailureIDCreation=Non \u00e8 possibile creare voce educazione, creazione ID fallita +HumanResServices.PartyQualFailureIDStartsDigit=Non \u00e8 possibile creare voce educazione, ID inizia con un numero +HumanResServices.PartyQualFailureInputEntities=Non \u00e8 possibile creare voce educazione, uno o pi\u00f9 entit\u00e0 non esistono +HumanResServices.PartyQualFailureAlreadyExists=Non \u00e8 possibile creare voce educazione, questo \u00e8 gi\u00e0 esistente +HumanResServices.PartyQualFailureMissingParam=Non \u00e8 possibile creare voce educazione, parametro richiesto mancante +HumanResServices.PartyQualFailureDataSource=Non \u00e8 possibile creare voce educazione, errore sorgente dati +HumanResApplicationId=Codice Applicazione +HumanResBudgetID=Codice Budget +HumanResCompanyName=OFBiz: Gestione Risorse Umane +HumanResCompanySubtitle=Part of the Open For Business Family of Open Source Software +HumanResEditEmployment=Aggiorna Impiegato +HumanResEditEmploymentApp=Aggiorna Applicazione Impiego +HumanResEditEmplPosition=Aggiorna Posizione Impiego +HumanResEditEmplPositionFulfillment=Aggiorna Posizione Adempimento +HumanResEditEmplPositionReportingStruct=Aggiorna Struttura Stampa Posizione Impiegati +HumanResEditEmplPositionResponsibility=Aggiorna Posizione Responsabilit\u00e0 +HumanResEditPartyBenefit=Aggiorna Benefit Soggetto +HumanResEditPartyQual=Aggiorna Qualifica Soggetto +HumanResEditPartyResume=Aggiorna Riassunto Soggetto +HumanResEditPartyReview=Aggiorna Rassegna Soggetto +HumanResEditPartySkill=Aggiorna Abilit\u00e0 Soggetto +HumanResEditPayGrade=Aggiorna Grado Paga +HumanResEditPayHistory=Aggiorna Storia Paghe +HumanResEditPayrollPreference=Aggiorna Preferenze Paghe +HumanResEditPerfReviewItems=Aggiorna Preferenze Righe Rassegne +HumanResEditSalaryStep=Aggiorna Passi Salario +HumanResEditTerminationReason=Aggiorna Motivazione Licenziamento +HumanResEditValidResponsibility=Aggiorna Validit\u00e0 Responsibilit\u00e0 +HumanResEditUnemploymentClaim=Aggiorna Reclamo Disoccupazione +HumanResEmployeePosition=Posizione Impiegato +HumanResEmployeePositionId=Codice Posizione Impiegato +HumanResEmployment=Impiegato +HumanResEmploymentApp=Applicazione Impiegato +HumanResEmplPositionId=Codice Posizione Impiegato +HumanResEmplPositionIdManagedBy=Codice Posizione Impiegato Gestita Da +HumanResEmplPositionIdReportingTo=Codice Posizione Impiegato Stampato Da +HumanResEmplPositionIdReportingFrom=Codice Posizione Impiegato Stampato A +HumanResEmployeePositionTypeId=Codice Tipo Posizione Impiegato +HumanResEstimatedFromDate=Data Inizio Stimata +HumanResListEmploymentApps=Lista Applicazioni Impiegato +HumanResListEmployments=Lista Impiegato +HumanResListEmplPosition=Lista Posizione Impiegato +HumanResListPartyBenefits=Lista Benefits Soggetto +HumanResListPartyQual=Lista Qualifica Soggetto +HumanResListPartyResumes=Lista Riassunti Soggetto +HumanResListPartySkill=Lista Abilit\u00e0 Soggetto +HumanResListPayGrade=Lista Grado Paga +HumanResListPayHistories=Lista Storia Paghe +HumanResListPayrollPreferences=Lista Preferenze Paghe +HumanResListSalaryStep=Lista Passi Salario +HumanResListTerminationReasons=Lista Motivazioni Licenziamento +HumanResListUnemploymentClaim=Lista Reclamo Disoccupazione +HumanResListValidResponsibility=Lista Validit\u00e0 Responsibilit\u00e0 +HumanResLookupBudgetByName=Ricerca Budget per Nome +HumanResLookupBudgetItemByName=Ricerca Riga Budget per Nome +HumanResLookupSalaryStepSeqId=Ricerca Sequenza Passo Salario +HumanResLookupTerminationReason=Ricerca Motivazioni Licenziamento +HumanResBudgetItemSeqId=Riga Budget +HumanResLookupEmplPositionByName=Ricerca Posizione Impiegato per Nome +HumanResLookupPayGrade=Ricerca Grado Paga +HumanResLookupPayGradeId=Ricerca Codice Grado Paga +HumanResManagerApplication=Applicazione Gestione Risorse Umane +HumanResNewEmployment=Nuovo Impiegato +HumanResNewEmplPosition=Nuova Posizione Impiegato +HumanResNewEmplPositionResponsibility=Nuova Posizione Responsabilit\u00e0 Impiegato +HumanResNewEmplPositionReportingStruct=Nuova Posizione Impiegato Struttura Stampa +HumanResNewPartyBenefit=Nuovo Benefit Soggetto +HumanResNewPartyQual=Nuova Qualifica Soggetto +HumanResNewPartyReview=Nuova Rassegna Prestazioni +HumanResNewPartyReviewEdit=Crea/Aggiorna Rassegna Prestazioni +HumanResNewPartyReviewItem=Nuova Riga Rassegna Prestazioni +HumanResNewPartyReviewItemEdit=Crea/Aggiorna Riga Rassegna Prestazioni +HumanResNewPartySkill=Nuova Abilit\u00e0 Soggetto +HumanResNewPayGrade=Nuovo Grado Paga +HumanResNewPayrollPreferences=Nuove Preferenze Paghe +HumanResNewEmploymentApp=Nuova Applicazione Impiegato +HumanResNewPartyBenefit=Nuovo Benefit Soggetto +HumanResNewPartyResume=Nuovo Riassunto Soggetto +HumanResNewPayHistory=Nuovo Storia Paghe +HumanResNewPayrollPreferences=Nuove Preferenze Paghe +HumanResNewSalaryStep=Nuovo Passo Salario +HumanResNewTerminationReason=Nuova Motivazione Licenziamento +HumanResNewUnemploymentClaim=Nuovo Reclamo Disoccupazione +HumanResPartyBenifit=Benifit Soggetto +HumanResPartyIdFrom=Codice Soggetto Da +HumanResPartyIdTo=Codice Soggetto A +HumanResPartyReview=Rassegna Soggetto +HumanResPayGrade=Grado Paga +HumanResPayGradeID=Codice Grado Paga +HumanResPayHistories=Storia Paghe +HumanResPayHistory=Storia Paga +HumanResPayRollPerferences=Preferenze Paghe +HumanResPayrollPreferenceSeqId=Sequenza Preferenze Paghe +HumanResResponsibilityTypeId=Tipo Responsabilit\u00e0 +HumanResSalaryStepSeqId=Sequenza Passo Salario +HumanResTerminationReason=Motivazione Licenziamento +HumanResTerminationReasonId=Codice Motivazione Licenziamento +HumanResTerminationTypeId=Tipo Licenziamento +HumanResViewPermissionError=Errore Permesso di Visualizzazione +HumanResUnemploymentClaim=Reclamo Disoccupazione +PageTitleEditEmplPosition=Aggiorna Posizione Impiegato +PageTitleEditPartyReview=Aggiorna Rassegna Prestazioni +PageTitleEditPartyReviewItem==Aggiorna Riga Rassegna Prestazioni +PageTitleEditValidResponsibility=Aggiorna Validit\u00e0 Responsibilit\u00e0 +PageTitleListPartyReview=Lista Rassegna Prestazioni +PageTitleListPartyReviewItems=Lista Riga Rassegna Prestazioni +PageTitleListEmplPosition=Lista Posizione Impiegato +PageTitleListEmplPositionFulfillments=Lista Posizione Impiegato Adempimenti +PageTitleListEmplPositionResponsibilities=Lista Posizione Responsabilit\u00e0 Impiegato +PageTitleListEmplPositionReportingStructs=Lista Posizione Impiegato Struttura Stampe +PageTitleListValidResponsibilities=Lista Validit\u00e0 Responsibilit\u00e0 + +FormFieldTitle_statusId=Stato +FormFieldTitle_budgetId=Codice Budget +FormFieldTitle_budgetItemSeqId=Numero Sequenza Riga Budget +FormFieldTitle_estimatedFromDate=Data Inizio Stimata +FormFieldTitle_estimatedThruDate=Data Fine Stimata +FormFieldTitle_salaryFlag=Flag Salario +FormFieldTitle_exemptFlag=Flag Esenzione +FormFieldTitle_fulltimeFlag=Flag Tempo Pieno +FormFieldTitle_temporaryFlag=Flag Temporaneo +FormFieldTitle_actualFromDate=Data Inizio Attuale +FormFieldTitle_actualThruDate=Data Fine Attuale +FormFieldTitle_responsibilityTypeId=Tipo Responsibilit\u00e0 +FormFieldTitle_comments=Commenti +FormFieldTitle_emplPositionIdManagedBy=Codice Posizione Impiegato Gestita Da +FormFieldTitle_primaryFlag=Flag Primario +FormFieldTitle_emplPositionTypeId=Tipo Posizione Impiegato +FormFieldTitle_roleTypeIdFrom=Tipo Ruolo Da +FormFieldTitle_roleTypeIdTo=Tipo Ruolo A +FormFieldTitle_partyIdFrom=Codice Soggetto Da +FormFieldTitle_partyIdTo=Codice Soggetto A +FormFieldTitle_terminationReasonId=Motivazione Licenziamento +FormFieldTitle_unemploymentClaimId=Reclamo Disoccupazione +FormFieldTitle_unemploymentClaimDate=Data Reclamo Disoccupazione +FormFieldTitle_emplPositionId=Posizione Impiegato +FormFieldTitle_employmentAppSourceTypeId=Tipo Origine Applicazione Impiegato +FormFieldTitle_applyingPartyId=Soggetto Applicato +FormFieldTitle_referredByPartyId=Riferito Dal Soggetto +FormFieldTitle_applicationDate=Data Applicazione +FormFieldTitle_applicationId=Numero Applicazione \ No newline at end of file Propchange: ofbiz/trunk/applications/humanres/config/HumanResUiLabels_it.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/config/HumanResUiLabels_it.properties ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/applications/humanres/config/HumanResUiLabels_it.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java Fri Jun 8 02:06:47 2007 @@ -27,6 +27,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; @@ -590,7 +591,7 @@ } } - public String getStatusString() { + public String getStatusString(Locale locale) { List orderStatusList = this.getOrderHeaderStatuses(); if (orderStatusList == null || orderStatusList.size() == 0) return ""; @@ -605,7 +606,7 @@ GenericValue statusItem = orderStatus.getRelatedOneCache("StatusItem"); if (statusItem != null) { - orderStatusString.append(statusItem.getString("description")); + orderStatusString.append(statusItem.get("description", locale)); } else { orderStatusString.append(orderStatus.getString("statusId")); } Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.properties?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/framework/common/config/CommonUiLabels.properties (original) +++ ofbiz/trunk/framework/common/config/CommonUiLabels.properties Fri Jun 8 02:06:47 2007 @@ -17,7 +17,9 @@ # under the License. ############################################################################### Accounting=Accounting +AssetMaint=Asset Maint Catalog=Catalog +CMS Site=CMS Site CommonAccepted=Accepted CommonAccounting=Accounting CommonActiveInactive=Active and Inactive @@ -464,6 +466,7 @@ DataSourceTypeCreate=Create Data Source Type DataSourceTypeDescription=Description Example=Example +ExampleExt=Example Ext Facility=Facility Factoids=Did you know? Financials=Financials @@ -490,6 +493,8 @@ FormFieldTitle_total=Total FormFieldTitle_uomId=Valuta FormFieldTitle_updateButton=Update +Handheld Facility=Handheld Facility +HR=HR Manufacturing=Manufacturing Marketing=Marketing MostRecentlyViewed=Recently Viewed @@ -506,6 +511,7 @@ PartyContactMechID=Contact Mechanism ID PartyContactPurpose=Contact Purpose PartyPartyID=Party ID +Project=Project Shark=Shark VatTaxAuthGeoNotSet=Vat Tax Authority Geo not set. VatTaxAuthPartyNotSet=Vat Tax Auth Party not set. Modified: ofbiz/trunk/framework/common/config/CommonUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels_it.properties?view=diff&rev=545461&r1=545460&r2=545461 ============================================================================== --- ofbiz/trunk/framework/common/config/CommonUiLabels_it.properties (original) +++ ofbiz/trunk/framework/common/config/CommonUiLabels_it.properties Fri Jun 8 02:06:47 2007 @@ -17,7 +17,9 @@ # under the License. ############################################################################### Accounting=Contabilit\u00e0 +AssetMaint=Gestione Cespiti Catalog=Cataloghi +CMS Site=Sito CMS CommonAccepted=Accettato CommonAccounting=Contabilit\u00e0 CommonActiveInactive=Attivo e Inattivo @@ -452,9 +454,12 @@ DataSourceTypeCreate=Creare Tipo Sorgente Dati DataSourceTypeDescription=Descrizione Example=Esempi +ExampleExt=Esempi Est. Facility=Stabilimenti Factoids=Lo conosci? -Financials=Finanziaria +Financials=Finanza +Handheld Facility=Gestione Stabilimenti su Handheld +HR=Risorse Umane Manufacturing=Produzione Marketing=Vendite MostRecentlyViewed=Visti Recentemente @@ -471,6 +476,7 @@ PartyContactMechID=Contatto PartyContactPurpose=Funzione Conttatto PartyPartyID=Codice Soggetto +Project=Progetti Shark=Flussi di Lavoro WebTools=Strumenti Web WorkEffort=Impegni di Lavoro |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |