Index: lams_admin/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/Attic/HTMLEditor.tag,v
diff -u -r1.1 -r1.2
--- lams_admin/web/WEB-INF/tags/HTMLEditor.tag	15 Jul 2006 00:06:44 -0000	1.1
+++ lams_admin/web/WEB-INF/tags/HTMLEditor.tag	17 Aug 2006 06:16:21 -0000	1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/Attic/HTMLEditor.tag,v
diff -u -r1.5 -r1.6
Binary files differ
Index: lams_learning/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/Attic/HTMLEditor.tag,v
diff -u -r1.1 -r1.2
--- lams_learning/web/WEB-INF/tags/HTMLEditor.tag	2 May 2006 05:42:49 -0000	1.1
+++ lams_learning/web/WEB-INF/tags/HTMLEditor.tag	17 Aug 2006 06:16:20 -0000	1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/Attic/HTMLEditor.tag,v
diff -u -r1.1 -r1.2
--- lams_monitoring/web/WEB-INF/tags/HTMLEditor.tag	6 Jul 2006 04:41:25 -0000	1.1
+++ lams_monitoring/web/WEB-INF/tags/HTMLEditor.tag	17 Aug 2006 06:16:21 -0000	1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Attic/HTMLEditor.tag,v
diff -u -r1.5 -r1.6
Binary files differ
Index: lams_tool_example/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_example/web/WEB-INF/tags/HTMLEditor.tag,v
diff -u -r1.2 -r1.3
--- lams_tool_example/web/WEB-INF/tags/HTMLEditor.tag	7 Apr 2006 00:36:50 -0000	1.2
+++ lams_tool_example/web/WEB-INF/tags/HTMLEditor.tag	17 Aug 2006 06:16:21 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/Attic/HTMLEditor.tag,v
diff -u -r1.4 -r1.5
Binary files differ
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/create.jsp,v
diff -u -r1.21 -r1.22
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	11 Aug 2006 02:36:53 -0000	1.21
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	17 Aug 2006 06:22:54 -0000	1.22
@@ -43,14 +43,16 @@
 				<tr>
 					<td>
 						<b><bean:message key="message.label.body" />*</b><BR>
+						
+						<c:set var="language"><lams:user property="localeLanguage"/></c:set>
 						<fck:editor id="message.body" 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"
-							toolbarSet="Default-Learner">
+							toolbarSet="Default-Learner" defaultLanguage="${language}" autoDetectLanguage="false">
 						</fck:editor>							
 						<html:errors property="message.body" />
 					</td>
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/edit.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	11 Aug 2006 02:36:53 -0000	1.10
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	17 Aug 2006 06:22:54 -0000	1.11
@@ -33,14 +33,15 @@
 					<td>
 						<b><bean:message key="message.label.body" />*</b>
 						<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+						<c:set var="language"><lams:user property="localeLanguage"/></c:set>
 						<fck:editor id="message.body" 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"
-							toolbarSet="Default-Learner">
+							toolbarSet="Default-Learner" defaultLanguage="${language}" autoDetectLanguage="false">
 							<c:out value="${formBean.message.body}" escapeXml="false" />
 						</fck:editor>							
 						
Index: lams_tool_forum/web/jsps/learning/message/bodyarea.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/bodyarea.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	11 Aug 2006 02:36:53 -0000	1.6
+++ lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	17 Aug 2006 06:22:54 -0000	1.7
@@ -4,14 +4,15 @@
 <c:choose>
 	<c:when test="${allowRichEditor}">
 		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+		<c:set var="language"><lams:user property="localeLanguage"/></c:set>
 		<fck:editor id="message.body" 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"
-			toolbarSet="Default-Learner">
+			toolbarSet="Default-Learner" defaultLanguage="${language}" autoDetectLanguage="false">
 			<c:out value="${formBean.message.body}" escapeXml="false"/>
 		</fck:editor>		
 	</c:when>
Index: lams_tool_lamc/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tags/Attic/HTMLEditor.tag,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/web/WEB-INF/tags/HTMLEditor.tag	29 Jun 2006 00:44:45 -0000	1.3
+++ lams_tool_lamc/web/WEB-INF/tags/HTMLEditor.tag	17 Aug 2006 06:16:19 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/Attic/HTMLEditor.tag,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/web/WEB-INF/tags/HTMLEditor.tag	29 Jun 2006 00:41:24 -0000	1.3
+++ lams_tool_laqa/web/WEB-INF/tags/HTMLEditor.tag	17 Aug 2006 06:16:20 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/Attic/HTMLEditor.tag,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/web/WEB-INF/tags/HTMLEditor.tag	27 Jun 2006 08:06:03 -0000	1.3
+++ lams_tool_larsrc/web/WEB-INF/tags/HTMLEditor.tag	17 Aug 2006 06:16:21 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/Attic/HTMLEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_nb/web/WEB-INF/tags/HTMLEditor.tag	28 Jun 2006 07:53:31 -0000	1.4
+++ lams_tool_nb/web/WEB-INF/tags/HTMLEditor.tag	17 Aug 2006 06:16:19 -0000	1.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/Attic/HTMLEditor.tag,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/learning/notebook.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_notebook/web/pages/learning/notebook.jsp	3 Aug 2006 07:14:11 -0000	1.6
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	17 Aug 2006 06:22:54 -0000	1.7
@@ -24,15 +24,15 @@
 							<c:when test="${contentEditable}">
 								<c:choose>
 									<c:when test="${notebookDTO.allowRichEditor}">
-
+										<c:set var="language"><lams:user property="localeLanguage"/></c:set>
 										<fck:editor id="entryText" 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"
-											toolbarSet="Default-Learner">
+											toolbarSet="Default-Learner" defaultLanguage="${language}" autoDetectLanguage="false">
 												${lrnForm.entryText}
 										</fck:editor>
 									</c:when>
Index: lams_tool_sbmt/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Attic/HTMLEditor.tag,v
diff -u -r1.4 -r1.5
Binary files differ
Index: lams_tool_vote/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/Attic/HTMLEditor.tag,v
diff -u -r1.2 -r1.3
--- lams_tool_vote/web/WEB-INF/tags/HTMLEditor.tag	29 Jun 2006 00:38:10 -0000	1.2
+++ lams_tool_vote/web/WEB-INF/tags/HTMLEditor.tag	17 Aug 2006 06:16:18 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/tags/Attic/HTMLEditor.tag,v
diff -u -r1.1 -r1.2
--- lams_www/web/WEB-INF/tags/HTMLEditor.tag	8 Aug 2006 02:33:42 -0000	1.1
+++ lams_www/web/WEB-INF/tags/HTMLEditor.tag	17 Aug 2006 06:16:19 -0000	1.2
@@ -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>