svn commit: r1050159 - in /ofbiz/trunk/applications/part
Locked
svn commit: r1050159 - in /ofbiz/trunk/applications/part
 
|
Author: mrisaliti
Date: Thu Dec 16 21:05:01 2010 New Revision: 1050159 URL: http://svn.apache.org/viewvc?rev=1050159&view=rev Log: Replace some fail-message to fail-property tag in party component (OFBIZ-1874) Modified: ofbiz/trunk/applications/party/config/PartyErrorUiLabels.xml ofbiz/trunk/applications/party/config/PartyUiLabels.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventEvents.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Modified: ofbiz/trunk/applications/party/config/PartyErrorUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyErrorUiLabels.xml?rev=1050159&r1=1050158&r2=1050159&view=diff ============================================================================== --- ofbiz/trunk/applications/party/config/PartyErrorUiLabels.xml (original) +++ ofbiz/trunk/applications/party/config/PartyErrorUiLabels.xml Thu Dec 16 21:05:01 2010 @@ -64,6 +64,10 @@ <value xml:lang="zh">é误ï¼æ²¡ææ¾å°æ²éäºä»¶ï¼æ²éå®è·µæ è¯</value> <value xml:lang="zh_TW">é¯èª¤ï¼æ²ææ¾å°éè¨äºä»¶ID</value> </property> + <property key="commeventservices.communication_event_role_status"> + <value xml:lang="en">ERROR: Status is not a valid change; old Status: ${communicationEventRole.statusId}, new status: ${parameters.statusId}</value> + <value xml:lang="it">ERRORE: Cambio di stato non valido; vecchio stato: ${communicationEventRole.statusId}, nuovo stato: ${parameters.statusId}</value> + </property> <property key="commeventservices.communication_event_status"> <value xml:lang="en">ERROR: Status is not a valid change; old Status: ${communicationEvent.statusId}, new status: ${parameters.statusId}</value> <value xml:lang="fr">ERREUR : Le changement de ${communicationEvent.statusId} à ${parameters.statusId} n'est pas valide</value> Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=1050159&r1=1050158&r2=1050159&view=diff ============================================================================== --- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Thu Dec 16 21:05:01 2010 @@ -4056,6 +4056,10 @@ <value xml:lang="zh">æ²éäºä»¶</value> <value xml:lang="zh_TW">éè¨äºä»¶</value> </property> + <property key="PartyCommunicationEventNotFound"> + <value xml:lang="en">Communication Event ID: ${parameters.commnicationEventId} not found</value> + <value xml:lang="it">Evento comunicazioni: ${parameters.commnicationEventId} non trovato</value> + </property> <property key="PartyCommunications"> <value xml:lang="de">Kommunikationen</value> <value xml:lang="en">Communications</value> @@ -4788,6 +4792,10 @@ <value xml:lang="zh">å®å ¨é误: è¦è¿è¡ createCommunicationEventRoleï¼ä½ å¿ é¡»å ·æ PARTYMGR_CREATE æ PARTYMGR_ADMIN æé</value> <value xml:lang="zh_TW">å®å ¨é¯èª¤: è¦éè¡ createCommunicationEventRoleï¼ä½ å¿ é å ·æ PARTYMGR_CREATE æ PARTYMGR_ADMIN æ¬é</value> </property> + <property key="PartyCreateCommunicationEventUploadFileMissing"> + <value xml:lang="en">Upload file is missing...</value> + <value xml:lang="it">File da caricare mancante...</value> + </property> <property key="PartyCreateNewBillingAddress"> <value xml:lang="cs">Zložte novou fakturaÄnà adresu pro tuto kreditkartu</value> <value xml:lang="de">Legen Sie eine neue Rechnungsadresse für diese Kreditkarte an</value> @@ -5604,6 +5612,10 @@ <value xml:lang="zh">çµåé®ä»¶å°åæ ¼å¼é误ï¼å¿ 须类似ï¼name@domain</value> <value xml:lang="zh_TW">é»åéµä»¶å°åæ ¼å¼é¯èª¤ï¼å¿ é é¡ä¼¼ï¼name@domain</value> </property> + <property key="PartyEmailAddressRequired"> + <value xml:lang="en">Email address is required</value> + <value xml:lang="it">L'indirizzo e-mail è richiesto</value> + </property> <property key="PartyEmailAddressSuccessfullyCreated"> <value xml:lang="de">E-Mail Adresse erfolgreich erstellt.</value> <value xml:lang="en">Email Address successfully created.</value> @@ -5974,6 +5986,10 @@ <value xml:lang="zh">æ¾ä¸å°å¡ä¸çåå</value> <value xml:lang="zh_TW">æ¾ä¸å°å¡ä¸çåå</value> </property> + <property key="PartyFirstNameRequested"> + <value xml:lang="en">Please enter a firstName</value> + <value xml:lang="it">Perfavore inserire il nome</value> + </property> <property key="PartyFollowSession"> <value xml:lang="de">Session verfolgen</value> <value xml:lang="en">Follow Session</value> @@ -6685,6 +6701,10 @@ <value xml:lang="zh">æ¾ä¸å°å¡ä¸çå§æ°</value> <value xml:lang="zh_TW">æ¾ä¸å°å¡ä¸çå§æ°</value> </property> + <property key="PartyLastNameRequested"> + <value xml:lang="en">Please enter a lastName</value> + <value xml:lang="it">Perfavore inserire il cognome</value> + </property> <property key="PartyLeaveEmpty"> <value xml:lang="en">Leave empty for new 'Party'</value> <value xml:lang="fr">Laisser vide pour les nouveaux acteurs</value> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventEvents.xml?rev=1050159&r1=1050158&r2=1050159&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventEvents.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventEvents.xml Thu Dec 16 21:05:01 2010 @@ -32,7 +32,9 @@ under the License. <if-empty field="formInput.formInput.contentId"> <if-empty field="formInput.imageFileName"> - <add-error><fail-message message="Upload file is missing..."/></add-error> + <add-error> + <fail-property resource="PartyUiLabels" property="PartyCreateCommunicationEventUploadFileMissing"/> + </add-error> </if-empty> <check-errors/> @@ -142,23 +144,30 @@ under the License. </simple-method> <simple-method method-name="allocateMsgToParty" short-description="Allocate an emailaddress to an existing/new party, update the communication event accordingly"> - <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/> <if-empty field="communicationEvent"> - <add-error><fail-message message="Communication Event ID: ${parameters.commnicationEventId} not found"/></add-error> + <add-error> + <fail-property resource="PartyUiLabels" property="PartyCommunicationEventNotFound"/> + </add-error> </if-empty> <if-empty field="parameters.partyId"> <if-empty field="parameters.emailAddress"> - <add-error><fail-message message="Email address is required"/></add-error> + <add-error> + <fail-property resource="PartyUiLabels" property="PartyEmailAddressRequired"/> + </add-error> </if-empty> <if-empty field="parameters.lastName"> - <add-error><fail-message message="Please enter a lastName"/></add-error> + <add-error> + <fail-property resource="PartyUiLabels" property="PartyLastNameRequested"/> + </add-error> </if-empty> <if-empty field="parameters.firstName"> - <add-error><fail-message message="Please enter a firstName"/></add-error> + <add-error> + <fail-property resource="PartyUiLabels" property="PartyFirstNameRequested"/> + </add-error> <check-errors/> </if-empty> </if-empty> @@ -178,7 +187,7 @@ under the License. <entity-one entity-name="Party" value-field="party"/> <if-empty field="party"> <add-error> - <fail-message message="Party ID: ${parameters.partyId} not found"/> + <fail-property resource="PartyUiLabels" property="PartyPartyIdMissing"/> </add-error> <check-errors /> </if-empty> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=1050159&r1=1050158&r2=1050159&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Thu Dec 16 21:05:01 2010 @@ -549,7 +549,9 @@ under the License. <field-map field-name="statusIdTo" from-field="parameters.statusId"/> </entity-one> <if-empty field="statusChange"> - <add-error><fail-property resource="PartyErrorUiLabels" property="commeventservices.communication_event_status"/></add-error> + <add-error> + <fail-property resource="PartyErrorUiLabels" property="commeventservices.communication_event_status"/> + </add-error> <log level="error" message="Cannot change from ${communicationEvent.statusId} to ${parameters.statusId}"/> <check-errors/> <else> @@ -625,7 +627,9 @@ under the License. <field-map field-name="statusIdTo" from-field="parameters.statusId"/> </entity-one> <if-empty field="statusChange"> - <add-error><fail-message message="Status is not a valid change"/></add-error> + <add-error> + <fail-property resource="PartyErrorUiLabels" property="commeventservices.communication_event_role_status"/> + </add-error> <log level="error" message="Cannot change from ${communicationEventRole.statusId} to ${parameters.statusId}"/> <check-errors/> <else> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |