Index: lams_learning/web/exportWaitingPage.jsp
===================================================================
diff -u -r9efd079f609a7084523e78c4b78e019fd906ce4c -rbb5efeac660e0dd0ad245a27074801a1d2f0f895
--- lams_learning/web/exportWaitingPage.jsp	(.../exportWaitingPage.jsp)	(revision 9efd079f609a7084523e78c4b78e019fd906ce4c)
+++ lams_learning/web/exportWaitingPage.jsp	(.../exportWaitingPage.jsp)	(revision bb5efeac660e0dd0ad245a27074801a1d2f0f895)
@@ -20,10 +20,12 @@
 --%>  
 
 <%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
+<%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %>
 <%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %>
 <%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %>
 <%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %>
 
+
 <%
 String protocol = request.getProtocol();
 if(protocol.startsWith("HTTPS")){
@@ -76,6 +78,7 @@
 			updateindicator = updateindicator+"... ";
 		
 			var ready=req.readyState;
+			var msg;
 		
 			if (ready==READY_STATE_COMPLETE){
 			
@@ -86,10 +89,12 @@
 						window.location.href = url;
 						break;
 					case 404: //status 404 Not Found
-						alert("The export download page cannot be found");
+						msg = "<fmt:message key='error.message.404' />";
+						alert(msg);
 						break;
 					case 500: //status 500 Internal Server Error
-						alert("A problem has occurred. Could not generate portfolio");
+						msg = "<fmt:message key='error.system.export' />";
+						document.getElementById("message").innerHTML = msg;
 						break;
 				}