Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java,v
diff -u -r1.34 -r1.35
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	7 May 2008 06:33:45 -0000	1.34
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	13 May 2008 00:54:45 -0000	1.35
@@ -30,6 +30,7 @@
 import java.io.PrintWriter;
 import java.text.DateFormat;
 import java.text.NumberFormat;
+import java.text.ParsePosition;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
@@ -74,6 +75,7 @@
 import org.lamsfoundation.lams.tool.forum.web.forms.ForumForm;
 import org.lamsfoundation.lams.tool.forum.web.forms.MarkForm;
 import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.NumberUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
@@ -357,8 +359,7 @@
 					if (dto.getMessage() != null
 							&& dto.getMessage().getReport() != null
 							&& dto.getMessage().getReport().getMark() != null)
-						cell.setCellValue(dto.getMessage().getReport()
-								.getMark().doubleValue());
+						cell.setCellValue(NumberUtil.formatLocalisedNumber(dto.getMessage().getReport().getMark(), request.getLocale(),1));
 					else
 						cell.setCellValue("");
 
@@ -433,7 +434,7 @@
 	}
 
 	/**
-	 * View instruction inforamtion for a content.
+	 * View instruction information for a content.
 	 * 
 	 * @param mapping
 	 * @param form
@@ -720,7 +721,7 @@
 		// echo back to web page
 		if (msg.getReport() != null) {
 			if (msg.getReport().getMark() != null)
-				markForm.setMark(msg.getReport().getMark().toString());
+				markForm.setMark(NumberUtil.formatLocalisedNumber(msg.getReport().getMark(),request.getLocale(),1));
 			else
 				markForm.setMark("");
 			markForm.setComment(msg.getReport().getComment());
@@ -755,17 +756,15 @@
 		MarkForm markForm = (MarkForm) form;
 		
 		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, markForm.getSessionMapID());
-		String mark = markForm.getMark();
+		String markStr = markForm.getMark();
+		Float mark = null;
         ActionMessages errors = new ActionMessages();
-        if (StringUtils.isBlank(mark)) {
+        if (StringUtils.isBlank(markStr)) {
           ActionMessage error = new ActionMessage("error.valueReqd");
           errors.add("report.mark", error);
-        }else if(!NumberUtils.isNumber(mark)){
-        	ActionMessage error = new ActionMessage("error.mark.needNumber");
-        	errors.add("report.mark", error);
         }else {
         	try{
-        		Float.parseFloat(mark);
+        		mark = NumberUtil.getLocalisedFloat(markStr, request.getLocale());
         	}catch(Exception e){
               	ActionMessage error = new ActionMessage("error.mark.invalid.number");
             	errors.add("report.mark", error);
@@ -803,7 +802,7 @@
 		if(toolSession.isMarkReleased())
 			report.setDateMarksReleased(new Date());
 		
-		report.setMark(new Float(Float.parseFloat(mark)));
+		report.setMark(mark);
 		report.setComment(markForm.getComment());
 		forumService.updateTopic(msg);
 		
Index: lams_tool_forum/web/jsps/export/exportportfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/export/exportportfolio.jsp,v
diff -u -r1.17 -r1.18
--- lams_tool_forum/web/jsps/export/exportportfolio.jsp	8 Jun 2007 01:35:35 -0000	1.17
+++ lams_tool_forum/web/jsps/export/exportportfolio.jsp	13 May 2008 00:54:45 -0000	1.18
@@ -94,7 +94,7 @@
 									<fmt:message key="message.not.avaliable"/>
 								</c:when>
 								<c:otherwise>
-									${msgDto.mark}
+									<fmt:formatNumber value="${msgDto.mark}"  maxFractionDigits="1"/>
 								</c:otherwise>
 							</c:choose>
 						</td>
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicview.jsp,v
diff -u -r1.28 -r1.29
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	9 May 2008 04:21:42 -0000	1.28
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	13 May 2008 00:54:45 -0000	1.29
@@ -73,7 +73,7 @@
 								key="lable.topic.title.mark" />
 						</span>
 						<BR>
-						${msgDto.mark}
+						<fmt:formatNumber value="${msgDto.mark}"  maxFractionDigits="1"/>
 					</td>
 				</tr>
 				<tr>
Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/updatemarks.jsp,v
diff -u -r1.20 -r1.21
--- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	7 May 2008 06:34:29 -0000	1.20
+++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	13 May 2008 00:54:45 -0000	1.21
@@ -61,7 +61,7 @@
 				<fmt:message key="lable.topic.title.mark" />* 
 			</td>
 			<td>
-				<html:text property="mark"/>
+				<html:text property="mark"><fmt:formatNumber value="${topic.message.report.mark}"  maxFractionDigits="1"/></html:text>
 			</td>
 		</tr>
 		<tr>
Index: lams_tool_forum/web/jsps/monitoring/viewmarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/viewmarks.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_forum/web/jsps/monitoring/viewmarks.jsp	7 May 2008 06:34:29 -0000	1.6
+++ lams_tool_forum/web/jsps/monitoring/viewmarks.jsp	13 May 2008 00:54:45 -0000	1.7
@@ -77,7 +77,7 @@
 							<fmt:message key="message.not.avaliable" />
 						</c:when>
 						<c:otherwise>
-							<c:out value="${topic.message.report.mark}" escapeXml="false" />
+							<fmt:formatNumber value="${topic.message.report.mark}"  maxFractionDigits="1"/>
 						</c:otherwise>
 					</c:choose>
 				</td>