=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm	2010-07-02 10:12:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm	2010-07-24 15:40:31 +0000
@@ -19,7 +19,7 @@
 	);
 
 </script>
-<input type="hidden" id="curLocaleCode" value="$locale.getLanguage()_$locale.getCountry()"/>
+
 <h3>$i18n.getString( "add_dataset" )</h3>
 
 <form id="addDataSetForm" name="addDataSetForm" action="addDataSet.action" method="post" >
@@ -34,15 +34,15 @@
     <tbody>
       <tr>
         <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="name" name="name" onchange="nameChanged()" style="width:20em" maxlength="160" class="{validate:{required:true,minlength:2,maxlength:160}}"/></td>
+        <td><input type="text" id="name" name="name" onchange="nameChanged()" style="width:20em" maxlength="150" class="{validate:{required:true,rangelength:[4,150],alphanumericwithbasicpuncspaces:true,firstletteralphabet:true}}"/></td>
       </tr>
       <tr>
         <td><label>$i18n.getString( "short_name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="shortName" name="shortName" style="width:20em" maxlength="25" class="{validate:{required:true,minlength:2,maxlength:25}}"/></td>
+        <td><input type="text" id="shortName" name="shortName" style="width:20em" maxlength="20" class="{validate:{required:true,rangelength:[2,20],alphanumericwithbasicpuncspaces:true,firstletteralphabet:true}}"/></td>
       </tr>
       <tr>
         <td><label>$i18n.getString( "code" )</label></td>
-        <td><input type="text" id="code" name="code" style="width:20em"  maxlength="100" class="{validate:{maxlength:100}}"/></td>
+        <td><input type="text" id="code" name="code" style="width:20em" class="{validate:{rangelength:[4,40],alphanumericwithbasicpuncspaces:true,notOnlyDigits:true}}"/></td>
       </tr>
       <tr>
         <td><label>$i18n.getString( "frequency" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm	2010-07-02 10:12:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm	2010-07-24 15:40:31 +0000
@@ -19,7 +19,7 @@
 	);
 
 </script>
-<input type="hidden" id="curLocaleCode" value="$locale.getLanguage()_$locale.getCountry()"/>
+
 <h3>$i18n.getString( "edit_dataset" )</h3>
 
 <form id="editDataSetForm" name="editDataSetForm" action="updateDataSet.action" method="post" >
@@ -38,15 +38,15 @@
     <tbody>
       <tr>
         <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="name" name="name" style="width:20em" value="$!encoder.htmlEncode( $dataSet.name )" maxlength="160" class="{validate:{required:true,minlength:2,maxlength:160}}"></td>
+        <td><input type="text" id="name" name="name" style="width:20em" value="$!encoder.htmlEncode( $dataSet.name )" maxlength="150" class="{validate:{required:true,rangelength:[4,150],alphanumericwithbasicpuncspaces:true,firstletteralphabet:true}}"></td>
       </tr>      
       <tr>
         <td><label>$i18n.getString( "short_name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="shortName" name="shortName" style="width:20em" value="$!encoder.htmlEncode( $dataSet.shortName )" maxlength="25" class="{validate:{required:true,minlength:2,maxlength:25}}"> </td>
+        <td><input type="text" id="shortName" name="shortName" style="width:20em" value="$!encoder.htmlEncode( $dataSet.shortName )" maxlength="20" class="{validate:{required:true,rangelength:[2,20],alphanumericwithbasicpuncspaces:true,firstletteralphabet:true}}"> </td>
       </tr>     
       <tr>
         <td><label>$i18n.getString( "code" )</label></td>
-        <td><input type="text" id="code" name="code" style="width:20em" value="$!encoder.htmlEncode( $dataSet.code )" maxlength="100" class="{validate:{maxlength:100}}"></td>
+        <td><input type="text" id="code" name="code" style="width:20em" value="$!encoder.htmlEncode( $dataSet.code )" class="{validate:{rangelength:[4,40],alphanumericwithbasicpuncspaces:true,notOnlyDigits:true}}"></td>
       </tr>
       <tr>
         <td><label>$i18n.getString( "frequency" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js	2010-07-01 10:08:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js	2010-07-24 15:40:31 +0000
@@ -1,4 +1,3 @@
-
 // -----------------------------------------------------------------------------
 // DataSet details form
 // -----------------------------------------------------------------------------
@@ -44,7 +43,7 @@
 
 function viewDataEntryForm( dataSetId )
 {
-  window.location.href = 'viewDataEntryForm.action?dataSetId=' + dataSetId;
+	window.location.href = 'viewDataEntryForm.action?dataSetId=' + dataSetId;
 }
 
 // ----------------------------------------------------------------------
@@ -104,12 +103,11 @@
   request.setResponseTypeXML( 'message' );
   request.setCallbackSuccess( addDataSetValidationCompleted ); 
   
-  var requestString = 'validateDataSet.action?name=' + getFieldValue( 'name' ) +
-                      '&shortName=' + getFieldValue( 'shortName' ) +
-                      '&code=' + getFieldValue( 'code' );
-
-  request.send( requestString );
-
+  var params = 'name=' + getFieldValue( 'name' ) +
+               '&shortName=' + getFieldValue( 'shortName' ) +
+               '&code=' + getFieldValue( 'code' );
+  request.sendAsPost( params );
+  request.send( 'validateDataSet.action' );
   return false;
 }
 
@@ -144,13 +142,12 @@
   request.setResponseTypeXML( 'message' );
   request.setCallbackSuccess( editDataSetValidationCompleted );
 
-  var requestString = 'validateDataSet.action?name=' + getFieldValue( 'name' ) +
-                      '&shortName=' + getFieldValue( 'shortName' ) +
-                      '&code=' + getFieldValue( 'code' ) +
-  		              '&dataSetId=' + getFieldValue( 'dataSetId' );
-
-  request.send( requestString );
-
+  var params = 'name=' + getFieldValue( 'name' ) +
+               '&shortName=' + getFieldValue( 'shortName' ) +
+               '&code=' + getFieldValue( 'code' ) +
+  		       '&dataSetId=' + getFieldValue( 'dataSetId' );
+  request.sendAsPost( params );
+  request.send( 'validateDataSet.action' );
   return false;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2010-07-02 02:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2010-07-24 15:40:31 +0000
@@ -36,12 +36,11 @@
 										validateDataEntryForm();
 									}
 				});
-				jQuery.validator.loadLocaled( jQuery("#curLocaleCode").val() );
+				jQuery.validator.setMessages( validationMessage );
 			}
 	);
 
 </script>
-<input type="hidden" id="curLocaleCode" value="$locale.getLanguage()_$locale.getCountry()"/>
 
 <h3>$i18n.getString( "dataentryform_management" )</h3>
 
@@ -57,7 +56,7 @@
     <tbody>
       <tr>
         <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="nameField" name="nameField" value='#if($status == "EDIT")$dataEntryForm.name#end' style="width:20em" maxlength="100" class="{validate:{required:true,minlength:2,maxlength:160}}"></td>
+        <td><input type="text" id="nameField" name="nameField" value='#if($status == "EDIT")$dataEntryForm.name#end' style="width:20em" maxlength="100" class="{validate:{required:true,rangelength:[4,150],alphanumericwithbasicpuncspaces:true,firstletteralphabet:true}}"></td>
       </tr>
       <tr>
         <td><label>$i18n.getString( "dataset" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>