=== removed file 'dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/locale/SessionLocaleManager.java'
--- dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/locale/SessionLocaleManager.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/locale/SessionLocaleManager.java	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-package org.hisp.dhis.i18n.locale;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import org.hisp.dhis.i18n.util.LocaleUtils;
-
-/**
- * @author Oyvind Brucker
- */
-public class SessionLocaleManager
-    implements LocaleManager
-{
-    private Locale locale = null;
-
-    private String systemLocale;
-
-    public void setSystemLocale( String systemLocale )
-    {
-        this.systemLocale = systemLocale;
-    }
-
-    public Locale getCurrentLocale()
-    {
-        if ( locale == null )
-        {
-            return LocaleUtils.getLocale( systemLocale );
-        }
-
-        return locale;
-    }
-
-    public void setCurrentLocale( Locale locale )
-    {
-        this.locale = locale;
-    }
-
-    public List<Locale> getLocalesOrderedByPriority()
-    {
-        List<Locale> locales = new ArrayList<Locale>();
-
-        locales.add( LocaleUtils.getLocale( systemLocale ) );
-
-        if ( locale != null )
-        {
-            if ( !locale.equals( LocaleUtils.getLocale( systemLocale ) ) )
-            {
-                locales.add( locale );
-            }
-        }
-
-        return locales;
-    }
-
-    public Locale getFallbackLocale()
-    {
-        return LocaleUtils.getLocale( systemLocale );
-    }
-}

=== modified file 'dhis-2/dhis-support/dhis-support-i18n/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-support/dhis-support-i18n/src/main/resources/META-INF/dhis/beans.xml	2010-03-12 11:05:35 +0000
+++ dhis-2/dhis-support/dhis-support-i18n/src/main/resources/META-INF/dhis/beans.xml	2010-05-11 07:56:29 +0000
@@ -4,10 +4,6 @@
 	xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<bean id="org.hisp.dhis.i18n.locale.LocaleManagerDb" class="org.hisp.dhis.i18n.locale.SessionLocaleManager">
-		<property name="systemLocale" value="en_GB" />
-	</bean>
-<!--
 	<bean id="org.hisp.dhis.i18n.locale.LocaleManagerDb" class="org.hisp.dhis.i18n.locale.DatabaseLocaleManager">
 		<property name="userSettingService">
 			<ref bean="org.hisp.dhis.user.UserSettingService" />
@@ -19,7 +15,7 @@
 			<value>en_GB</value>
 		</property>
 	</bean>
--->
+
 	<!-- I18n object definitions -->
 
 	<bean id="I18nDataElement" class="org.hisp.dhis.i18n.I18nObject">