Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/HelpTag.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/tag/HelpTag.java,v
diff -u -r1.6 -r1.7
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/HelpTag.java	27 Oct 2006 06:47:47 -0000	1.6
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/HelpTag.java	7 Nov 2006 06:19:06 -0000	1.7
@@ -100,7 +100,12 @@
 				    
 				    fullURL = helpURL + module + "#" + toolSignature + module + "-" + language + country;
 					
-				    writer.println("<img src=\"" + Configuration.get(ConfigurationKeys.SERVER_URL) + "images/help.png\" border=\"0\" width=\"18\" height=\"18\" onclick=\"window.open('" + fullURL + "', 'help')\"/>");
+					// TODO Added to debug Chinese problem. To be removed.
+					if ( log.isDebugEnabled() ) {
+						log.debug("In help tag, url is "+fullURL);
+					}
+
+					writer.println("<img src=\"" + Configuration.get(ConfigurationKeys.SERVER_URL) + "images/help.png\" border=\"0\" width=\"18\" height=\"18\" onclick=\"window.open('" + fullURL + "', 'help')\"/>");
 				   
 	        	} else if(page != null){
 	        		writer.println("<img src=\"" + Configuration.get(ConfigurationKeys.SERVER_URL) + "images/help.png\" border=\"0\" width=\"18\" height=\"18\" onclick=\"window.open('" + Configuration.get(ConfigurationKeys.HELP_URL) + page + "', 'help')\"/>");
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java,v
diff -u -r1.13 -r1.14
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	7 Nov 2006 04:59:03 -0000	1.13
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	7 Nov 2006 06:21:34 -0000	1.14
@@ -483,6 +483,14 @@
 	private void internationaliseActivities(Collection activities) {		
 		Iterator iter = activities.iterator();
 		Locale locale = LocaleContextHolder.getLocale();
+		
+		if ( log.isDebugEnabled()) {
+			if ( locale != null )
+				log.debug("internationaliseActivities: Locale has lang/country "+locale.getLanguage()+","+locale.getCountry());
+			else 
+				log.debug("internationaliseActivities: Locale missing.");
+		}
+		
 		while (iter.hasNext()) {
 			LibraryActivityDTO activity = (LibraryActivityDTO) iter.next();
 			// update the activity fields
@@ -515,4 +523,4 @@
 			}
 		}
 	}
-}
+}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java,v
diff -u -r1.19 -r1.20
--- lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java	11 Oct 2006 05:36:33 -0000	1.19
+++ lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java	7 Nov 2006 06:21:34 -0000	1.20
@@ -35,6 +35,7 @@
 import javax.servlet.jsp.jstl.core.Config;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.LanguageUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -53,6 +54,8 @@
  * @version $Revision$
  */
 public class LocaleFilter extends OncePerRequestFilter {
+	
+	private static Logger log = Logger.getLogger(LocaleFilter.class);
 	private String encoding;
 	
 	public static final String PREFERRED_LOCALE_KEY = "org.apache.struts.action.LOCALE";
@@ -98,6 +101,12 @@
 					// so we may end up with some confusing situations.
 					if(!StringUtils.isEmpty(lang)){
 						preferredLocale = new Locale(lang,country!=null?country:"");
+
+						// TODO Added to debug Chinese problem. To be removed.
+						if ( log.isDebugEnabled() ) {
+							log.debug("Locale set from user lang/country is "+lang+","+country);
+						}
+
 					}
 				}
 			}
@@ -107,7 +116,14 @@
 			String defaults[] = LanguageUtil.getDefaultLangCountry();
         	preferredLocale = new Locale(defaults[0]!=null?defaults[0]:"",
         								 defaults[1]!=null?defaults[1]:"");
-		} 
+        	
+			// TODO Added to debug Chinese problem. To be removed.
+			if ( log.isDebugEnabled() ) {
+				log.debug("Locale set from server is "+defaults[0]+","+defaults[1]);
+			}
+
+		}
+
 		if(direction == null){
 			direction = LanguageUtil.getDefaultDirection();
 		}