Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml,v
diff -u -r1.9 -r1.10
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	17 Jan 2006 06:33:33 -0000	1.9
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	14 Feb 2006 02:45:54 -0000	1.10
@@ -264,7 +264,32 @@
             not-null="true"
         </meta>    
     </property>
+    <property
+        name="localeLanguage"
+        type="java.lang.String"
+        column="locale_language"
+        length="2"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="locale_language"
+            length="2"
+        </meta>    
+    </property>
     
+    <property
+        name="localeCountry"
+        type="java.lang.String"
+        column="locale_country"
+        length="2"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="locale_country"
+            length="2"
+        </meta>    
+    </property>
+    
     <!-- Associations -->
   
     <!-- bi-directional many-to-one association to Workspace -->
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java,v
diff -u -r1.8 -r1.9
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	17 Jan 2006 06:36:32 -0000	1.8
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	14 Feb 2006 02:45:19 -0000	1.9
@@ -77,6 +77,11 @@
     private Boolean disabledFlag;
 
     /** persistent field */
+    private String localeLanguage;
+    /** persistent field */
+    private String localeCountry;
+    
+    /** persistent field */
     private Date createDate;
 
     /** persistent field */
@@ -639,6 +644,8 @@
     						this.firstName,
 							this.lastName,
 							this.login,
+							this.localeLanguage,
+							this.localeCountry,
 							this.email,
 							new CSSThemeBriefDTO(this.theme));
     }
@@ -668,5 +675,28 @@
 				return true;
 		}		
 		return false;
+	}
+
+	/**
+	 * @hibernate.property column="locale_country" length="2"
+	 * @param localeCountry
+	 */
+	public String getLocaleCountry() {
+		return localeCountry;
+	}
+
+	public void setLocaleCountry(String localeCountry) {
+		this.localeCountry = localeCountry;
+	}
+	/**
+	 * @hibernate.property column="locale_language" length="2"
+	 * @param localeCountry
+	 */
+	public String getLocaleLanguage() {
+		return localeLanguage;
+	}
+
+	public void setLocaleLanguage(String localeLanguage) {
+		this.localeLanguage = localeLanguage;
 	}	
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java,v
diff -u -r1.5 -r1.6
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	17 Jan 2006 06:37:03 -0000	1.5
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	14 Feb 2006 02:45:19 -0000	1.6
@@ -22,7 +22,6 @@
  */
 package org.lamsfoundation.lams.usermanagement.dto;
 
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
 import org.lamsfoundation.lams.themes.dto.CSSThemeBriefDTO;
 /**
  * @author Manpreet Minhas
@@ -33,6 +32,8 @@
 	private String firstName;
 	private String lastName;
 	private String login;
+	private String localeLanguage;
+	private String localeCountry;
     private String email;
    // private CSSThemeVisualElement theme;
     private CSSThemeBriefDTO theme;
@@ -49,11 +50,14 @@
 //	}
 	
 	public UserDTO(Integer userID, String firstName, String lastName,
-			String login, String email, CSSThemeBriefDTO theme) {		
+			String login, String localeLanguage, 
+			String localeCountry, String email, CSSThemeBriefDTO theme) {		
 		this.userID = userID;
 		this.firstName = firstName;
 		this.lastName = lastName;
 		this.login = login;
+		this.localeCountry = localeCountry;
+		this.localeLanguage = localeLanguage;
 		this.email = email;
 		this.theme = theme;
 	}
@@ -93,6 +97,21 @@
 	public void setTheme(CSSThemeBriefDTO theme) {
 		this.theme = theme;
 	}
+
+
+	public String getEmail() {
+		return email;
+	}
+
+
+	public String getLocaleCountry() {
+		return localeCountry;
+	}
+
+
+	public String getLocaleLanguage() {
+		return localeLanguage;
+	}
 	
 //	public CSSThemeVisualElement getTheme() {
 //		return theme;