Index: lams_central/src/java/org/lamsfoundation/lams/authoring/LearningDesignValidator.java
===================================================================
diff -u -rb994875ec6fda8ed9af97c5e691b7ff555811567 -r68d18caf15a5279277536a25fc4ef60feef9b810
--- lams_central/src/java/org/lamsfoundation/lams/authoring/LearningDesignValidator.java	(.../LearningDesignValidator.java)	(revision b994875ec6fda8ed9af97c5e691b7ff555811567)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/LearningDesignValidator.java	(.../LearningDesignValidator.java)	(revision 68d18caf15a5279277536a25fc4ef60feef9b810)
@@ -4,6 +4,7 @@
 import org.lamsfoundation.lams.authoring.dto.ValidationErrorDTO;
 import org.lamsfoundation.lams.authoring.dto.StoreLearningDesignResultsDTO;
 import org.lamsfoundation.lams.learningdesign.Activity;
+import org.lamsfoundation.lams.learningdesign.GateActivity;
 import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
 import org.lamsfoundation.lams.learningdesign.OptionsActivity;
@@ -64,7 +65,7 @@
 		if (listOfValidationErrorDTOs.size() > 0)
 		{
 			valid = false;
-			flashMessage = new FlashMessage("storeLearningDesignDetails", new StoreLearningDesignResultsDTO(valid,listOfValidationErrorDTOs, learningDesign.getLearningDesignId()), FlashMessage.ERROR);
+			flashMessage = new FlashMessage("storeLearningDesignDetails", new StoreLearningDesignResultsDTO(valid,listOfValidationErrorDTOs, learningDesign.getLearningDesignId()), FlashMessage.OBJECT_MESSAGE);
 		}
 		else
 		{
@@ -110,7 +111,7 @@
 		if (numOfTopLevelActivities > 0)
 		{
 			if (noInputTransition.size() == 0)
-				listOfValidationErrorDTOs.add(new ValidationErrorDTO(ValidationErrorDTO.INPUT_TRANSITION_ERROR_TYPE2));
+				listOfValidationErrorDTOs.add(new ValidationErrorDTO(messageService.getMessage(ValidationErrorDTO.INPUT_TRANSITION_ERROR_TYPE2_KEY)));
 			
 			if (noInputTransition.size() > 1)
 			{
@@ -119,20 +120,20 @@
 				while (noInputTransitionIterator.hasNext())
 				{
 					Activity a = (Activity)noInputTransitionIterator.next();
-					listOfValidationErrorDTOs.add(new ValidationErrorDTO(ValidationErrorDTO.INPUT_TRANSITION_ERROR_TYPE1, a.getActivityUIID()));
+					listOfValidationErrorDTOs.add(new ValidationErrorDTO(messageService.getMessage(ValidationErrorDTO.INPUT_TRANSITION_ERROR_TYPE1_KEY), a.getActivityUIID()));
 				}
 			}
 			
 			if (noOuputTransition.size() == 0)
-				listOfValidationErrorDTOs.add(new ValidationErrorDTO(ValidationErrorDTO.OUTPUT_TRANSITION_ERROR_TYPE2));
+				listOfValidationErrorDTOs.add(new ValidationErrorDTO(messageService.getMessage(ValidationErrorDTO.OUTPUT_TRANSITION_ERROR_TYPE2_KEY)));
 			if (noOuputTransition.size() > 1)
 			{
 				//there is more than one activity with no output transitions
 				Iterator noOutputTransitionIterator = noOuputTransition.iterator();
 				while (noOutputTransitionIterator.hasNext())
 				{
 					Activity a = (Activity)noOutputTransitionIterator.next();
-					listOfValidationErrorDTOs.add(new ValidationErrorDTO(ValidationErrorDTO.OUTPUT_TRANSITION_ERROR_TYPE1, a.getActivityUIID()));					
+					listOfValidationErrorDTOs.add(new ValidationErrorDTO(messageService.getMessage(ValidationErrorDTO.OUTPUT_TRANSITION_ERROR_TYPE1_KEY), a.getActivityUIID()));					
 				}
 			}
 		}
@@ -156,9 +157,9 @@
 			Activity fromActivity = transition.getFromActivity();
 			Activity toActivity = transition.getToActivity();
 			if (fromActivity == null)
-				listOfValidationErrorDTOs.add(new ValidationErrorDTO(ValidationErrorDTO.TRANSITION_ERROR, transition.getTransitionUIID()));
+				listOfValidationErrorDTOs.add(new ValidationErrorDTO(messageService.getMessage(ValidationErrorDTO.TRANSITION_ERROR_KEY), transition.getTransitionUIID()));
 			else if (toActivity == null)
-				listOfValidationErrorDTOs.add(new ValidationErrorDTO(ValidationErrorDTO.TRANSITION_ERROR, transition.getTransitionUIID()));
+				listOfValidationErrorDTOs.add(new ValidationErrorDTO(messageService.getMessage(ValidationErrorDTO.TRANSITION_ERROR_KEY), transition.getTransitionUIID()));
 			
 		}
 		
@@ -182,13 +183,13 @@
 		if(numOfActivities > 1)
 		{
 			if (inputTransition == null && outputTransition == null)
-				listOfValidationErrorDTOs.add(new ValidationErrorDTO(ValidationErrorDTO.ACTIVITY_TRANSITION_ERROR, activity.getActivityUIID()));
+				listOfValidationErrorDTOs.add(new ValidationErrorDTO(messageService.getMessage(ValidationErrorDTO.ACTIVITY_TRANSITION_ERROR_KEY), activity.getActivityUIID()));
 			
 		}
 		if (numOfActivities == 1)
 		{	
 			if (inputTransition != null || outputTransition != null)				
-				listOfValidationErrorDTOs.add(new ValidationErrorDTO(ValidationErrorDTO.ACTIVITY_TRANSITION_ERROR, activity.getActivityUIID()));
+				listOfValidationErrorDTOs.add(new ValidationErrorDTO(messageService.getMessage(ValidationErrorDTO.ACTIVITY_TRANSITION_ERROR_KEY), activity.getActivityUIID()));
 			
 		}
 	
@@ -204,15 +205,14 @@
 		Iterator activityIterator = activities.iterator();
 		while (activityIterator.hasNext())
 		{
-			String errorMessage = null;
+			String errorKey = null;
 			Activity activity = (Activity)activityIterator.next();
 			checkIfGroupingRequired(activity);
 			validateGroupingIfGroupingIsApplied(activity);	
 			validateOptionalActivity(activity);
 			validateOptionsActivityOrderId(activity);
-			if((errorMessage = activity.validateActivity()) != null) {
-				listOfValidationErrorDTOs.add(new ValidationErrorDTO(errorMessage, activity.getActivityUIID()));
-			}
+			if((errorKey = activity.validateActivity()) != null)
+				listOfValidationErrorDTOs.add(new ValidationErrorDTO(messageService.getMessage(errorKey), activity.getActivityUIID()));
 		}
 	}
 	
@@ -237,15 +237,15 @@
 				Grouping grouping = activity.getGrouping();
 				if (grouping == null)
 				{
-					listOfValidationErrorDTOs.add(new ValidationErrorDTO(ValidationErrorDTO.GROUPING_REQUIRED_ERROR, activity.getActivityUIID()));
+					listOfValidationErrorDTOs.add(new ValidationErrorDTO(messageService.getMessage(ValidationErrorDTO.GROUPING_REQUIRED_ERROR_KEY), activity.getActivityUIID()));
 				}
 			}
 			else if(groupingSupportType.intValue() == Grouping.GROUPING_SUPPORT_NONE)
 			{
 				Grouping grouping = activity.getGrouping();
 				if (grouping != null)
 				{
-					listOfValidationErrorDTOs.add(new ValidationErrorDTO(ValidationErrorDTO.GROUPING_NOT_REQUIRED_ERROR, activity.getActivityUIID()));
+					listOfValidationErrorDTOs.add(new ValidationErrorDTO(messageService.getMessage(ValidationErrorDTO.GROUPING_NOT_REQUIRED_ERROR_KEY), activity.getActivityUIID()));
 				}
 			}
 				
@@ -268,7 +268,7 @@
 				int numOfChildActivities = childActivities.size();
 				if(numOfChildActivities == 0)
 				{
-					listOfValidationErrorDTOs.add(new ValidationErrorDTO(ValidationErrorDTO.OPTIONAL_ACTIVITY_ERROR, optionsActivity.getActivityUIID()));
+					listOfValidationErrorDTOs.add(new ValidationErrorDTO(messageService.getMessage(ValidationErrorDTO.OPTIONAL_ACTIVITY_ERROR_KEY), optionsActivity.getActivityUIID()));
 				}
 				
 				
@@ -315,7 +315,7 @@
 			}
 			
 			if (!validOrderId)
-				listOfValidationErrorDTOs.add(new ValidationErrorDTO(ValidationErrorDTO.OPTIONAL_ACTIVITY_ORDER_ID_INVALID_ERROR, optionsActivity.getActivityUIID()));
+				listOfValidationErrorDTOs.add(new ValidationErrorDTO(messageService.getMessage(ValidationErrorDTO.OPTIONAL_ACTIVITY_ORDER_ID_INVALID_ERROR_KEY), optionsActivity.getActivityUIID()));
 			
 		}	
 	}
@@ -331,7 +331,7 @@
 			{				
 				if (activity.getGrouping() == null)
 				{
-					listOfValidationErrorDTOs.add(new ValidationErrorDTO(ValidationErrorDTO.GROUPING_SELECTED_ERROR, activity.getActivityUIID()));
+					listOfValidationErrorDTOs.add(new ValidationErrorDTO(messageService.getMessage(ValidationErrorDTO.GROUPING_SELECTED_ERROR), activity.getActivityUIID()));
 				}
 			}