------------------------------------------------------------
revno: 1879
committer: Tran Thanh Tri <Tran Thanh t...@compaq>
branch nick: trunk
timestamp: Tue 2010-07-27 10:37:16 +0700
message:
update validate message in Help/User Information
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm
dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm 2010-05-05 09:17:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm 2010-07-27 03:37:16 +0000
@@ -18,14 +18,13 @@
updateUser();
}
});
- jQuery.validator.loadLocaled( jQuery("#curLocaleCode").val() );
- jQuery("#rawPassword").focus();
- //selectionTree.buildSelectionTree();
+ jQuery.validator.setMessages( validationMessage );
+
+ jQuery("#rawPassword").focus();
}
);
</script>
-<input type="hidden" id="curLocaleCode" value="$locale.getLanguage()_$locale.getCountry()"/>
<h3>$i18n.getString( "update_user" )</h3>
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2010-07-22 13:55:39 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2010-07-27 03:37:16 +0000
@@ -530,15 +530,11 @@
../dhis-web-commons/util/validate/jquery.validate.js,
../dhis-web-commons/util/jquery.metadata.js,
../dhis-web-commons/util/validate/additional-methods.js,
- ../dhis-web-commons/util/validate/messages_locale.js</param>
+ ../dhis-web-commons/validationMessages.action</param>
</action>
<action name="updateUserAccount"
- class="org.hisp.dhis.useraccount.action.UpdateUserAccountAction">
- <!--
- <result name="success" type="velocity">/main.vm</result> <param
- name="page">/dhis-web-commons/useraccount/updateUserSuccess.vm</param>
- -->
+ class="org.hisp.dhis.useraccount.action.UpdateUserAccountAction">
<result name="success" type="velocity">
/dhis-web-commons/useraccount/updateUserSuccess.vm</result>
<result name="input" type="velocity">
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
