Re: svn commit: r810864 - in /ofbiz/trunk/framework/common: config/SecurityextUiLabels.xml src/org/ofbiz/common/login/LoginServices.java

[Jacques Le Roux]

Right :D

Jacques

From: "Ashish Vijaywargiya" <ashish.vijaywarg...@hotwaxmedia.com>
I guess Jacques has concentrated *only* on French version  ;)

--
Ashish

Ashish Vijaywargiya wrote:

+1 - :-)

--
Ashish


Scott Gray wrote:

It should be "Your password has been changed successfully"

Regards
Scott

On 3/09/2009, at 10:18 PM, jler...@apache.org wrote:

Author: jleroux
Date: Thu Sep 3 10:18:12 2009
New Revision: 810864

URL: http://svn.apache.org/viewvc?rev=810864&view=rev
Log:

A patch from Erwan de FERRIERES "display a message when the password is changed with success" (https://issues.apache.org/jira/browse/OFBIZ-2845) - OFBIZ-2845

Modified:
ofbiz/trunk/framework/common/config/SecurityextUiLabels.xml
ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java

Modified: ofbiz/trunk/framework/common/config/SecurityextUiLabels.xml

URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/SecurityextUiLabels.xml?rev=810864&r1=810863&r2=810864&view=diff

==============================================================================
--- ofbiz/trunk/framework/common/config/SecurityextUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/SecurityextUiLabels.xml Thu Sep 3 
10:18:12 2009
@@ -158,6 +158,10 @@
<value 
xml:lang="th">กลัà¸sà¹?à¸,à¹?าà¹"à¸>สูà¹^รหัสà¸oà¹^าà¸Tà¸-ีà¹^วà¹^าà¸?à¹?à¸>ลà¹^า</value>
<value xml:lang="zh">å¯?ç æ~¯ç©ºçs"ï¼O请é?æ-°è¾"å
¥ã?,</value>
</property>
+ <property key="loginevents.password_was_changed_with_success">
+ <value xml:lang="en">Your password has been changed with success</value>
+ <value xml:lang="fr">Votre mot de passe a été changé avec succès</value>
+ </property>
<property 
key="loginevents.problems_with_configuration_contact_customer_service">
<value xml:lang="de">Fehler bei der Konfiguration; bitte wenden Sie sich an den 
Kundenservice.</value>
<value xml:lang="en">Problems with configuration; please contact customer 
service.</value>

Modified: 
ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java

URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java?rev=810864&r1=810863&r2=810864&view=diff

==============================================================================

--- ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java (original)

+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java 
Thu Sep 3 10:18:12 2009
@@ -573,11 +573,11 @@
*...@return Map with the result of the service, the output parameters
*/
public static Map<String, Object> updatePassword(DispatchContext ctx, Map<String, 
?> context) {
- Map<String, Object> result = FastMap.newInstance();
GenericDelegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
GenericValue loggedInUserLogin = (GenericValue) context.get("userLogin");
Locale locale = (Locale) context.get("locale");

+ Map<String, Object> result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "loginevents.password_was_changed_with_success", locale));

// load the external auth modules -- note: this will only run once and cache 
the objects
if (!AuthHelper.authenticatorsLoaded()) {
@@ -641,7 +641,7 @@

errMsg = UtilProperties.getMessage(resource,"loginservices.could_not_change_password_userlogin_with_id_not_exist", messageMap, locale);

return ServiceUtil.returnError(errMsg);
}
- result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
+ //result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
result.put("updatedUserLogin", userLoginToUpdate);
return result;
} else {
@@ -693,7 +693,7 @@
}
}

- result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
+ //result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
result.put("updatedUserLogin", userLoginToUpdate);
return result;
}