Index: lams_admin/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -r500d3a196272c489de66d8e46e7df9f02f6c8f73 -re40001e43310236959641532ae8b0c61edcc0a19
--- lams_admin/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 500d3a196272c489de66d8e46e7df9f02f6c8f73)
+++ lams_admin/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e40001e43310236959641532ae8b0c61edcc0a19)
@@ -31,7 +31,7 @@
 		%>
 <%@ tag body-content="empty"%>
 <%@ taglib uri="fck-editor" prefix="FCK"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <c:set var="lams">
@@ -43,14 +43,18 @@
 	<!--  Testing by Anthony, please delete this comment -->
 	<div id="wyswygEditor">
 		<div>
-			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
-				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
-				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+			<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+		
+			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector" 
+				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" 
+				flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector" 
+				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" 
+				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash" defaultLanguage="${language}" autoDetectLanguage="false">
 			</FCK:editor>
 		</div>
 		<div style="text-align: center">
-			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<fmt:message key="label.save"/>" /></a>
-			<a href="#" onClick="doPreview(activeEditorIndex)"><img	src="${lams}images/cross.gif" border="0" alt="<fmt:message key="label.cancel"/>" /></a>
+			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>" /></a> &nbsp;&nbsp;&nbsp;&nbsp; <a href="#"
+				onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>" /></a>
 		</div>
 	</div>
 </div>
Index: lams_central/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -r5894fab28c33727f24d8b662caed5f5faac8a589 -re40001e43310236959641532ae8b0c61edcc0a19
--- lams_central/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 5894fab28c33727f24d8b662caed5f5faac8a589)
+++ lams_central/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e40001e43310236959641532ae8b0c61edcc0a19)
@@ -31,7 +31,7 @@
 		%>
 <%@ tag body-content="empty"%>
 <%@ taglib uri="fck-editor" prefix="FCK"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <c:set var="lams">
@@ -43,14 +43,18 @@
 	<!--  Testing by Anthony, please delete this comment -->
 	<div id="wyswygEditor">
 		<div>
-			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
-				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
-				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+			<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+		
+			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector" 
+				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" 
+				flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector" 
+				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" 
+				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash" defaultLanguage="${language}" autoDetectLanguage="false">
 			</FCK:editor>
 		</div>
 		<div style="text-align: center">
-			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<fmt:message key="label.save"/>" /></a>
-			<a href="#" onClick="doPreview(activeEditorIndex)"><img	src="${lams}images/cross.gif" border="0" alt="<fmt:message key="label.cancel"/>" /></a>
+			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>" /></a> &nbsp;&nbsp;&nbsp;&nbsp; <a href="#"
+				onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>" /></a>
 		</div>
 	</div>
 </div>
Index: lams_learning/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -r058624bba137d9124eed6784321dbecc72a12550 -re40001e43310236959641532ae8b0c61edcc0a19
--- lams_learning/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 058624bba137d9124eed6784321dbecc72a12550)
+++ lams_learning/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e40001e43310236959641532ae8b0c61edcc0a19)
@@ -1,58 +1,60 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * HTMLEditor.tag
-  *	Author: Mitchell Seaton
-  *	Description: Creates a single instance of FCK Editor used over multiple fields.
-  * Wiki: 
-  */
- 
- %>
-<%@ tag body-content="empty" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<c:set var="lams"><lams:LAMSURL/></c:set>
+<%/****************************************************************
+			 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+			 * =============================================================
+			 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+			 * 
+			 * This program is free software; you can redistribute it and/or modify
+			 * it under the terms of the GNU General Public License version 2.0
+			 * as published by the Free Software Foundation.
+			 * 
+			 * This program is distributed in the hope that it will be useful,
+			 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+			 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+			 * GNU General Public License for more details.
+			 * 
+			 * You should have received a copy of the GNU General Public License
+			 * along with this program; if not, write to the Free Software
+			 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+			 * USA
+			 * 
+			 * http://www.gnu.org/licenses/gpl.txt
+			 * ****************************************************************
+			 */
 
-<div id="wyswygEditorScreen" style="visibility: hidden"> <!-- position: absolute; z-index: 1000; top: 16px; left: 230px; -->
-        <div id="wyswygEditor">
-            <div>
-               <FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/"
-                    imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector"
-                    linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
-                    flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector"
-                    imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
-                    linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
-                    flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
-         		</FCK:editor>  
-            </div>
-            <div style="text-align: center">
-                <a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)" ><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>"/></a>
-                &nbsp&nbsp&nbsp&nbsp
-                <a href="#" onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>"/></a>
-            </div>
-        </div>
+			/**
+			 * HTMLEditor.tag
+			 *	Author: Mitchell Seaton
+			 *	Description: Creates a single instance of FCK Editor used over multiple fields.
+			 * Wiki: 
+			 */
+
+		%>
+<%@ tag body-content="empty"%>
+<%@ taglib uri="fck-editor" prefix="FCK"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<div id="wyswygEditorScreen" style="visibility: hidden">
+	<!-- position: absolute; z-index: 1000; top: 16px; left: 230px; -->
+	<!--  Testing by Anthony, please delete this comment -->
+	<div id="wyswygEditor">
+		<div>
+			<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+		
+			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector" 
+				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" 
+				flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector" 
+				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" 
+				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash" defaultLanguage="${language}" autoDetectLanguage="false">
+			</FCK:editor>
+		</div>
+		<div style="text-align: center">
+			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>" /></a> &nbsp;&nbsp;&nbsp;&nbsp; <a href="#"
+				onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>" /></a>
+		</div>
+	</div>
 </div>
Index: lams_monitoring/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -re40001e43310236959641532ae8b0c61edcc0a19
--- lams_monitoring/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_monitoring/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e40001e43310236959641532ae8b0c61edcc0a19)
@@ -31,7 +31,7 @@
 		%>
 <%@ tag body-content="empty"%>
 <%@ taglib uri="fck-editor" prefix="FCK"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <c:set var="lams">
@@ -43,14 +43,18 @@
 	<!--  Testing by Anthony, please delete this comment -->
 	<div id="wyswygEditor">
 		<div>
-			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
-				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
-				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+			<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+		
+			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector" 
+				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" 
+				flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector" 
+				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" 
+				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash" defaultLanguage="${language}" autoDetectLanguage="false">
 			</FCK:editor>
 		</div>
 		<div style="text-align: center">
-			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<fmt:message key="label.save"/>" /></a>
-			<a href="#" onClick="doPreview(activeEditorIndex)"><img	src="${lams}images/cross.gif" border="0" alt="<fmt:message key="label.cancel"/>" /></a>
+			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>" /></a> &nbsp;&nbsp;&nbsp;&nbsp; <a href="#"
+				onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>" /></a>
 		</div>
 	</div>
 </div>
Index: lams_tool_chat/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -re40001e43310236959641532ae8b0c61edcc0a19
--- lams_tool_chat/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_tool_chat/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e40001e43310236959641532ae8b0c61edcc0a19)
@@ -31,7 +31,7 @@
 		%>
 <%@ tag body-content="empty"%>
 <%@ taglib uri="fck-editor" prefix="FCK"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <c:set var="lams">
@@ -43,14 +43,18 @@
 	<!--  Testing by Anthony, please delete this comment -->
 	<div id="wyswygEditor">
 		<div>
-			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
-				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
-				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+			<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+		
+			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector" 
+				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" 
+				flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector" 
+				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" 
+				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash" defaultLanguage="${language}" autoDetectLanguage="false">
 			</FCK:editor>
 		</div>
 		<div style="text-align: center">
-			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<fmt:message key="label.save"/>" /></a>
-			<a href="#" onClick="doPreview(activeEditorIndex)"><img	src="${lams}images/cross.gif" border="0" alt="<fmt:message key="label.cancel"/>" /></a>
+			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>" /></a> &nbsp;&nbsp;&nbsp;&nbsp; <a href="#"
+				onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>" /></a>
 		</div>
 	</div>
 </div>
Index: lams_tool_example/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -rfc085e0eda6c46d659c5b98f9ee9e29f495af042 -re40001e43310236959641532ae8b0c61edcc0a19
--- lams_tool_example/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
+++ lams_tool_example/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e40001e43310236959641532ae8b0c61edcc0a19)
@@ -1,58 +1,60 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * HTMLEditor.tag
-  *	Author: Mitchell Seaton
-  *	Description: Creates a single instance of FCK Editor used over multiple fields.
-  * Wiki: 
-  */
- 
- %>
-<%@ tag body-content="empty" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<c:set var="lams"><lams:LAMSURL/></c:set>
+<%/****************************************************************
+			 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+			 * =============================================================
+			 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+			 * 
+			 * This program is free software; you can redistribute it and/or modify
+			 * it under the terms of the GNU General Public License version 2.0
+			 * as published by the Free Software Foundation.
+			 * 
+			 * This program is distributed in the hope that it will be useful,
+			 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+			 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+			 * GNU General Public License for more details.
+			 * 
+			 * You should have received a copy of the GNU General Public License
+			 * along with this program; if not, write to the Free Software
+			 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+			 * USA
+			 * 
+			 * http://www.gnu.org/licenses/gpl.txt
+			 * ****************************************************************
+			 */
 
-<div id="wyswygEditorScreen" style="visibility: hidden"> <!-- position: absolute; z-index: 1000; top: 16px; left: 230px; -->
-        <div id="wyswygEditor">
-            <div>
-               <FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/"
-                    imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector"
-                    linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
-                    flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector"
-                    imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
-                    linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
-                    flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
-         		</FCK:editor>  
-            </div>
-            <div style="text-align: center">
-                <a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)" ><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>"/></a>
-                &nbsp&nbsp&nbsp&nbsp
-                <a href="#" onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>"/></a>
-            </div>
-        </div>
+			/**
+			 * HTMLEditor.tag
+			 *	Author: Mitchell Seaton
+			 *	Description: Creates a single instance of FCK Editor used over multiple fields.
+			 * Wiki: 
+			 */
+
+		%>
+<%@ tag body-content="empty"%>
+<%@ taglib uri="fck-editor" prefix="FCK"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<div id="wyswygEditorScreen" style="visibility: hidden">
+	<!-- position: absolute; z-index: 1000; top: 16px; left: 230px; -->
+	<!--  Testing by Anthony, please delete this comment -->
+	<div id="wyswygEditor">
+		<div>
+			<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+		
+			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector" 
+				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" 
+				flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector" 
+				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" 
+				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash" defaultLanguage="${language}" autoDetectLanguage="false">
+			</FCK:editor>
+		</div>
+		<div style="text-align: center">
+			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>" /></a> &nbsp;&nbsp;&nbsp;&nbsp; <a href="#"
+				onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>" /></a>
+		</div>
+	</div>
 </div>
Index: lams_tool_forum/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b -re40001e43310236959641532ae8b0c61edcc0a19
--- lams_tool_forum/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
+++ lams_tool_forum/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e40001e43310236959641532ae8b0c61edcc0a19)
@@ -43,11 +43,13 @@
 	<!--  Testing by Anthony, please delete this comment -->
 	<div id="wyswygEditor">
 		<div>
+			<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+		
 			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector" 
 				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" 
 				flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector" 
 				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" 
-				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash" defaultLanguage="${language}" autoDetectLanguage="false">
 			</FCK:editor>
 		</div>
 		<div style="text-align: center">
Index: lams_tool_lamc/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -re48a67de27af42221ddce80419f05c1be4680430 -re40001e43310236959641532ae8b0c61edcc0a19
--- lams_tool_lamc/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e48a67de27af42221ddce80419f05c1be4680430)
+++ lams_tool_lamc/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e40001e43310236959641532ae8b0c61edcc0a19)
@@ -43,11 +43,13 @@
 	<!--  Testing by Anthony, please delete this comment -->
 	<div id="wyswygEditor">
 		<div>
+			<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+		
 			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector" 
 				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" 
 				flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector" 
 				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" 
-				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash" defaultLanguage="${language}" autoDetectLanguage="false">
 			</FCK:editor>
 		</div>
 		<div style="text-align: center">
Index: lams_tool_laqa/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -re48a67de27af42221ddce80419f05c1be4680430 -re40001e43310236959641532ae8b0c61edcc0a19
--- lams_tool_laqa/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e48a67de27af42221ddce80419f05c1be4680430)
+++ lams_tool_laqa/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e40001e43310236959641532ae8b0c61edcc0a19)
@@ -43,11 +43,13 @@
 	<!--  Testing by Anthony, please delete this comment -->
 	<div id="wyswygEditor">
 		<div>
+			<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+		
 			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector" 
 				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" 
 				flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector" 
 				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" 
-				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash" defaultLanguage="${language}" autoDetectLanguage="false">
 			</FCK:editor>
 		</div>
 		<div style="text-align: center">
Index: lams_tool_larsrc/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -r0f16af06eaa594f2115829f31a5ddc1f8a59721d -re40001e43310236959641532ae8b0c61edcc0a19
--- lams_tool_larsrc/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
+++ lams_tool_larsrc/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e40001e43310236959641532ae8b0c61edcc0a19)
@@ -43,11 +43,13 @@
 	<!--  Testing by Anthony, please delete this comment -->
 	<div id="wyswygEditor">
 		<div>
+			<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+		
 			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector" 
 				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" 
 				flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector" 
 				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" 
-				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash" defaultLanguage="${language}" autoDetectLanguage="false">
 			</FCK:editor>
 		</div>
 		<div style="text-align: center">
Index: lams_tool_nb/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -r5894fab28c33727f24d8b662caed5f5faac8a589 -re40001e43310236959641532ae8b0c61edcc0a19
--- lams_tool_nb/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 5894fab28c33727f24d8b662caed5f5faac8a589)
+++ lams_tool_nb/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e40001e43310236959641532ae8b0c61edcc0a19)
@@ -31,7 +31,7 @@
 		%>
 <%@ tag body-content="empty"%>
 <%@ taglib uri="fck-editor" prefix="FCK"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <c:set var="lams">
@@ -43,14 +43,18 @@
 	<!--  Testing by Anthony, please delete this comment -->
 	<div id="wyswygEditor">
 		<div>
-			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
-				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
-				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+			<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+		
+			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector" 
+				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" 
+				flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector" 
+				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" 
+				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash" defaultLanguage="${language}" autoDetectLanguage="false">
 			</FCK:editor>
 		</div>
 		<div style="text-align: center">
-			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<fmt:message key="label.save"/>" /></a>
-			<a href="#" onClick="doPreview(activeEditorIndex)"><img	src="${lams}images/cross.gif" border="0" alt="<fmt:message key="label.cancel"/>" /></a>
+			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>" /></a> &nbsp;&nbsp;&nbsp;&nbsp; <a href="#"
+				onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>" /></a>
 		</div>
 	</div>
 </div>
Index: lams_tool_notebook/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -r5948e17402e1ad574aeddbe55f93dca2f58bbbec -re40001e43310236959641532ae8b0c61edcc0a19
--- lams_tool_notebook/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 5948e17402e1ad574aeddbe55f93dca2f58bbbec)
+++ lams_tool_notebook/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e40001e43310236959641532ae8b0c61edcc0a19)
@@ -31,7 +31,7 @@
 		%>
 <%@ tag body-content="empty"%>
 <%@ taglib uri="fck-editor" prefix="FCK"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <c:set var="lams">
@@ -43,14 +43,18 @@
 	<!--  Testing by Anthony, please delete this comment -->
 	<div id="wyswygEditor">
 		<div>
-			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
-				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
-				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+			<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+		
+			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector" 
+				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" 
+				flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector" 
+				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" 
+				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash" defaultLanguage="${language}" autoDetectLanguage="false">
 			</FCK:editor>
 		</div>
 		<div style="text-align: center">
-			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<fmt:message key="label.save"/>" /></a>
-			<a href="#" onClick="doPreview(activeEditorIndex)"><img	src="${lams}images/cross.gif" border="0" alt="<fmt:message key="label.cancel"/>" /></a>
+			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>" /></a> &nbsp;&nbsp;&nbsp;&nbsp; <a href="#"
+				onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>" /></a>
 		</div>
 	</div>
 </div>
Index: lams_tool_sbmt/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -r29516de2d9ed294b03e1b886245e71266794e714 -re40001e43310236959641532ae8b0c61edcc0a19
--- lams_tool_sbmt/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 29516de2d9ed294b03e1b886245e71266794e714)
+++ lams_tool_sbmt/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e40001e43310236959641532ae8b0c61edcc0a19)
@@ -31,7 +31,7 @@
 		%>
 <%@ tag body-content="empty"%>
 <%@ taglib uri="fck-editor" prefix="FCK"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <c:set var="lams">
@@ -43,14 +43,18 @@
 	<!--  Testing by Anthony, please delete this comment -->
 	<div id="wyswygEditor">
 		<div>
-			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
-				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
-				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+			<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+		
+			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector" 
+				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" 
+				flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector" 
+				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" 
+				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash" defaultLanguage="${language}" autoDetectLanguage="false">
 			</FCK:editor>
 		</div>
 		<div style="text-align: center">
-			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<fmt:message key="label.save"/>" /></a>
-			<a href="#" onClick="doPreview(activeEditorIndex)"><img	src="${lams}images/cross.gif" border="0" alt="<fmt:message key="label.cancel"/>" /></a>
+			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>" /></a> &nbsp;&nbsp;&nbsp;&nbsp; <a href="#"
+				onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>" /></a>
 		</div>
 	</div>
 </div>
Index: lams_tool_vote/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -re48a67de27af42221ddce80419f05c1be4680430 -re40001e43310236959641532ae8b0c61edcc0a19
--- lams_tool_vote/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e48a67de27af42221ddce80419f05c1be4680430)
+++ lams_tool_vote/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e40001e43310236959641532ae8b0c61edcc0a19)
@@ -43,11 +43,13 @@
 	<!--  Testing by Anthony, please delete this comment -->
 	<div id="wyswygEditor">
 		<div>
+			<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+		
 			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector" 
 				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" 
 				flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector" 
 				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" 
-				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash" defaultLanguage="${language}" autoDetectLanguage="false">
 			</FCK:editor>
 		</div>
 		<div style="text-align: center">
Index: lams_www/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -r0b9b40de7fc41eaba04755e6e10ac34d6c52b1e2 -re40001e43310236959641532ae8b0c61edcc0a19
--- lams_www/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 0b9b40de7fc41eaba04755e6e10ac34d6c52b1e2)
+++ lams_www/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e40001e43310236959641532ae8b0c61edcc0a19)
@@ -31,7 +31,7 @@
 		%>
 <%@ tag body-content="empty"%>
 <%@ taglib uri="fck-editor" prefix="FCK"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <c:set var="lams">
@@ -43,14 +43,18 @@
 	<!--  Testing by Anthony, please delete this comment -->
 	<div id="wyswygEditor">
 		<div>
-			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
-				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
-				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+			<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+		
+			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector" 
+				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" 
+				flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector" 
+				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" 
+				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash" defaultLanguage="${language}" autoDetectLanguage="false">
 			</FCK:editor>
 		</div>
 		<div style="text-align: center">
-			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<fmt:message key="label.save"/>" /></a>
-			<a href="#" onClick="doPreview(activeEditorIndex)"><img	src="${lams}images/cross.gif" border="0" alt="<fmt:message key="label.cancel"/>" /></a>
+			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>" /></a> &nbsp;&nbsp;&nbsp;&nbsp; <a href="#"
+				onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>" /></a>
 		</div>
 	</div>
 </div>