Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -rca136be52df70bbdd506d2383d4d4bd2201a3b3f -r955ea2e56ab29f6953d79efbddb1b8406a57aa05
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision ca136be52df70bbdd506d2383d4d4bd2201a3b3f)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 955ea2e56ab29f6953d79efbddb1b8406a57aa05)
@@ -44,9 +44,7 @@
 			UPLOAD_FILE_MAX_SIZE = '<c:out value="${UPLOAD_FILE_MAX_SIZE}"/>',
 			// convert Java syntax to JSON
 	       EXE_FILE_TYPES = JSON.parse("[" + "${EXE_FILE_TYPES}".replace(/\.\w+/g, '"$&"') + "]"),
-		   decoderDiv = $('<div />'),
-	       <fmt:message key="error.attachment.executable" var="EXE_FILE_ERROR_VAR" />
-	       EXE_FILE_ERROR = decoderDiv.html('<c:out value="${EXE_FILE_ERROR_VAR}" />').text();
+		   EXE_FILE_ERROR = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.attachment.executable" /></spring:escapeBody>';
 		
 		
 		$(document).ready(function() {
@@ -174,10 +172,10 @@
 			<c:if test="${sessionMap.minLimitUploadNumber != null}">
 				if (uploadedFilesNumber < ${sessionMap.minLimitUploadNumber}) {
 					if (${sessionMap.mode eq 'author'}) {
-						alert('<fmt:message key="label.should.upload.another"><fmt:param value="${sessionMap.minLimitUploadNumber}" /></fmt:message>' + 
-							  '\n<fmt:message key="label.min.limit.preview"/>');
+						alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.should.upload.another"><fmt:param value="${sessionMap.minLimitUploadNumber}" /></fmt:message></spring:escapeBody>' + 
+							  '\n<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.min.limit.preview"/></spring:escapeBody>');
 					} else {
-						alert('<fmt:message key="label.should.upload.another"><fmt:param value="${sessionMap.minLimitUploadNumber}" /></fmt:message>');
+						alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.should.upload.another"><fmt:param value="${sessionMap.minLimitUploadNumber}" /></fmt:message></spring:escapeBody>');
 						return false;
 					}
 				}
@@ -186,11 +184,11 @@
 			//let user confirm zero files upload
 			if (uploadedFilesNumber == 0) {
 				if (${sessionMap.lockOnFinish}) {
-					if (!confirm("<fmt:message key='learner.finish.without.upload'/>")) {
+					if (!confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='learner.finish.without.upload'/></spring:escapeBody>")) {
 						return false;
 					}
 				} else {
-					if (!confirm("<fmt:message key='messsage.learner.finish.confirm'/>")) {
+					if (!confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='messsage.learner.finish.confirm'/></spring:escapeBody>")) {
 						return false;
 					}
 				}
@@ -228,7 +226,7 @@
 			// check description
 			clearFileError("desc-error-msg");
 			if ( $('#description').val().trim().length == 0 ) {
-				var requiredMsg = '<fmt:message key="errors.required"><fmt:param><fmt:message key="label.learner.fileDescription"/></fmt:param></fmt:message>';
+				var requiredMsg = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="errors.required"><fmt:param><fmt:message key="label.learner.fileDescription"/></fmt:param></fmt:message></spring:escapeBody>';
 				showFileError(requiredMsg, "desc-error-msg");
 				valid = false;
 			}
@@ -252,7 +250,7 @@
 		}
 		
 		function deleteLearnerFile(detailId, filename) {
-			var msg = '<fmt:message key="message.monitor.confirm.original.learner.file.delete"/>';
+			var msg = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.monitor.confirm.original.learner.file.delete"/></spring:escapeBody>';
 			msg = msg.replace('{0}', filename);
 			var answer = confirm(msg);
 			if (answer) {