Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml
===================================================================
diff -u -r570bcc3eaf789d638c08cb96e0fec3e4a9ba6167 -r6a5cc0e13ccef6c57ea650bfa9c2e68f5dbe8ab1
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml	(.../SupportedLocale.hbm.xml)	(revision 570bcc3eaf789d638c08cb96e0fec3e4a9ba6167)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml	(.../SupportedLocale.hbm.xml)	(revision 6a5cc0e13ccef6c57ea650bfa9c2e68f5dbe8ab1)
@@ -69,6 +69,17 @@
             not-null="false"
             unique="false"
         />
+        
+        <property
+            name="fckLanguageMapping"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="fckeditor_code"
+            length="3"
+            not-null="false"
+            unique="false"
+        />
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-SupportedLocale.xml
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/SupportedLocale.java
===================================================================
diff -u -r570bcc3eaf789d638c08cb96e0fec3e4a9ba6167 -r6a5cc0e13ccef6c57ea650bfa9c2e68f5dbe8ab1
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/SupportedLocale.java	(.../SupportedLocale.java)	(revision 570bcc3eaf789d638c08cb96e0fec3e4a9ba6167)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/SupportedLocale.java	(.../SupportedLocale.java)	(revision 6a5cc0e13ccef6c57ea650bfa9c2e68f5dbe8ab1)
@@ -31,13 +31,17 @@
 
     /** persistent field */
     private String direction;
+    
+    /** persistent field */
+    private String fckLanguageMapping;
 
     /** full constructor */
-    public SupportedLocale(String languageIsoCode, String countryIsoCode, String description, String direction) {
+    public SupportedLocale(String languageIsoCode, String countryIsoCode, String description, String direction, String fckLanguageMapping) {
         this.languageIsoCode = languageIsoCode;
         this.countryIsoCode = countryIsoCode;
         this.description = description;
         this.direction = direction;
+        this.fckLanguageMapping = fckLanguageMapping;
     }
 
     /** default constructor */
@@ -131,6 +135,7 @@
 	            .append("countryIsoCode", getCountryIsoCode())
 	            .append("description", getDescription())
 	            .append("direction", getDirection())
+	            .append("fckLanguageMapping", getFckLanguageMapping())
 	            .toString();
 	}
 
@@ -139,5 +144,13 @@
 		return description.compareTo(locale.getDescription());
 	}
 
+	public String getFckLanguageMapping() {
+		return fckLanguageMapping;
+	}
 
+	public void setFckLanguageMapping(String fckLanguageMapping) {
+		this.fckLanguageMapping = fckLanguageMapping;
+	}
+
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
diff -u -rab495e46efd059acbc6386c3d05a9b2fc7ff6dff -r6a5cc0e13ccef6c57ea650bfa9c2e68f5dbe8ab1
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision ab495e46efd059acbc6386c3d05a9b2fc7ff6dff)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 6a5cc0e13ccef6c57ea650bfa9c2e68f5dbe8ab1)
@@ -702,15 +702,19 @@
     	String languageIsoCode = null;
     	String countryIsoCode = null;
     	String direction = null;
+    	String fckLanguageMapping = null;
     	if (locale != null) {
     		languageIsoCode = locale.getLanguageIsoCode();
     		countryIsoCode = locale.getCountryIsoCode();
     		direction = locale.getDirection();
+    		fckLanguageMapping = locale.getFckLanguageMapping();
+    	
     	} else {
     		String defaults[] = LanguageUtil.getDefaultLangCountry();
     		languageIsoCode = defaults[0];
     		countryIsoCode=defaults[1];
     		direction=LanguageUtil.getDefaultDirection();
+    		fckLanguageMapping = LanguageUtil.getSupportedLocale(languageIsoCode, countryIsoCode).getFckLanguageMapping();
     	}
     	
     	return new UserDTO(this.userId,
@@ -725,7 +729,8 @@
 							new CSSThemeBriefDTO(this.htmlTheme),
 							//TimeZone.getTimeZone("Australia/Sydney"),
 							TimeZone.getDefault(),
-							this.authenticationMethod.getAuthenticationMethodId());
+							this.authenticationMethod.getAuthenticationMethodId(),
+							fckLanguageMapping);
     }
 	
     public UserFlashDTO getUserFlashDTO() {
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
===================================================================
diff -u -rab495e46efd059acbc6386c3d05a9b2fc7ff6dff -r6a5cc0e13ccef6c57ea650bfa9c2e68f5dbe8ab1
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(.../UserDTO.java)	(revision ab495e46efd059acbc6386c3d05a9b2fc7ff6dff)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(.../UserDTO.java)	(revision 6a5cc0e13ccef6c57ea650bfa9c2e68f5dbe8ab1)
@@ -38,6 +38,7 @@
 	private String login;
 	private String localeLanguage;
 	private String localeCountry;
+	private String fckLanguageMapping;
 	private String direction;
     private String email;
    // private CSSThemeVisualElement theme;
@@ -59,7 +60,7 @@
 	public UserDTO(Integer userID, String firstName, String lastName,
 			String login, String localeLanguage,  String localeCountry, String direction, 
 			String email, CSSThemeBriefDTO flashTheme, CSSThemeBriefDTO htmlTheme,
-			TimeZone timezone, Integer authenticationMethodId) {		
+			TimeZone timezone, Integer authenticationMethodId, String fckLanguageMapping) {		
 		this.userID = userID;
 		this.firstName = firstName;
 		this.lastName = lastName;
@@ -72,6 +73,7 @@
 		this.htmlTheme = htmlTheme;
 		this.timeZone = timezone;
 		this.authenticationMethodId = authenticationMethodId;
+		this.fckLanguageMapping = fckLanguageMapping;
 	}
 	
 	/**
@@ -180,9 +182,15 @@
 			.append("htmlTheme", getHtmlTheme())
 			.append("timeZone", getTimeZone())
 			.append("authenticationMethodId", getAuthenticationMethodId())
+			.append("fckLanguageMapping", getFckLanguageMapping())
 			.toString();
 	}
 
+	public String getFckLanguageMapping() {
+		return fckLanguageMapping;
+	}
+
+
 //	public CSSThemeVisualElement getTheme() {
 //		return theme;
 //	}