Index: lams_central/conf/xdoclet/filter-mappings.xml
===================================================================
diff -u -r0badad92963e07de13c104187ca773f8d1abec70 -r05391c36b578d825a02985084cbdd948366ae182
--- lams_central/conf/xdoclet/filter-mappings.xml	(.../filter-mappings.xml)	(revision 0badad92963e07de13c104187ca773f8d1abec70)
+++ lams_central/conf/xdoclet/filter-mappings.xml	(.../filter-mappings.xml)	(revision 05391c36b578d825a02985084cbdd948366ae182)
@@ -7,4 +7,7 @@
     <filter-name>hibernateFilter</filter-name>
      <url-pattern>/*</url-pattern>
   </filter-mapping>
-  
\ No newline at end of file
+  <filter-mapping>
+    <filter-name>LocaleFilter</filter-name>
+     <url-pattern>/*</url-pattern>
+</filter-mapping>
\ No newline at end of file
Index: lams_central/conf/xdoclet/filters.xml
===================================================================
diff -u -r0badad92963e07de13c104187ca773f8d1abec70 -r05391c36b578d825a02985084cbdd948366ae182
--- lams_central/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 0badad92963e07de13c104187ca773f8d1abec70)
+++ lams_central/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 05391c36b578d825a02985084cbdd948366ae182)
@@ -15,5 +15,10 @@
 		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
-
+<filter>
+       <filter-name>LocaleFilter</filter-name>
+         <filter-class>
+		   org.lamsfoundation.lams.web.filter.LocaleFilter
+         </filter-class>
+</filter>
    
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/applicationResources.properties
===================================================================
diff -u -rb2e3349bac4f1f3fe1709ed1ea5280d42b1bcddd -r05391c36b578d825a02985084cbdd948366ae182
--- lams_central/src/java/org/lamsfoundation/lams/applicationResources.properties	(.../applicationResources.properties)	(revision b2e3349bac4f1f3fe1709ed1ea5280d42b1bcddd)
+++ lams_central/src/java/org/lamsfoundation/lams/applicationResources.properties	(.../applicationResources.properties)	(revision 05391c36b578d825a02985084cbdd948366ae182)
@@ -1,6 +1,8 @@
 # Resources for parameter 'org.lamsfoundation.lams.applicationResources'
 
-#=========================labels===========================#
+#====================================================================#
+#=========================Authoring labels===========================#
+#====================================================================#
 
 #=========================Error Messages===========================#
 error.authorisation=You are not authorised to do this. 
@@ -22,4 +24,9 @@
 flash.validation.error.OptionalActivity=An Optional Activity must have one or more activities
 flash.validation.error.OptionalActivityOrderId=This Optional Activity has invalid order ids
 
+#====================================================================#
+#=========================WorkingSpace labels===========================#
+#====================================================================#
+
+
  
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
===================================================================
diff -u -rec42ae8b1f67bc28e9a39b0b4ec4074f13cc633f -r05391c36b578d825a02985084cbdd948366ae182
--- lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	(.../authoringApplicationContext.xml)	(revision ec42ae8b1f67bc28e9a39b0b4ec4074f13cc633f)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	(.../authoringApplicationContext.xml)	(revision 05391c36b578d825a02985084cbdd948366ae182)
@@ -8,7 +8,16 @@
 	<!-- bean id="proxyCreator" class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator">
 	      <property name="proxyTargetClass"><value>true</value></property>     
 	</bean-->
-	
+		<!-- ========================= GENERAL DEFINITIONS ========================= -->
+		<bean id="authoringMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+		<property name="messageSource">
+			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+				<property name="basename">
+					<value>org.lamsfoundation.lams.applicationResources</value>
+				</property>
+			</bean>
+		</property>
+    	</bean>
 <!-- ========================= BUSINESS OBJECT DEFINITIONS ========================= -->
 	
 	<bean id="authoringServiceTarget" class="org.lamsfoundation.lams.authoring.service.AuthoringService">
@@ -24,6 +33,7 @@
 		<property name="licenseDAO"><ref bean="licenseDAO"/></property>
 		<property name="themeDAO"><ref bean="themeDAO"/></property>
 		<property name="contentIDGenerator"><ref bean="toolContentIDGenerator"/></property>
+		<property name="messageService"><ref bean="authoringMessageService"/></property>
 	</bean>
 	
 	<bean id="authoringService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
diff -u -ra0ef65af815f042f01af7135248a0c5d39f734fd -r05391c36b578d825a02985084cbdd948366ae182
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision a0ef65af815f042f01af7135248a0c5d39f734fd)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 05391c36b578d825a02985084cbdd948366ae182)
@@ -68,6 +68,7 @@
 import org.lamsfoundation.lams.usermanagement.exception.WorkspaceFolderException;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.wddx.FlashMessage;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
 
@@ -93,6 +94,7 @@
 	protected GroupingDAO groupingDAO;
 	protected GroupDAO groupDAO;
 	protected ICSSThemeDAO themeDAO;
+	protected MessageService messageService;
 	
 	protected ToolContentIDGenerator contentIDGenerator;
 	
@@ -103,8 +105,14 @@
 	/**********************************************
 	 * Setter Methods
 	 * *******************************************/
-	
 	/**
+	 * Set i18n MessageService
+	 */
+	public void setMessageService(MessageService messageService) {
+		this.messageService = messageService;
+	}
+
+	/**
 	 * @param groupDAO The groupDAO to set.
 	 */
 	public void setGroupDAO(GroupDAO groupDAO) {
Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
===================================================================
diff -u -r9aadeea7688da46cdc734a1402e5a44662aa5c91 -r05391c36b578d825a02985084cbdd948366ae182
--- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	(.../WorkspaceManagementService.java)	(revision 9aadeea7688da46cdc734a1402e5a44662aa5c91)
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	(.../WorkspaceManagementService.java)	(revision 05391c36b578d825a02985084cbdd948366ae182)
@@ -67,6 +67,7 @@
 import org.lamsfoundation.lams.usermanagement.exception.UserException;
 import org.lamsfoundation.lams.usermanagement.exception.WorkspaceFolderException;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.wddx.FlashMessage;
 import org.lamsfoundation.lams.workspace.WorkspaceFolderContent;
 import org.lamsfoundation.lams.workspace.dao.IWorkspaceFolderContentDAO;
@@ -102,9 +103,16 @@
 	protected IAuthoringService authoringService;
 	protected IRepositoryService repositoryService;
 	protected IUserManagementService userMgmtService;
+	protected MessageService messageService;
 	
-	
 	/**
+	 * i18n Message service
+	 * @param messageSource
+	 */
+	public void setMessageService(MessageService messageService) {
+		this.messageService = messageService;
+	}
+	/**
 	 * @param workspaceFolderContentDAO The workspaceFolderContentDAO to set.
 	 */
 	public void setWorkspaceFolderContentDAO(
Index: lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
===================================================================
diff -u -rd00c4b9e4b3273868783d3e9b950e494e3ed9b07 -r05391c36b578d825a02985084cbdd948366ae182
--- lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	(.../workspaceApplicationContext.xml)	(revision d00c4b9e4b3273868783d3e9b950e494e3ed9b07)
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	(.../workspaceApplicationContext.xml)	(revision 05391c36b578d825a02985084cbdd948366ae182)
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
+	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+	<bean id="workspaceMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+		<property name="messageSource">
+			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+				<property name="basename">
+					<value>org.lamsfoundation.lams.applicationResources</value>
+				</property>
+			</bean>
+		</property>
+    </bean>
 	
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ========================= -->	
 	<bean id="workspaceServiceTarget" class="org.lamsfoundation.lams.workspace.service.WorkspaceManagementService">
@@ -13,6 +23,7 @@
 		<property name="userOrganisationDAO"><ref bean="userOrganisationDAO"/></property>
 		<property name="workspaceFolderContentDAO"><ref bean="workspaceFolderContentDAO"/></property>
 		<property name="userMgmtService"><ref bean="userManagementService"/></property>
+		<property name="messageService"><ref bean="workspaceMessageService"/></property>
 	</bean>
 	
 	<bean id="workspaceManagementService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
Index: lams_learning/conf/xdoclet/filter-mappings.xml
===================================================================
diff -u -ra7ca2bcc80e18410b4044ab38b44f3ad69ff957e -r05391c36b578d825a02985084cbdd948366ae182
--- lams_learning/conf/xdoclet/filter-mappings.xml	(.../filter-mappings.xml)	(revision a7ca2bcc80e18410b4044ab38b44f3ad69ff957e)
+++ lams_learning/conf/xdoclet/filter-mappings.xml	(.../filter-mappings.xml)	(revision 05391c36b578d825a02985084cbdd948366ae182)
@@ -31,3 +31,8 @@
     <filter-name>SystemSessionFilter</filter-name>
      <url-pattern>/*</url-pattern>
 </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>LocaleFilter</filter-name>
+     <url-pattern>/*</url-pattern>
+</filter-mapping>
\ No newline at end of file
Index: lams_learning/conf/xdoclet/filters.xml
===================================================================
diff -u -ra7ca2bcc80e18410b4044ab38b44f3ad69ff957e -r05391c36b578d825a02985084cbdd948366ae182
--- lams_learning/conf/xdoclet/filters.xml	(.../filters.xml)	(revision a7ca2bcc80e18410b4044ab38b44f3ad69ff957e)
+++ lams_learning/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 05391c36b578d825a02985084cbdd948366ae182)
@@ -39,3 +39,9 @@
          </filter-class>
 </filter>
 
+<filter>
+       <filter-name>LocaleFilter</filter-name>
+         <filter-class>
+		   org.lamsfoundation.lams.web.filter.LocaleFilter
+         </filter-class>
+</filter>
\ No newline at end of file
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
===================================================================
diff -u -r29cf7c9f1421fde2bc6a38c5f56632b5acc11d70 -r05391c36b578d825a02985084cbdd948366ae182
--- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision 29cf7c9f1421fde2bc6a38c5f56632b5acc11d70)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision 05391c36b578d825a02985084cbdd948366ae182)
@@ -9,6 +9,15 @@
 <beans>
 
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+	<bean id="learningMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+		<property name="messageSource">
+			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+				<property name="basename">
+					<value>org.lamsfoundation.lams.learning.LearningResources</value>
+				</property>
+			</bean>
+		</property>
+    </bean>
 	
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="learnerServiceTarget" class="org.lamsfoundation.lams.learning.service.LearnerService" singleton="false">
@@ -23,6 +32,7 @@
 		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
 		<property name="activityMapping"><ref bean="activityMapping"/></property>
 		<property name="userManagementService"><ref bean="userManagementService"/></property>
+		<property name="messageService"><ref bean="learningMessageService"/></property>
 	</bean>
 	
 	<bean id="learnerService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
diff -u -rdddd4ed5ab9b4234f80c7e5a5186f75b3de008d8 -r05391c36b578d825a02985084cbdd948366ae182
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision dddd4ed5ab9b4234f80c7e5a5186f75b3de008d8)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 05391c36b578d825a02985084cbdd948366ae182)
@@ -44,13 +44,15 @@
 import org.lamsfoundation.lams.lesson.dao.ILearnerProgressDAO;
 import org.lamsfoundation.lams.lesson.dao.ILessonDAO;
 import org.lamsfoundation.lams.lesson.dto.LessonDTO;
+import org.lamsfoundation.lams.tool.ToolContentIDGenerator;
 import org.lamsfoundation.lams.tool.ToolSession;
 import org.lamsfoundation.lams.tool.dao.IToolSessionDAO;
 import org.lamsfoundation.lams.tool.exception.LamsToolServiceException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.MessageService;
 /**
  * This class is a facade over the Learning middle tier.
  * @author chris, Jacky Fang
@@ -71,6 +73,8 @@
     private ILamsCoreToolService lamsCoreToolService;
     private ActivityMapping activityMapping;
     private IUserManagementService userManagementService;
+    protected MessageService messageService;
+
     //---------------------------------------------------------------------
     // Inversion of Control Methods - Constructor injection
     //---------------------------------------------------------------------
@@ -83,6 +87,13 @@
     //---------------------------------------------------------------------
     // Inversion of Control Methods - Method injection
     //---------------------------------------------------------------------
+	/**
+	 * Set i18n MessageService
+	 */
+	public void setMessageService(MessageService messageService) {
+		this.messageService = messageService;
+	}
+
     /**
      * @param toolSessionDAO The toolSessionDAO to set.
      */