svn commit: r431417 - in /incubator/ofbiz/trunk: applications/party/config/ applications/party/webapp/part
Locked
svn commit: r431417 - in /incubator/ofbiz/trunk: applications/party/config/ applications/party/webapp/part
 
|
Author: jleroux
Date: Mon Aug 14 12:39:17 2006 New Revision: 431417 URL: http://svn.apache.org/viewvc?rev=431417&view=rev Log: Patches from Marco Risalti : see Apache Jira OFBIZ-123. They are intended to manage a part of Applications and Framework i18n Added: incubator/ofbiz/trunk/framework/webapp/config/WebappEntityLabels.properties (with props) incubator/ofbiz/trunk/framework/webapp/config/WebappEntityLabels_it.properties (with props) Modified: incubator/ofbiz/trunk/applications/party/config/PartyUiLabels.properties incubator/ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties incubator/ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl incubator/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels.properties incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml incubator/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml incubator/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties incubator/ofbiz/trunk/framework/common/entitydef/entitymodel.xml incubator/ofbiz/trunk/framework/common/webcommon/includes/countries.ftl Modified: incubator/ofbiz/trunk/applications/party/config/PartyUiLabels.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/config/PartyUiLabels.properties?rev=431417&r1=431416&r2=431417&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/party/config/PartyUiLabels.properties (original) +++ incubator/ofbiz/trunk/applications/party/config/PartyUiLabels.properties Mon Aug 14 12:39:17 2006 @@ -481,9 +481,12 @@ PartyUpdatePartyClassificationPermissionError=Security Error\: to run updatePartyClassification you must have the PARTYMGR_UPDATE or PARTYMGR_ADMIN permission PartyUpdateVendorPermissionError=Security Error\: to run updateVendor you must have the PARTYMGR_UPDATE or PARTYMGR_ADMIN permission PartyUpdateWebSiteRolePermissionError=Security Error\: to run updateWebSiteRole you must have the PARTYMGR_UPDATE or PARTYMGR_ADMIN permission + PartyURI=URI PartyUserCreated=User Created PartyUserLogin=User Login +PartyUserLoginChangePassword=Change UserLogin Password +PartyUserLoginUpdateSecuritySettings=Update UserLogin Security Settings PartyUserLogins=User Logins PartyUserLoginId=User Login Id PartyUserLoginsForSecurityGroup=UserLogins for SecurityGroup with ID @@ -648,3 +651,8 @@ FormFieldTitle_occupation=Occupation FormFieldTitle_yearsWithEmployer=Years With Employer FormFieldTitle_monthsWithEmployer=Months With Employer +FormFieldTitle_newPassword=New Password +FormFieldTitle_newPasswordVerify=New Password Verify +FormFieldTitle_enabled=Enabled +FormFieldTitle_disabledDateTime=Disabled Date Time +FormFieldTitle_successiveFailedLogins=Successive Failed Logins Modified: incubator/ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties?rev=431417&r1=431416&r2=431417&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties (original) +++ incubator/ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties Mon Aug 14 12:39:17 2006 @@ -151,7 +151,7 @@ PartyChildShoppingList=Figlio Lista Acquisto PartyCannotUpdateContactBecauseNotWithSpecifiedParty=ERRORE: Non \u00e8 possibile aggiornare le informazioni contatto specificate perch\u00e8 non corrisponde al cliente specificato. PartyChangeParty=Cambia Soggetto -PartyCity=Citt +PartyCity=Citt\u00e0 PartyCityMissing=Citt\u00e0 mancante PartyClassifications=Classificazioni PartyClassificationGroupId=Codice Gruppo Classificazione @@ -181,7 +181,7 @@ PartyContactFaxPhoneNumber=Numero di Fax PartyContactInformation=Informazioni Contatto PartyContactList=Lista Contatto -PartyContactListPartyCreate=Aggiungi Soggetti all Lista Contatti +PartyContactListPartyCreate=Aggiungi Soggetti alla Lista Contatti PartyContactMechIdMissing=Codice Contatto mancante PartyContactMechType=Tipo Contatto PartyContactMechTypeIdMissing=Codice Tipo Contatto mancante @@ -484,6 +484,8 @@ PartyURI=URI PartyUserCreated=Utente Creatore PartyUserLogin=Utente Login +PartyUserLoginChangePassword=Cambio Password Utente Login +PartyUserLoginUpdateSecuritySettings=Aggiorna Impostazioni Sicurezza Utente Login PartyUserLogins=Utenti Logins PartyUserLoginId=Codice Utente Login PartyUserLoginsForSecurityGroup=Utenti Logins per Gruppo Sicurezza con Codice @@ -607,7 +609,7 @@ FormFieldTitle_roleTypeIdFrom=Tipo Ruolo Da FormFieldTitle_roleTypeIdTo=Tipo Ruolo A FormFieldTitle_subject=Soggetto -FormFieldTitle_contactListId=Codice Lista Contatto +FormFieldTitle_contactListId=Lista Contatto FormFieldTitle_contactListName=Nome Lista Contatto FormFieldTitle_contactListTypeId=Tipo Lista Contatto FormFieldTitle_contentMimeTypeId=Codice Tipo Contenuto Mime @@ -648,3 +650,8 @@ FormFieldTitle_occupation=Occupazione FormFieldTitle_yearsWithEmployer=Anni Come Impiegato FormFieldTitle_monthsWithEmployer=Mesi Come Impiegato +FormFieldTitle_newPassword=Password Nuova +FormFieldTitle_newPasswordVerify=Verifica Password Nuova +FormFieldTitle_enabled=Abilitato +FormFieldTitle_disabledDateTime=Data Ora Disabilitazione +FormFieldTitle_successiveFailedLogins=Login Successivi Falliti Modified: incubator/ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl?rev=431417&r1=431416&r2=431417&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl (original) +++ incubator/ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl Mon Aug 14 12:39:17 2006 @@ -31,7 +31,7 @@ <td width="5">: </td> <td width="74%" align="left"> <div class="tabletext"> - ${visit.visitorId?default("Not Found")} + ${visit.visitorId?default("${uiLabelMap.CommonNot} ${uiLabelMap.CommonFound}")} </div> </td> </tr> @@ -166,9 +166,10 @@ <#-- set initial row color --> <#assign rowClass = "viewManyTR2"> <#list serverHits[lowIndex..highIndex-1] as hit> + <#assign serverHitType = hit.getRelatedOne("ServerHitType")?if_exists> <tr class="${rowClass}"> <td><div class="tabletext">${hit.contentId?if_exists}</div></td> - <td><div class="tabletext">${hit.hitTypeId?if_exists}</div></td> + <td><div class="tabletext">${serverHitType.get("description",locale)?if_exists}</div></td> <td><div class="tabletext"> ${hit.numOfBytes?default("?")}</div></td> <td><div class="tabletext">${hit.hitStartDateTime?string?if_exists}</div></td> <td><div class="tabletext"> ${hit.runningTimeMillis?if_exists}</div></td> Modified: incubator/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=431417&r1=431416&r2=431417&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original) +++ incubator/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Mon Aug 14 12:39:17 2006 @@ -383,9 +383,9 @@ <widgets> <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label text="Change UserLogin Password" style="head2"/></container> + <container><label text="${uiLabelMap.PartyUserLoginChangePassword}" style="head2"/></container> <include-form name="updatePassword" location="component://party/webapp/partymgr/party/PartyForms.xml"/> - <container><label text="Update UserLogin Security Settings" style="head2"/></container> + <container><label text="${uiLabelMap.PartyUserLoginUpdateSecuritySettings}" style="head2"/></container> <include-form name="updateUserLoginSecurity" location="component://party/webapp/partymgr/party/PartyForms.xml"/> </decorator-section> </decorator-screen> Modified: incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels.properties?rev=431417&r1=431416&r2=431417&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels.properties (original) +++ incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels.properties Mon Aug 14 12:39:17 2006 @@ -68,6 +68,9 @@ ProductCategoryContentType.description.DESCRIPTION=Description ProductCategoryContentType.description.LONG_DESCRIPTION=Description - Long +ProductCategoryContentType.description.CATEGORY_NAME=Category Name +ProductCategoryContentType.description.CATEGORY_IMAGE_URL=Category Image URL +ProductCategoryContentType.description.FOOTER=Footer ProductType.description.ASSET_USAGE=Fixed Asset Usage ProductType.description.SERVICE=Service @@ -222,3 +225,7 @@ FacilityGroupType.description.MGMT_STRUCTURE=Management Structure FacilityGroupType.description.PRICING_GROUP=Pricing Group + +SubscriptionType.description.NEWSGROUP_SUBSCR=Newsgroup +SubscriptionType.description.OTHER_SUBSCR=Other +SubscriptionType.description.PRODUCT_INFO_SUBSCR=Product Info Modified: incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties?rev=431417&r1=431416&r2=431417&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties (original) +++ incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties Mon Aug 14 12:39:17 2006 @@ -68,6 +68,9 @@ ProductCategoryContentType.description.DESCRIPTION=Descrizione ProductCategoryContentType.description.LONG_DESCRIPTION=Descrizione - Lunga +ProductCategoryContentType.description.CATEGORY_NAME=Nome Categoria +ProductCategoryContentType.description.CATEGORY_IMAGE_URL=URL Immagine Categoria +ProductCategoryContentType.description.FOOTER=Intestazione Fine Pagina ProductType.description.ASSET_USAGE=Uso Cespite ProductType.description.SERVICE=Servizio @@ -222,3 +225,7 @@ FacilityGroupType.description.MGMT_STRUCTURE=Gestione Struttura FacilityGroupType.description.PRICING_GROUP=Gruppo Prezzo + +SubscriptionType.description.NEWSGROUP_SUBSCR=Notiziario +SubscriptionType.description.OTHER_SUBSCR=Altro +SubscriptionType.description.PRODUCT_INFO_SUBSCR=Informazioni Prodotto Modified: incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?rev=431417&r1=431416&r2=431417&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original) +++ incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties Mon Aug 14 12:39:17 2006 @@ -872,6 +872,7 @@ ProductPackageQty=Package Qty ProductPackages=Packages ProductPackedQty=Packed Qty +ProductPacklistManage=Packlist Manage ProductPackOrder=Pack Order ProductPacking=Packing ProductPackingSlip=Packing Slip @@ -1178,6 +1179,7 @@ ProductStores=Stores ProductStoresFor=Stores For ProductStyleSheet=Style Sheet +ProductSubCats=SubCats ProductSubscription=Subscription ProductSubscriptions=Subscriptions ProductSubscriptionResource=Subscription Resources @@ -1625,3 +1627,24 @@ FormFieldTitle_manufacturerPartyId=Manufacturer Party Id FormFieldTitle_serialNumber=Serial Number FormFieldTitle_inventoryItemId=Inventory Item Id +FormFieldTitle_prodCatContentTypeId=Prod Cat Content Type Id +FormFieldTitle_purchaseFromDate=Purchase From Date +FormFieldTitle_purchaseThruDate=Purchase Thru Date +FormFieldTitle_useCountLimit=Use Count Limit +FormFieldTitle_autoOrderCcTryExp=Auto Order Cc Try Exp +FormFieldTitle_autoOrderCcTryOtherCards=Auto Order Cc Try Other Cards +FormFieldTitle_autoOrderCcTryLaterNsf=Auto Order Cc Try Later Nsf +FormFieldTitle_autoOrderCcTryLaterMax=Auto Order Cc Try Later Max +FormFieldTitle_storeCreditValidDays=Store Credit Valid Days +FormFieldTitle_subscriptionId=Subscription Id +FormFieldTitle_subscriptionResourceId=Subscription Resource Id +FormFieldTitle_communicationEventId=Communication Event Id +FormFieldTitle_contactMechId=Contact Mech Id +FormFieldTitle_originatedFromPartyId=Originated From Party Id +FormFieldTitle_originatedFromRoleTypeId=Originated From Role Type Id +FormFieldTitle_roleTypeId=Role Type Id +FormFieldTitle_productId=Product Id +FormFieldTitle_externalSubscriptionId=External Subscription Id +FormFieldTitle_useTime=Use Time +FormFieldTitle_useTimeUomId=Use Time Uom Id +FormFieldTitle_useRoleTypeId=Use Role Type Id Modified: incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?rev=431417&r1=431416&r2=431417&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original) +++ incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Mon Aug 14 12:39:17 2006 @@ -133,6 +133,10 @@ PageTitleEditProductStoreSurveys=Aggiorna Sondaggi Negozio PageTitleEditProductStoreTaxSetup=Aggiorna Configurazione Tasse Negozio PageTitleEditProductStoreWebSites=Aggiorna Siti Web Negozio +PageTitleEditProductSubscriptionResources=Aggiorna Risorse Abbonamento Prodotto +PageTitleEditSubscription=Aggiorna Abbonamento +PageTitleEditSubscriptionResource=Aggiorna Risorsa Abbonamento +PageTitleEditSubscriptionResourceProducts=Aggiorna Risorsa Abbonamento Prodotti PageTitleEditShipmentItems=Aggiorna Righe Spedizione PageTitleEditShipmentPackages=Aggiorna Pacchi Spedizione PageTitleEditShipmentPlan=Aggiorna Piano di Spedizione @@ -147,6 +151,8 @@ PageTitleFindProductPriceRule=Ricerca Regole Prezzo Prodotto PageTitleFindProductPromos=Ricerca Promozioni Prodotto PageTitleFindProductPromotionCode=Ricerca Codice Promozione Prodotto +PageTitleFindSubscription=Ricerca Abbonamenti +PageTitleFindSubscriptionResource=Ricerca Risorse Abbonamenti PageTitleViewProductStoreSegments=Mostra Segmenti Negozio PageTitleLabelPrinting=Stampa Etichette PageTitleLogin=Login @@ -553,6 +559,7 @@ ProductFindOrdersToPick=Ricerca Ordini da prelevare ProductFindProduct=Ricerca Prodotto ProductFindProductWithIdValue=Ricerca Prodotto con Valore Codice +ProductFindResourceSubscriptions=Ricerca Abbonamenti per Risorsa ProductFindRule=Ricerca Regola ProductFindShipment=Ricerca Spedizione(i) ProductFlagPickingStarted=Flag prelievo iniziato @@ -750,6 +757,8 @@ ProductNewShipment=Nuova Spedizione ProductNewShipmentEstimate=Nuova Stima Spedizione ProductNewShipmentMethod=Nuovo Metodo Spedizione +ProductNewSubscription=Nuovo Abbonamento +ProductNewSubscriptionResource=Nuova Risorsa Abbonamento ProductNewVirtualProduct=Nuovo Prodotto Virtuale ProductNextShipment=Spedizione Successiva ProductNoCategorySpecified=Nessuna categoria specificata @@ -855,6 +864,7 @@ ProductPackageQty=Quantit\u00e0 Pacco ProductPackages=Pacchi ProductPackedQty=Quantit\u00e0 Imballata +ProductPacklistManage=Gestione Liste di Imballaggio ProductPackOrder=Imballaggio Ordini ProductPacking=Imballaggio ProductPackingSlip=Lista d'Imballo @@ -1161,6 +1171,11 @@ ProductStores=Negozi ProductStoresFor=Negozi Per ProductStyleSheet=Foglio di Stile +ProductSubCats=SottoCategorie +ProductSubscription=Abbonamento +ProductSubscriptions=Abbonamenti +ProductSubscriptionResource=Risorsa Abbonamento +ProductSubscriptionResources=Risorse Abbonamento ProductSubProduct=SottoProdotto ProductSubTitle=Sotto-Titolo ProductSubject=Soggetto @@ -1603,3 +1618,24 @@ FormFieldTitle_manufacturerPartyId=Codice Soggetto Produttore FormFieldTitle_serialNumber=Numero di Serie FormFieldTitle_inventoryItemId=Numero Riga Inventario +FormFieldTitle_prodCatContentTypeId=Tipo Contenuto Categoria Prodotto +FormFieldTitle_purchaseFromDate=Acquisto Dalla Data +FormFieldTitle_purchaseThruDate=Acquisto Alla Data +FormFieldTitle_useCountLimit=Usa Limite Contatore +FormFieldTitle_autoOrderCcTryExp=Ordine Automatico Cc Tentativo Scadenza +FormFieldTitle_autoOrderCcTryOtherCards=Ordine Automatico Cc Tentativo Altre Carte +FormFieldTitle_autoOrderCcTryLaterNsf=Ordine Automatico Cc Riprovare Successivamente Nsf +FormFieldTitle_autoOrderCcTryLaterMax=Ordine Automatico Cc Riprovare Successivamente Massimo +FormFieldTitle_storeCreditValidDays=Credito Negozio Giorni Validit\u00e0 +FormFieldTitle_subscriptionId=Numero Abbonamento +FormFieldTitle_subscriptionResourceId=Risorsa Abbonamento +FormFieldTitle_communicationEventId=Codice Evento Comunicazioni +FormFieldTitle_contactMechId=Contatto +FormFieldTitle_originatedFromPartyId=Originato Dal Soggetto +FormFieldTitle_originatedFromRoleTypeId=Originato Dal Tipo Ruolo +FormFieldTitle_roleTypeId=Tipo Ruolo +FormFieldTitle_productId=Codice Prodotto +FormFieldTitle_externalSubscriptionId=Numero Abbonamento Esterno +FormFieldTitle_useTime=Usa Tempo +FormFieldTitle_useTimeUomId=Usa Udm Tempo +FormFieldTitle_useRoleTypeId=Usa Tipo Ruolo Modified: incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=431417&r1=431416&r2=431417&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original) +++ incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml Mon Aug 14 12:39:17 2006 @@ -3725,7 +3725,8 @@ <key-map field-name="webSiteId"/> </relation> </entity> - <entity entity-name="SubscriptionType" package-name="org.ofbiz.product.subscription" title="Subscription Type Entity"> + <entity entity-name="SubscriptionType" package-name="org.ofbiz.product.subscription" default-resource-name="ProductEntityLabels" + title="Subscription Type Entity"> <field name="subscriptionTypeId" type="id-ne"></field> <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> Modified: incubator/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml?rev=431417&r1=431416&r2=431417&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml (original) +++ incubator/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml Mon Aug 14 12:39:17 2006 @@ -75,7 +75,7 @@ <field name="productCategoryId"><hidden/></field> <field name="contentId" title="${uiLabelMap.ProductContent}" widget-style="tabletext"> <display-entity entity-name="Content" description="${description}" also-hidden="true"> - <sub-hyperlink target="/content/control/EditContent?contentId=${contentId}" description="Content: ${contentId}" target-type="inter-app" link-style="buttontext"/> + <sub-hyperlink target="/content/control/EditContent?contentId=${contentId}" description="${uiLabelMap.ProductContent}: ${contentId}" target-type="inter-app" link-style="buttontext"/> </display-entity> </field> <field name="fromDate" widget-style="tabletext"><display/></field> @@ -105,7 +105,7 @@ <field use-when="content==null" name="contentId"><ignored/></field> <field use-when="content!=null" name="contentId" tooltip="${uiLabelMap.ProductNotModificationRecrationProductContentAssociation}" map-name="categoryContentData" widget-style="tabletext"><display/></field> - <field name="prodCatContentTypeId" title="Category Content Type" widget-style="tabletext"><display-entity entity-name="ProductCategoryContentType" also-hidden="true"/></field> + <field name="prodCatContentTypeId" widget-style="tabletext"><display-entity entity-name="ProductCategoryContentType" also-hidden="true"/></field> <field name="description" map-name="content"><text size="40"/></field> <field name="localeString" map-name="content"><text size="40"/></field> <field name="text" map-name="textDataMap" widget-style="textAreaBox"><textarea cols="80" rows="10"/></field> Modified: incubator/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=431417&r1=431416&r2=431417&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original) +++ incubator/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Mon Aug 14 12:39:17 2006 @@ -101,7 +101,7 @@ <div class="tabletext"> ${(condProductCategory.get("description",locale))?if_exists} [${condProductPromoCategory.productCategoryId}] - ${(condApplEnumeration.get("description",locale))?default(condProductPromoCategory.productPromoApplEnumId)} - - SubCats? ${condProductPromoCategory.includeSubCategories?default("N")} + - ${uiLabelMap.ProductSubCats}? ${condProductPromoCategory.includeSubCategories?default("N")} - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${condProductPromoCategory.andGroupId} <a href="<@ofbizUrl>deleteProductPromoCategory?productPromoId=${(condProductPromoCategory.productPromoId)?if_exists}&productPromoRuleId=${(condProductPromoCategory.productPromoRuleId)?if_exists}&productPromoActionSeqId=${(condProductPromoCategory.productPromoActionSeqId)?if_exists}&productPromoCondSeqId=${(condProductPromoCategory.productPromoCondSeqId)?if_exists}&productCategoryId=${(condProductPromoCategory.productCategoryId)?if_exists}&andGroupId=${(condProductPromoCategory.andGroupId)?if_exists}</@ofbizUrl>" class="buttontext"> [${uiLabelMap.CommonDelete}]</a> @@ -254,7 +254,7 @@ <div class="tabletext"> ${(actionProductCategory.description)?if_exists} [${actionProductPromoCategory.productCategoryId}] - ${(actionApplEnumeration.get("description",locale))?default(actionProductPromoCategory.productPromoApplEnumId)} - - SubCats? ${actionProductPromoCategory.includeSubCategories?default("N")} + - ${uiLabelMap.ProductSubCats}? ${actionProductPromoCategory.includeSubCategories?default("N")} - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${actionProductPromoCategory.andGroupId} <a href="<@ofbizUrl>deleteProductPromoCategory?productPromoId=${(actionProductPromoCategory.productPromoId)?if_exists}&productPromoRuleId=${(actionProductPromoCategory.productPromoRuleId)?if_exists}&productPromoCondSeqId=${(actionProductPromoCategory.productPromoCondSeqId)?if_exists}&productPromoActionSeqId=${(actionProductPromoCategory.productPromoActionSeqId)?if_exists}&productCategoryId=${(actionProductPromoCategory.productCategoryId)?if_exists}&andGroupId=${(actionProductPromoCategory.andGroupId)?if_exists}</@ofbizUrl>" class="buttontext"> [${uiLabelMap.CommonDelete}]</a> @@ -376,7 +376,7 @@ <div class="tabletext"> ${(promoProductCategory.description)?if_exists} [${promoProductPromoCategory.productCategoryId}] - ${(promoApplEnumeration.get("description",locale))?default(promoProductPromoCategory.productPromoApplEnumId)} - - SubCats? ${promoProductPromoCategory.includeSubCategories?default("N")} + - ${uiLabelMap.ProductSubCats}? ${promoProductPromoCategory.includeSubCategories?default("N")} - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${promoProductPromoCategory.andGroupId} <a href="<@ofbizUrl>deleteProductPromoCategory?productPromoId=${(promoProductPromoCategory.productPromoId)?if_exists}&productPromoRuleId=${(promoProductPromoCategory.productPromoRuleId)?if_exists}&productPromoActionSeqId=${(promoProductPromoCategory.productPromoActionSeqId)?if_exists}&productPromoCondSeqId=${(promoProductPromoCategory.productPromoCondSeqId)?if_exists}&productCategoryId=${(promoProductPromoCategory.productCategoryId)?if_exists}&andGroupId=${(promoProductPromoCategory.andGroupId)?if_exists}</@ofbizUrl>" class="buttontext"> [${uiLabelMap.CommonDelete}]</a> Modified: incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties?rev=431417&r1=431416&r2=431417&view=diff ============================================================================== --- incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties (original) +++ incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties Mon Aug 14 12:39:17 2006 @@ -39,7 +39,7 @@ StatusItem.description.SYNCHRONIZED=Synchronized StatusType.description.SYNCHRONIZE_STATUS=Synchronize -<-- ORDER_SALES_CHANNEL --> +# ORDER_SALES_CHANNEL EnumerationType.description.ORDER_SALES_CHANNEL=Order Sales Channel Enumeration.description.WEB_SALES_CHANNEL=Web Channel Enumeration.description.POS_SALES_CHANNEL=POS Channel @@ -800,3 +800,270 @@ StatusItem.description.ODS_APPROVED=Schedule Approved StatusItem.description.ODS_ARRANGED=Delivery Arranged StatusItem.description.ODS_CANCELLED=Delivery Cancelled + +# geo country +Geo.geoName._NA_=Not Applicable +Geo.geoName.IRQ=Iraq +Geo.geoName.NIU=Niue +Geo.geoName.CAN=Canada +Geo.geoName.USA=United States +Geo.geoName.OMN=Oman +Geo.geoName.AFG=Afghanistan +Geo.geoName.ALB=Albania +Geo.geoName.ATA=Antarctica +Geo.geoName.DZA=Algeria +Geo.geoName.ASM=American Samoa +Geo.geoName.AND=Andorra +Geo.geoName.AGO=Angola +Geo.geoName.ATG=Antigua And Barbuda +Geo.geoName.AZE=Azerbaijan +Geo.geoName.ARG=Argentina +Geo.geoName.AUS=Australia +Geo.geoName.AUT=Austria +Geo.geoName.BHS=Bahamas +Geo.geoName.BHR=Bahrain +Geo.geoName.BRB=Barbados +Geo.geoName.BEL=Belgium +Geo.geoName.BMU=Bermuda +Geo.geoName.BTN=Bhutan +Geo.geoName.BOL=Bolivia +Geo.geoName.BIH=Bosnia And Herzegowina +Geo.geoName.BVT=Bouvet Island +Geo.geoName.BRA=Brazil +Geo.geoName.BLZ=Belize +Geo.geoName.IOT=British Indian Ocean Territory +Geo.geoName.SLB=Solomon Islands +Geo.geoName.VGB=Virgin Islands (british) +Geo.geoName.BRN=Brunei Darussalam +Geo.geoName.BGR=Bulgaria +Geo.geoName.MMR=Myanmar +Geo.geoName.BDI=Burundi +Geo.geoName.BLR=Belarus +Geo.geoName.KHM=Cambodia +Geo.geoName.CMR=Cameroon +Geo.geoName.CPV=Cape Verde +Geo.geoName.CYM=Cayman Islands +Geo.geoName.CAF=Central African Republic +Geo.geoName.LKA=Sri Lanka +Geo.geoName.TCD=Chad +Geo.geoName.CHL=Chile +Geo.geoName.CHN=China +Geo.geoName.TWN=Taiwan, Province Of China +Geo.geoName.CXR=Christmas Island +Geo.geoName.CCK=Cocos (keeling) Islands +Geo.geoName.COL=Colombia +Geo.geoName.COM=Comoros +Geo.geoName.MYT=Mayotte +Geo.geoName.COG=Congo +Geo.geoName.COD=Congo, The Democratic Republic Of The +Geo.geoName.COK=Cook Islands +Geo.geoName.CRI=Costa Rica +Geo.geoName.HRV=Croatia (local Name: Hrvatska) +Geo.geoName.CUB=Cuba +Geo.geoName.CYP=Cyprus +Geo.geoName.CZE=Czech Republic +Geo.geoName.BEN=Benin +Geo.geoName.DNK=Denmark +Geo.geoName.DMA=Dominica +Geo.geoName.DOM=Dominican Republic +Geo.geoName.ECU=Ecuador +Geo.geoName.SLV=El Salvador +Geo.geoName.GNQ=Equatorial Guinea +Geo.geoName.ETH=Ethiopia +Geo.geoName.ERI=Eritrea +Geo.geoName.EST=Estonia +Geo.geoName.FRO=Faroe Islands +Geo.geoName.FLK=Falkland Islands (malvinas) +Geo.geoName.SGS=South Georgia And The South Sandwich Islands +Geo.geoName.FJI=Fiji +Geo.geoName.FIN=Finland +Geo.geoName.FXX=France, Metropolitan +Geo.geoName.FRA=France +Geo.geoName.GUF=French Guiana +Geo.geoName.PYF=French Polynesia +Geo.geoName.ATF=French Southern Territories +Geo.geoName.DJI=Djibouti +Geo.geoName.GAB=Gabon +Geo.geoName.GEO=Georgia +Geo.geoName.GMB=Gambia +Geo.geoName.PSE=Palestinian Territory, Occupied +Geo.geoName.DEU=Germany +Geo.geoName.GHA=Ghana +Geo.geoName.GIB=Gibraltar +Geo.geoName.KIR=Kiribati +Geo.geoName.GRC=Greece +Geo.geoName.GRL=Greenland +Geo.geoName.GRD=Grenada +Geo.geoName.GLP=Guadeloupe +Geo.geoName.GUM=Guam +Geo.geoName.GTM=Guatemala +Geo.geoName.GIN=Guinea +Geo.geoName.GUY=Guyana +Geo.geoName.HTI=Haiti +Geo.geoName.HMD=Heard And Mc Donald Islands +Geo.geoName.VAT=Holy See (vatican City State) +Geo.geoName.HND=Honduras +Geo.geoName.HKG=Hong Kong +Geo.geoName.HUN=Hungary +Geo.geoName.ISL=Iceland +Geo.geoName.IND=India +Geo.geoName.IDN=Indonesia +Geo.geoName.IRN=Iran (islamic Republic Of) +Geo.geoName.IRL=Ireland +Geo.geoName.ISR=Israel +Geo.geoName.ITA=Italy +Geo.geoName.CIV=Cote D'ivoire +Geo.geoName.JAM=Jamaica +Geo.geoName.JPN=Japan +Geo.geoName.KAZ=Kazakhstan +Geo.geoName.JOR=Jordan +Geo.geoName.KEN=Kenya +Geo.geoName.PRK=Korea, Democratic People's Republic Of +Geo.geoName.KOR=Korea, Republic Of +Geo.geoName.KWT=Kuwait +Geo.geoName.KGZ=Kyrgyzstan +Geo.geoName.LAO=Lao People's Democratic Republic +Geo.geoName.LBN=Lebanon +Geo.geoName.LSO=Lesotho +Geo.geoName.LVA=Latvia +Geo.geoName.LBR=Liberia +Geo.geoName.LBY=Libyan Arab Jamahiriya +Geo.geoName.LIE=Liechtenstein +Geo.geoName.LTU=Lithuania +Geo.geoName.LUX=Luxembourg +Geo.geoName.MAC=Macau +Geo.geoName.MDG=Madagascar +Geo.geoName.MWI=Malawi +Geo.geoName.MYS=Malaysia +Geo.geoName.MDV=Maldives +Geo.geoName.MLI=Mali +Geo.geoName.MLT=Malta +Geo.geoName.MTQ=Martinique +Geo.geoName.MRT=Mauritania +Geo.geoName.MUS=Mauritius +Geo.geoName.MEX=Mexico +Geo.geoName.MCO=Monaco +Geo.geoName.MNG=Mongolia +Geo.geoName.MDA=Moldova, Republic Of +Geo.geoName.MSR=Montserrat +Geo.geoName.MAR=Morocco +Geo.geoName.MOZ=Mozambique +Geo.geoName.NAM=Namibia +Geo.geoName.NRU=Nauru +Geo.geoName.NPL=Nepal +Geo.geoName.NLD=Netherlands +Geo.geoName.ANT=Netherlands Antilles +Geo.geoName.ABW=Aruba +Geo.geoName.NCL=New Caledonia +Geo.geoName.VUT=Vanuatu +Geo.geoName.NZL=New Zealand +Geo.geoName.NIC=Nicaragua +Geo.geoName.NER=Niger +Geo.geoName.NGA=Nigeria +Geo.geoName.NFK=Norfolk Island +Geo.geoName.NOR=Norway +Geo.geoName.MNP=Northern Mariana Islands +Geo.geoName.UMI=United States Minor Outlying Islands +Geo.geoName.FSM=Micronesia, Federated States Of +Geo.geoName.MHL=Marshall Islands +Geo.geoName.PLW=Palau +Geo.geoName.PAK=Pakistan +Geo.geoName.PAN=Panama +Geo.geoName.PNG=Papua New Guinea +Geo.geoName.PRY=Paraguay +Geo.geoName.PER=Peru +Geo.geoName.PHL=Philippines +Geo.geoName.PCN=Pitcairn +Geo.geoName.POL=Poland +Geo.geoName.PRT=Portugal +Geo.geoName.GNB=Guinea-bissau +Geo.geoName.TLS=East Timor +Geo.geoName.PRI=Puerto Rico +Geo.geoName.QAT=Qatar +Geo.geoName.REU=Reunion +Geo.geoName.ROU=Romania +Geo.geoName.RUS=Russian Federation +Geo.geoName.RWA=Rwanda +Geo.geoName.SHN=St. Helena +Geo.geoName.KNA=Saint Kitts And Nevis +Geo.geoName.AIA=Anguilla +Geo.geoName.LCA=Saint Lucia +Geo.geoName.SPM=St. Pierre And Miquelon +Geo.geoName.VCT=Saint Vincent And The Grenadines +Geo.geoName.SMR=San Marino +Geo.geoName.STP=Sao Tome And Principe +Geo.geoName.SAU=Saudi Arabia +Geo.geoName.SEN=Senegal +Geo.geoName.SYC=Seychelles +Geo.geoName.SLE=Sierra Leone +Geo.geoName.SGP=Singapore +Geo.geoName.SVK=Slovakia (slovak Republic) +Geo.geoName.VNM=Viet Nam +Geo.geoName.SVN=Slovenia +Geo.geoName.SOM=Somalia +Geo.geoName.ZAF=South Africa +Geo.geoName.ZWE=Zimbabwe +Geo.geoName.ESP=Spain +Geo.geoName.ESH=Western Sahara +Geo.geoName.SDN=Sudan +Geo.geoName.SUR=Suriname +Geo.geoName.SJM=Svalbard And Jan Mayen Islands +Geo.geoName.SWZ=Swaziland +Geo.geoName.SWE=Sweden +Geo.geoName.CHE=Switzerland +Geo.geoName.SYR=Syrian Arab Republic +Geo.geoName.TJK=Tajikistan +Geo.geoName.THA=Thailand +Geo.geoName.TGO=Togo +Geo.geoName.TKL=Tokelau +Geo.geoName.TON=Tonga +Geo.geoName.TTO=Trinidad And Tobago +Geo.geoName.ARE=United Arab Emirates +Geo.geoName.TUN=Tunisia +Geo.geoName.TUR=Turkey +Geo.geoName.TKM=Turkmenistan +Geo.geoName.TCA=Turks And Caicos Islands +Geo.geoName.TUV=Tuvalu +Geo.geoName.UGA=Uganda +Geo.geoName.UKR=Ukraine +Geo.geoName.MKD=Macedonia, The Former Yugoslav Republic Of +Geo.geoName.EGY=Egypt +Geo.geoName.GBR=United Kingdom +Geo.geoName.TZA=Tanzania, United Republic Of +Geo.geoName.VIR=Virgin Islands (u.s.) +Geo.geoName.BFA=Burkina Faso +Geo.geoName.URY=Uruguay +Geo.geoName.UZB=Uzbekistan +Geo.geoName.VEN=Venezuela +Geo.geoName.WLF=Wallis And Futuna Islands +Geo.geoName.WSM=Samoa +Geo.geoName.YEM=Yemen +Geo.geoName.YUG=Yugoslavia +Geo.geoName.ZMB=Zambia +Geo.geoName.SCO=Scotland +Geo.geoName.ENG=England +Geo.geoName.NIR=N.Ireland +Geo.geoName.WAL=Wales + +EnumerationType.description.PROD_PROMO_COND=Product Promotion Condition +Enumeration.description.PPC_EQ=Is +Enumeration.description.PPC_NEQ=Is Not +Enumeration.description.PPC_LT=Is Less Than +Enumeration.description.PPC_LTE=Is Less Than or Equal To +Enumeration.description.PPC_GT=Is Greater Than +Enumeration.description.PPC_GTE=Is Greater Than or Equal To + +EnumerationType.description.PROD_PROMO_PCAPPL=Product Promotion Product/Category Application Type +Enumeration.description.PPPA_INCLUDE=Include +Enumeration.description.PPPA_EXCLUDE=Exclude +Enumeration.description.PPPA_ALWAYS=Always Include + +EnumerationType.description.PROD_PROMO_ACTION=Product Promotion Action +Enumeration.description.PROMO_GWP=Gift With Purchase +Enumeration.description.PROMO_FREE_SHIPPING=Free Shipping +Enumeration.description.PROMO_PROD_DISC=X Product for Y% Discount +Enumeration.description.PROMO_PROD_AMDISC=X Product for Y Discount +Enumeration.description.PROMO_PROD_PRICE=X Product for Y Price +Enumeration.description.PROMO_ORDER_PERCENT=Order Percent Discount +Enumeration.description.PROMO_ORDER_AMOUNT=Order Amount Flat +Enumeration.description.PROMO_PROD_SPPRC=Product for [Special Promo] Price Modified: incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties?rev=431417&r1=431416&r2=431417&view=diff ============================================================================== --- incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties (original) +++ incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties Mon Aug 14 12:39:17 2006 @@ -800,3 +800,270 @@ StatusItem.description.ODS_APPROVED=Schedulazione Approvata StatusItem.description.ODS_ARRANGED=Consegna Preparata StatusItem.description.ODS_CANCELLED=Consegna Cancellata + +# geo country +Geo.geoName._NA_=Non Applicabile +Geo.geoName.IRQ=Iraq +Geo.geoName.NIU=Niue +Geo.geoName.CAN=Canada +Geo.geoName.USA=Stati Uniti +Geo.geoName.OMN=Oman +Geo.geoName.AFG=Afghanistan +Geo.geoName.ALB=Albania +Geo.geoName.ATA=Antartide +Geo.geoName.DZA=Algeria +Geo.geoName.ASM=Samoa Americana +Geo.geoName.AND=Andorra +Geo.geoName.AGO=Angola +Geo.geoName.ATG=Antigua e Barbuda +Geo.geoName.AZE=Azerbaijan +Geo.geoName.ARG=Argentina +Geo.geoName.AUS=Australia +Geo.geoName.AUT=Austria +Geo.geoName.BHS=Bahamas +Geo.geoName.BHR=Bahrain +Geo.geoName.BRB=Barbados +Geo.geoName.BEL=Belgio +Geo.geoName.BMU=Bermuda +Geo.geoName.BTN=Bhutan +Geo.geoName.BOL=Bolivia +Geo.geoName.BIH=Bosnia e Herzegowina +Geo.geoName.BVT=Isola Bouvet +Geo.geoName.BRA=Brasile +Geo.geoName.BLZ=Belize +Geo.geoName.IOT=Territorio Oceano Indiano Inglese +Geo.geoName.SLB=Isole Solomon +Geo.geoName.VGB=Isole Vergini (inglesi) +Geo.geoName.BRN=Brunei Darussalam +Geo.geoName.BGR=Bulgaria +Geo.geoName.MMR=Myanmar +Geo.geoName.BDI=Burundi +Geo.geoName.BLR=Bielorussia +Geo.geoName.KHM=Cambogia +Geo.geoName.CMR=Cameroon +Geo.geoName.CPV=Capo Verde +Geo.geoName.CYM=Isole Cayman +Geo.geoName.CAF=Repubblica Centrale Africana +Geo.geoName.LKA=Sri Lanka +Geo.geoName.TCD=Chad +Geo.geoName.CHL=Cile +Geo.geoName.CHN=Cina +Geo.geoName.TWN=Taiwan, Provincia della Cina +Geo.geoName.CXR=Isola Christmas +Geo.geoName.CCK=Isole Cocos (keeling) +Geo.geoName.COL=Colombia +Geo.geoName.COM=Comoros +Geo.geoName.MYT=Mayotte +Geo.geoName.COG=Congo +Geo.geoName.COD=Repubblica Democratica del Congo +Geo.geoName.COK=Isole Cook +Geo.geoName.CRI=Costa Rica +Geo.geoName.HRV=Croazia +Geo.geoName.CUB=Cuba +Geo.geoName.CYP=Cipro +Geo.geoName.CZE=Repubblica Ceca +Geo.geoName.BEN=Benin +Geo.geoName.DNK=Danimarca +Geo.geoName.DMA=Domenicana +Geo.geoName.DOM=Repubblica Domenicana +Geo.geoName.ECU=Ecuador +Geo.geoName.SLV=El Salvador +Geo.geoName.GNQ=Guinea Equatoriale +Geo.geoName.ETH=Etiopia +Geo.geoName.ERI=Eritrea +Geo.geoName.EST=Estonia +Geo.geoName.FRO=Isole Faroe +Geo.geoName.FLK=Isole Falkland (malvinas) +Geo.geoName.SGS=Georgia Sud E Isole Sandwich +Geo.geoName.FJI=Fiji +Geo.geoName.FIN=Finlandia +Geo.geoName.FXX=Francia, Metropolitana +Geo.geoName.FRA=Francia +Geo.geoName.GUF=Guinea Francese +Geo.geoName.PYF=Polinesia Francese +Geo.geoName.ATF=Territori del Sud Francesi +Geo.geoName.DJI=Djibouti +Geo.geoName.GAB=Gabon +Geo.geoName.GEO=Georgia +Geo.geoName.GMB=Gambia +Geo.geoName.PSE=Territori Occupati Palestina +Geo.geoName.DEU=Germania +Geo.geoName.GHA=Ghana +Geo.geoName.GIB=Gibilterra +Geo.geoName.KIR=Kiribati +Geo.geoName.GRC=Grecia +Geo.geoName.GRL=Groenlandia +Geo.geoName.GRD=Grenada +Geo.geoName.GLP=Guadalupe +Geo.geoName.GUM=Guam +Geo.geoName.GTM=Guatemala +Geo.geoName.GIN=Guinea +Geo.geoName.GUY=Guyana +Geo.geoName.HTI=Haiti +Geo.geoName.HMD=Isole Heard E Mc Donald +Geo.geoName.VAT=Citt\u00e0 del Vaticano +Geo.geoName.HND=Honduras +Geo.geoName.HKG=Hong Kong +Geo.geoName.HUN=Ungheria +Geo.geoName.ISL=Islanda +Geo.geoName.IND=India +Geo.geoName.IDN=Indonesia +Geo.geoName.IRN=Iran (Repubblica Islamica Di) +Geo.geoName.IRL=Irlanda +Geo.geoName.ISR=Israele +Geo.geoName.ITA=Italia +Geo.geoName.CIV=Cote D'ivoire +Geo.geoName.JAM=Giamaica +Geo.geoName.JPN=Giappone +Geo.geoName.KAZ=Kazakhstan +Geo.geoName.JOR=Giordania +Geo.geoName.KEN=Kenia +Geo.geoName.PRK=Korea, Repubblica Democratica Popolare +Geo.geoName.KOR=Korea, Repubblica Di +Geo.geoName.KWT=Kuwait +Geo.geoName.KGZ=Kyrgyzstan +Geo.geoName.LAO=Lao Repubblica Democratica Popolare +Geo.geoName.LBN=Libano +Geo.geoName.LSO=Lesotho +Geo.geoName.LVA=Lettonia +Geo.geoName.LBR=Liberia +Geo.geoName.LBY=Libia +Geo.geoName.LIE=Liechtenstein +Geo.geoName.LTU=Lituania +Geo.geoName.LUX=Lussemburgo +Geo.geoName.MAC=Macau +Geo.geoName.MDG=Madagascar +Geo.geoName.MWI=Malawi +Geo.geoName.MYS=Malaysia +Geo.geoName.MDV=Isole Maldive +Geo.geoName.MLI=Mali +Geo.geoName.MLT=Malta +Geo.geoName.MTQ=Martinique +Geo.geoName.MRT=Mauritania +Geo.geoName.MUS=Mauritius +Geo.geoName.MEX=Messico +Geo.geoName.MCO=Monaco +Geo.geoName.MNG=Mongolia +Geo.geoName.MDA=Moldova, Repubblica Di +Geo.geoName.MSR=Montserrat +Geo.geoName.MAR=Marocco +Geo.geoName.MOZ=Mozambico +Geo.geoName.NAM=Namibia +Geo.geoName.NRU=Nauru +Geo.geoName.NPL=Nepal +Geo.geoName.NLD=Paesi Bassi +Geo.geoName.ANT=Antille Paesi Bassi +Geo.geoName.ABW=Aruba +Geo.geoName.NCL=Nuova Caledonia +Geo.geoName.VUT=Vanuatu +Geo.geoName.NZL=Nuova Zelanda +Geo.geoName.NIC=Nicaragua +Geo.geoName.NER=Niger +Geo.geoName.NGA=Nigeria +Geo.geoName.NFK=Isola Norfolk +Geo.geoName.NOR=Norvegia +Geo.geoName.MNP=Isole del Nord Mariana +Geo.geoName.UMI=Isole Minori Stati Uniti +Geo.geoName.FSM=Micronesia, Stato Federale Della +Geo.geoName.MHL=Isole Marshall +Geo.geoName.PLW=Palau +Geo.geoName.PAK=Pakistan +Geo.geoName.PAN=Panama +Geo.geoName.PNG=Papua Nuova Guinea +Geo.geoName.PRY=Paraguay +Geo.geoName.PER=Per\u00f9 +Geo.geoName.PHL=Filippine +Geo.geoName.PCN=Pitcairn +Geo.geoName.POL=Polonia +Geo.geoName.PRT=Portogallo +Geo.geoName.GNB=Guinea-bissau +Geo.geoName.TLS=Timor Est +Geo.geoName.PRI=Portorico +Geo.geoName.QAT=Qatar +Geo.geoName.REU=Reunion +Geo.geoName.ROU=Romania +Geo.geoName.RUS=Federazione Russa +Geo.geoName.RWA=Rwanda +Geo.geoName.SHN=St. Helena +Geo.geoName.KNA=Saint Kitts And Nevis +Geo.geoName.AIA=Anguilla +Geo.geoName.LCA=Saint Lucia +Geo.geoName.SPM=St. Pierre And Miquelon +Geo.geoName.VCT=Saint Vincent And The Grenadines +Geo.geoName.SMR=San Marino +Geo.geoName.STP=Sao Tome And Principe +Geo.geoName.SAU=Arabia Saudita +Geo.geoName.SEN=Senegal +Geo.geoName.SYC=Seychelles +Geo.geoName.SLE=Sierra Leone +Geo.geoName.SGP=Singapore +Geo.geoName.SVK=Slovacchia (Repubblica) +Geo.geoName.VNM=Vietnam +Geo.geoName.SVN=Slovenia +Geo.geoName.SOM=Somalia +Geo.geoName.ZAF=Sud Africa +Geo.geoName.ZWE=Zimbabwe +Geo.geoName.ESP=Spagna +Geo.geoName.ESH=Sahara Occidentale +Geo.geoName.SDN=Sudan +Geo.geoName.SUR=Suriname +Geo.geoName.SJM=Isole Svalbard E Jan Mayen +Geo.geoName.SWZ=Swaziland +Geo.geoName.SWE=Svezia +Geo.geoName.CHE=Svizzera +Geo.geoName.SYR=Siria Repubblica Araba +Geo.geoName.TJK=Tajikistan +Geo.geoName.THA=Tailandia +Geo.geoName.TGO=Togo +Geo.geoName.TKL=Tokelau +Geo.geoName.TON=Tonga +Geo.geoName.TTO=Trinidad E Tobago +Geo.geoName.ARE=Emirati Arabi Uniti +Geo.geoName.TUN=Tunisia +Geo.geoName.TUR=Turchia +Geo.geoName.TKM=Turkmenistan +Geo.geoName.TCA=Isole Turks E Caicos +Geo.geoName.TUV=Tuvalu +Geo.geoName.UGA=Uganda +Geo.geoName.UKR=Ucraina +Geo.geoName.MKD=Macedonia +Geo.geoName.EGY=Egitto +Geo.geoName.GBR=Regno Unito +Geo.geoName.TZA=Tanzania, Repubblica Unita Della +Geo.geoName.VIR=Isole Vergini (americane) +Geo.geoName.BFA=Burkina Faso +Geo.geoName.URY=Uruguay +Geo.geoName.UZB=Uzbekistan +Geo.geoName.VEN=Venezuela +Geo.geoName.WLF=Isole Wallis E Futuna +Geo.geoName.WSM=Samoa +Geo.geoName.YEM=Yemen +Geo.geoName.YUG=Jugoslavia +Geo.geoName.ZMB=Zambia +Geo.geoName.SCO=Scozia +Geo.geoName.ENG=Inghilterra +Geo.geoName.NIR=Irlanda del Nord +Geo.geoName.WAL=Galles + +EnumerationType.description.PROD_PROMO_COND=Condizione Promozione Prodotto +Enumeration.description.PPC_EQ=E' +Enumeration.description.PPC_NEQ=Non E' +Enumeration.description.PPC_LT=E' Minore Di +Enumeration.description.PPC_LTE=E' Minore Di o Uguale A +Enumeration.description.PPC_GT=E' Maggiore Di +Enumeration.description.PPC_GTE=E' Maggiore Di o Uguale A + +EnumerationType.description.PROD_PROMO_PCAPPL=Promozione Prodotto Tipo Applicazione Prodotto/Categoria +Enumeration.description.PPPA_INCLUDE=Includi +Enumeration.description.PPPA_EXCLUDE=Escludi +Enumeration.description.PPPA_ALWAYS=Includi Sempre + +EnumerationType.description.PROD_PROMO_ACTION=Azione Promozione Prodotto +Enumeration.description.PROMO_GWP=Omaggio Con Acquisto +Enumeration.description.PROMO_FREE_SHIPPING=Spedizione Gratuita +Enumeration.description.PROMO_PROD_DISC=X Prodotto per Y% Sconto +Enumeration.description.PROMO_PROD_AMDISC=X Prodotto per Y Sconto +Enumeration.description.PROMO_PROD_PRICE=X Prodotto per Y Prezzo +Enumeration.description.PROMO_ORDER_PERCENT=Percentuale Sconto Ordine +Enumeration.description.PROMO_ORDER_AMOUNT=Importo Fisso Ordine +Enumeration.description.PROMO_PROD_SPPRC=Prodotto per [Promozione Speciale] Prezzo Modified: incubator/ofbiz/trunk/framework/common/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/entitydef/entitymodel.xml?rev=431417&r1=431416&r2=431417&view=diff ============================================================================== --- incubator/ofbiz/trunk/framework/common/entitydef/entitymodel.xml (original) +++ incubator/ofbiz/trunk/framework/common/entitydef/entitymodel.xml Mon Aug 14 12:39:17 2006 @@ -150,6 +150,7 @@ </view-entity> <entity entity-name="Geo" package-name="org.ofbiz.common.geo" + default-resource-name="CommonEntityLabels" title="Geographic Boundary Entity"> <field name="geoId" type="id-ne"></field> <field name="geoTypeId" type="id"></field> Modified: incubator/ofbiz/trunk/framework/common/webcommon/includes/countries.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/webcommon/includes/countries.ftl?rev=431417&r1=431416&r2=431417&view=diff ============================================================================== --- incubator/ofbiz/trunk/framework/common/webcommon/includes/countries.ftl (original) +++ incubator/ofbiz/trunk/framework/common/webcommon/includes/countries.ftl Mon Aug 14 12:39:17 2006 @@ -16,6 +16,6 @@ --> <#assign countries = Static["org.ofbiz.common.CommonWorkers"].getCountryList(delegator)> <#list countries as country> - <option value='${country.geoId}'>${country.geoName?default(country.geoId)}</option> + <option value='${country.geoId}'>${country.get("geoName",locale)?default(country.geoId)}</option> </#list> Added: incubator/ofbiz/trunk/framework/webapp/config/WebappEntityLabels.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webapp/config/WebappEntityLabels.properties?rev=431417&view=auto ============================================================================== --- incubator/ofbiz/trunk/framework/webapp/config/WebappEntityLabels.properties (added) +++ incubator/ofbiz/trunk/framework/webapp/config/WebappEntityLabels.properties Mon Aug 14 12:39:17 2006 @@ -0,0 +1,21 @@ +##################################################################### +# +# Copyright 2001-2006 The Apache Software Foundation +# +# Licensed 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. +##################################################################### +ServerHitType.description.REQUEST=Request +ServerHitType.description.EVENT=Event +ServerHitType.description.VIEW=View +ServerHitType.description.ENTITY=Entity +ServerHitType.description.SERVICE=Service \ No newline at end of file Propchange: incubator/ofbiz/trunk/framework/webapp/config/WebappEntityLabels.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/framework/webapp/config/WebappEntityLabels.properties ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/framework/webapp/config/WebappEntityLabels.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/ofbiz/trunk/framework/webapp/config/WebappEntityLabels_it.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webapp/config/WebappEntityLabels_it.properties?rev=431417&view=auto ============================================================================== --- incubator/ofbiz/trunk/framework/webapp/config/WebappEntityLabels_it.properties (added) +++ incubator/ofbiz/trunk/framework/webapp/config/WebappEntityLabels_it.properties Mon Aug 14 12:39:17 2006 @@ -0,0 +1,21 @@ +##################################################################### +# +# Copyright 2001-2006 The Apache Software Foundation +# +# Licensed 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. +##################################################################### +ServerHitType.description.REQUEST=Richiesta +ServerHitType.description.EVENT=Evento +ServerHitType.description.VIEW=Vista +ServerHitType.description.ENTITY=Entit\u00e9 +ServerHitType.description.SERVICE=Servizio \ No newline at end of file Propchange: incubator/ofbiz/trunk/framework/webapp/config/WebappEntityLabels_it.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/framework/webapp/config/WebappEntityLabels_it.properties ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/framework/webapp/config/WebappEntityLabels_it.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |