Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java,v
diff -u -r1.20 -r1.21
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	27 Mar 2006 22:15:17 -0000	1.20
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	28 Mar 2006 23:21:17 -0000	1.21
@@ -29,6 +29,7 @@
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.Vector;
@@ -537,16 +538,17 @@
 
 	private void internationaliseActivities(Collection activities) {		
 		Iterator iter = activities.iterator();
+		Locale locale = LocaleContextHolder.getLocale();
 		while (iter.hasNext()) {
 			LibraryActivityDTO activity = (LibraryActivityDTO) iter.next();
 			// update the activity fields
 			String languageFilename = activity.getLanguageFile();
 			if ( languageFilename  != null ) {
 				MessageSource toolMessageSource = toolActMessageService.getMessageService(languageFilename);
 				if ( toolMessageSource != null ) {
-					activity.setTitle(toolMessageSource.getMessage(Activity.I8N_TITLE,null,activity.getTitle(),LocaleContextHolder.getLocale()));
-					activity.setDescription(toolMessageSource.getMessage(Activity.I8N_DESCRIPTION,null,activity.getDescription(),LocaleContextHolder.getLocale()));
-					activity.setHelpText(toolMessageSource.getMessage(Activity.I8N_HELP_TEXT,null,activity.getHelpText(),LocaleContextHolder.getLocale()));
+					activity.setTitle(toolMessageSource.getMessage(Activity.I18N_TITLE,null,activity.getTitle(),locale));
+					activity.setDescription(toolMessageSource.getMessage(Activity.I18N_DESCRIPTION,null,activity.getDescription(),locale));
+					activity.setHelpText(toolMessageSource.getMessage(Activity.I18N_HELP_TEXT,null,activity.getHelpText(),locale));
 				} else {
 					log.warn("Unable to internationalise the library activity "+activity.getActivityID()+" "+activity.getTitle()
 							+" message file "+activity.getLanguageFile()+". Activity Message source not available");
@@ -556,7 +558,7 @@
 				languageFilename = activity.getToolLanguageFile();
 				toolMessageSource = toolActMessageService.getMessageService(languageFilename);
 				if ( toolMessageSource != null ) {
-					activity.setToolDisplayName(toolMessageSource.getMessage(Tool.I8N_DISPLAY_NAME,null,activity.getToolDisplayName(),LocaleContextHolder.getLocale()));
+					activity.setToolDisplayName(toolMessageSource.getMessage(Tool.I18N_DISPLAY_NAME,null,activity.getToolDisplayName(),locale));
 				} else {
 					log.warn("Unable to internationalise the library activity "+activity.getActivityID()+" "+activity.getTitle()
 							+" message file "+activity.getLanguageFile()+". Tool Message source not available");