Author: jleroux
Date: Sat Dec  2 22:31:51 2006
New Revision: 481728

URL: http://svn.apache.org/viewvc?view=rev&rev=481728
Log:
A 2d patch from Ismail Cansiz :i18n/i10n and better 
PartyContactMechServices.xml messages  
(https://issues.apache.org/jira/browse/OFBIZ-504) + french labels


Modified:
    incubator/ofbiz/trunk/applications/party/config/PartyUiLabels.properties
    incubator/ofbiz/trunk/applications/party/config/PartyUiLabels_fr.properties
    
incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml

Modified: 
incubator/ofbiz/trunk/applications/party/config/PartyUiLabels.properties
URL: 
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/config/PartyUiLabels.properties?view=diff&rev=481728&r1=481727&r2=481728
==============================================================================
--- incubator/ofbiz/trunk/applications/party/config/PartyUiLabels.properties 
(original)
+++ incubator/ofbiz/trunk/applications/party/config/PartyUiLabels.properties 
Sat Dec  2 22:31:51 2006
@@ -238,6 +238,8 @@
 PartyCybersourceAvsOver=Cybersource AVS Override
 PartyDeleteVendorPermissionError=Security Error\: to run deleteVendor you must 
have the PARTYMGR_CREATE or PARTYMGR_ADMIN permission
 PartyDisabled=DISABLED
+PartyDomainNameSuccessfullyCreated=Domain Name successfully created.
+PartyDomainNameSuccessfullyUpdated=Domain Name successfully updated.
 PartyViewCommunicationEvent=View Communication Event
 PartyEditCommunicationEvent=Edit Communication Event
 PartyEditCommCustRequest=Edit Communication Customer Request
@@ -284,6 +286,8 @@
 PartyInitialReferer=Initial Referer
 PartyInitialRequest=Initial Request
 PartyInitialUserAgent=Initial User Agent
+PartyIpAddressSuccessfullyCreated=Web IP Address successfully created.
+PartyIpAddressSuccessfullyUpdated=Web IP Address successfully updated.
 PartyLastName=Last Name
 PartyLastNameMissingError=Lastname is Missing
 PartyLastVisit=Last Visit(s)
@@ -521,6 +525,8 @@
 PartyVisitIDSessionID=VisitID / SessionID
 PartyVisitListing=Visit Listing
 PartyVisitorId=Visitor ID
+PartyWebAddressSuccessfullyCreated=Web Address suSuccessfully created.
+PartyWebAddressSuccessfullyUpdated=Web Address suSuccessfully updated.
 PartyWeight=Weight
 PartyWeightNotValidNumber=Weight is not a valid number
 PartyWebApp=WebApp

Modified: 
incubator/ofbiz/trunk/applications/party/config/PartyUiLabels_fr.properties
URL: 
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/config/PartyUiLabels_fr.properties?view=diff&rev=481728&r1=481727&r2=481728
==============================================================================
--- incubator/ofbiz/trunk/applications/party/config/PartyUiLabels_fr.properties 
(original)
+++ incubator/ofbiz/trunk/applications/party/config/PartyUiLabels_fr.properties 
Sat Dec  2 22:31:51 2006
@@ -89,8 +89,8 @@
 PartyContactInformation=Coordonn\u00e9es
 PartyContactInfo=Source du contact
 PartyContactInfoList=Contact Info (Email, URL, etc)
-PartyContactMechanismSuccessfullyCreated=Mécanisme de contact créé.
-PartyContactMechanismSuccessfullyUpdated=Mécanisme de contact mis \u00e0 jour
+PartyContactMechanismSuccessfullyCreated=M\u00e9canisme de contact 
cr\u00e9\u00e9.
+PartyContactMechanismSuccessfullyUpdated=M\u00e9canisme de contact mis \u00e0 
jour
 PartyContactMechIdMissing=Identifiant coordonn\u00e9es absent
 PartyContactMechTypeIdMissing=Type de coordonn\u00e9es absent
 PartyContactMechNotFoundCannotDelete=Erreur: coordonn\u00e9es de l'acteur non 
trouv\u00e9es, suppression impossible.
@@ -121,14 +121,16 @@
 PartyCustomerRequest=N\u00b0 de requ\u00eate client
 PartyCybersourceAvsOver=For\u00e7age Cybersource AVS (Syst\u00e8me de 
V\u00e9rification d'Adresse)
 PartyDisabled=INVALIDE
+PartyDomainNameSuccessfullyCreated=Nom de domaine cr\u00e9\u00e9.
+PartyDomainNameSuccessfullyUpdated=Nom de domaine mis \u00e0 jour.
 PartyEditContactInformation=\u00c9dition de coordonn\u00e9es
 PartyEditSecurityGroupWithId=\u00c9dition du groupe de securit\u00e9 avec 
l'identifiant
 PartyEftAccount=Compte Bancaire
 PartyEmailAddress=Adresse E-mail
 PartyEmailAddressMissing=Adresse E-mail manquante
 PartyEmailAddressNotFormattedCorrectly=Format de l'adresse E-mail incorrect, 
il doit \u00eatre similaire \u00e0 [EMAIL PROTECTED]
-PartyEmailAddressSuccessfullyCreated=Adresse courriel créée.
-PartyEmailAddressSuccessfullyUpdated=Adresse courriel mise à jour.
+PartyEmailAddressSuccessfullyCreated=Adresse courriel cr\u00e9\u00e9e.
+PartyEmailAddressSuccessfullyUpdated=Adresse courriel mise \u00e0 jour.
 PartyEnabled=VALIDE
 PartyEnteredDate=Date de saisie
 PartyEnterPasswordTwice=Vous devez entrer votre mot de passe deux fois
@@ -152,6 +154,8 @@
 PartyInitialReferer=R\u00e9f\u00e9rence initiale 
 PartyInitialRequest=Demande initiale
 PartyInitialUserAgent=Utilisateur initial
+PartyIpAddressSuccessfullyCreated=Adresse IP cr\u00e9\u00e9e.
+PartyIpAddressSuccessfullyUpdated=Adresse IP mise \u00e0 jour.
 PartyLastName=Nom
 PartyLastNameMissingError=Nom absent
 PartyLastVisit=Derni\u00e8re(s) connexion(s)
@@ -195,16 +199,16 @@
 PartyPartiesFound=Acteurs trouv\u00e9s
 PartyPartyGroupInformation=Information groupe d'acteurs
 PartyPartyGroupName=Nom du groupe d'acteurs
-PartyPartyGroupSuccessfullyCreated=Groupe d'acteurs créé. 
-PartyPartyGroupSuccessfullyUpdated=Groupe d'acteurs mis à jour.
+PartyPartyGroupSuccessfullyCreated=Groupe d'acteurs cr\u00e9\u00e9. 
+PartyPartyGroupSuccessfullyUpdated=Groupe d'acteurs mis \u00e0 jour.
 PartyParty=Acteur
 PartyPartyFrom=De l'acteur
 PartyPartyId=R\u00e9f. de l'acteur
 PartyPartyIDUserLoginID=R\u00e9f. de l'acteur et ident. de connexion
 PartyPartyNotDefined=Acteur non d\u00e9fini
-PartyPersonSuccessfullyCreated=Acteur créé.
-PartyPersonSuccessfullyUpdated=Acteur mis à jour.
-PartyPartySuccessfullyDeleted=Acteur supprimé. 
+PartyPersonSuccessfullyCreated=Acteur cr\u00e9\u00e9.
+PartyPersonSuccessfullyUpdated=Acteur mis \u00e0 jour.
+PartyPartySuccessfullyDeleted=Acteur supprim\u00e9. 
 PartyPartyTo=\u00e0 l'acteur
 PartyPassportExpire=Date d'expiration du passeport
 PartyPassportExpireDateNotValidDate=La date d'expiration du passeport n'est 
pas une date valide
@@ -221,7 +225,7 @@
 PartyPersonalTitle=Fonction
 PartyPhoneNumber=Num\u00e9ro de t\u00e9l\u00e9phone
 PartyPostal=Contact courrier
-PartyPostalAddressSuccessfullyCreated=Adresse postale créé.
+PartyPostalAddressSuccessfullyCreated=Adresse postale cr\u00e9\u00e9.
 PartyPostalAddressSuccessfullyUpdated=Adresse postale mis \u00e0 jour
 PartyPostalCode=Code Postal
 PartyPostalCodeMissing=Code postal manquant
@@ -230,7 +234,7 @@
 PartyPurposeTypeNotFound=Type d'usage non trouv\u00e9 avec l'ident.
 PartyPushURL=URL envoy\u00e9e 
 PartyProfile=Profil
-PartyProveinceInCanadaMissing=Province manquante ;  elle est obligatoire pour 
valider une adresse au Canada.
+PartyProveinceInCanadaMissing=Province manquante, elle est obligatoire pour 
valider une adresse au Canada.
 PartyRelationships=Relations
 PartyRemoveCommunicationEventPurposePermissionError=Erreur s\u00e9curit\u00e9 
: pour supprimer l'objet d'un appel il faut avoir avoir la permission 
PARTYMGR_DELETE ou PARTYMGR_ADMIN.
 PartyRemoveCommunicationEventRolePermissionError=Erreur s\u00e9curit\u00e9 : 
pour supprimer le r\u00f4le d'une communication il faut avoir avoir la 
permission PARTYMGR_DELETE ou PARTYMGR_ADMIN.
@@ -260,14 +264,14 @@
 PartySocialSecurityNumber=Num\u00e9ro de s\u00e9curit\u00e9 sociale
 PartyStartTime=D\u00e9but de la transaction
 PartyState=Etat/Province
-PartyStateInUsMissing=Etat absent, et il est obligatoire pour une adresse aux 
Etat-Unis.
+PartyStateInUsMissing=Etat absent, il est obligatoire pour une adresse aux 
Etat-Unis.
 PartyStatus=Statut
 PartySuffix=Suffixe
 PartySupplier=Fournisseur
 PartyStillActive=Encore actif (ve)
 PartyTelecom=Contact t\u00e9l\u00e9phonique
-PartyTelecomNumberSuccessfullyCreated=Numéro de téléphone créé.
-PartyTelecomNumberSuccessfullyUpdated=Numéro de téléphonemis \u00e0 jour
+PartyTelecomNumberSuccessfullyCreated=Num\u00e9ro de t\u00e9l\u00e9phone 
cr\u00e9\u00e9.
+PartyTelecomNumberSuccessfullyUpdated=Num\u00e9ro de t\u00e9l\u00e9phonemis 
\u00e0 jour
 PartyTerm=Ech\u00e9ance
 PartyTermTyp=Type de termes
 PartyTermValue=Valeur du terme
@@ -299,6 +303,8 @@
 PartyWeight=Poids
 PartyWeightNotValidNumber=Le poids n'est pas un nombre valide
 PartyWebApp=Appli. Web
+PartyWebAddressSuccessfullyCreated=Adresse Web cr\u00e9\u00e9e.
+PartyWebAddressSuccessfullyUpdated=Adresse Web mise \u00e0 jour.
 PartyYearsWork=Ann\u00e9es d'exp\u00e9rience
 PartyZipCode=Code postal
 

Modified: 
incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
URL: 
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?view=diff&rev=481728&r1=481727&r2=481728
==============================================================================
--- 
incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
 (original)
+++ 
incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
 Sat Dec  2 22:31:51 2006
@@ -41,6 +41,23 @@
         </if-compare>                       
         <check-errors/>
 
+        <set field="successMessageProperty" 
value="PartyContactMechanismSuccessfullyUpdated"/>                        
+        <if-compare map-name="context" field-name="contactMechTypeId" 
operator="equals" value="EMAIL_ADDRESS">
+            <set field="successMessageProperty" 
value="PartyEmailAddressSuccessfullyUpdated"/>
+        </if-compare>
+        <if-compare map-name="context" field-name="contactMechTypeId" 
operator="equals" value="WEB_ADDRESS">
+            <set field="successMessageProperty" 
value="PartyWebAddressSuccessfullyUpdated"/>
+        </if-compare>
+        <if-compare map-name="context" field-name="contactMechTypeId" 
operator="equals" value="IP_ADDRESS">
+            <set field="successMessageProperty" 
value="PartyIpAddressSuccessfullyUpdated"/>
+        </if-compare>
+        <if-compare map-name="context" field-name="contactMechTypeId" 
operator="equals" value="ELECTRONIC_ADDRESS">
+            <set field="successMessageProperty" 
value="PartyElectronicAddressSuccessfullyUpdated"/>
+        </if-compare>
+        <if-compare map-name="context" field-name="contactMechTypeId" 
operator="equals" value="DOMAIN_NAME">
+            <set field="successMessageProperty" 
value="PartyDomainNameSuccessfullyUpdated"/>
+        </if-compare>
+
         <make-value entity-name="ContactMech" value-name="ContactMechMap"/>
         <set-pk-fields value-name="ContactMechMap" map-name="parameters"/>
         <find-by-primary-key entity-name="ContactMech" 
map-name="ContactMechMap" value-name="oldValue" /> 
@@ -51,7 +68,7 @@
             <set field="context.contactMechTypeId" 
from-field="parameters.contactMechTypeId"/>
             <set field="context.infoString" 
from-field="parameters.infoString"/>
             <call-service service-name="createContactMech" 
in-map-name="context">
-                <default-message resource="PartyUiLabels" 
property="PartyContactMechanismSuccessfullyCreated"/>
+                <default-message resource="PartyUiLabels" 
property="${successMessageProperty}"/>
                 <result-to-field result-name="contactMechId" 
map-name="newValue"/>
             </call-service>                                        
             <field-to-result map-name="newValue" field-name="contactMechId"/>


Reply via email to