Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
===================================================================
diff -u -r6e70e9319ec35ab4eb504553f371d875d995ced9 -r7b3c6594d546849021ab3797130fd7eb3a1b816a
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision 6e70e9319ec35ab4eb504553f371d875d995ced9)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision 7b3c6594d546849021ab3797130fd7eb3a1b816a)
@@ -76,6 +76,30 @@
             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 -->
   
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
===================================================================
diff -u -rcd6dafbd447f0b37e9006aa26743a08880b07869 -r7b3c6594d546849021ab3797130fd7eb3a1b816a
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	(.../Organisation.java)	(revision cd6dafbd447f0b37e9006aa26743a08880b07869)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	(.../Organisation.java)	(revision 7b3c6594d546849021ab3797130fd7eb3a1b816a)
@@ -70,6 +70,10 @@
     private Set lessons;
     
     private OrganisationState organisationState;
+
+	private String localeLanguage;
+
+	private String localeCountry;
     
     /** full constructor */
     public Organisation(String name, String description, Organisation parentOrganisation, Date createDate, Workspace workspace, OrganisationType organisationType, Set userOrganisations, Set childOrganisations, Set lessons) {
@@ -264,6 +268,34 @@
     }
 
     /** 
+     *            @hibernate.property
+     *             column="locale_language"
+     *             length="2"
+     *         
+     */
+    public String getLocaleLanguage() {
+        return this.localeLanguage;
+    }
+
+    public void setLocaleLanguage(String localeLanguage) {
+        this.localeLanguage = localeLanguage;
+    }
+
+    /** 
+     *            @hibernate.property
+     *             column="locale_country"
+     *             length="2"
+     *         
+     */
+    public String getLocaleCountry() {
+        return this.localeCountry;
+    }
+
+    public void setLocaleCountry(String localeCountry) {
+        this.localeCountry = localeCountry;
+    }
+
+    /** 
      *            @hibernate.many-to-one
      *             not-null="true"
      *            @hibernate.column name="organisation_state_id"