=== added file 'dhis-2/dhis-i18n/dhis-i18n-db/src/main/java/org/hisp/dhis/i18n/locale/DatabaseLocaleManager.java' --- dhis-2/dhis-i18n/dhis-i18n-db/src/main/java/org/hisp/dhis/i18n/locale/DatabaseLocaleManager.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-i18n/dhis-i18n-db/src/main/java/org/hisp/dhis/i18n/locale/DatabaseLocaleManager.java 2010-03-10 09:10:48 +0000 @@ -0,0 +1,133 @@ +package org.hisp.dhis.i18n.locale; + +/* + * Copyright (c) 2004-2007, 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.user.NoCurrentUserException; +import org.hisp.dhis.user.UserSettingService; + +/** + * @author Tran Thanh Tri + * @version $Id + */ +public class DatabaseLocaleManager + implements LocaleManager +{ + + private String userSettingKey; + + public void setUserSettingKey( String userSettingKey ) + { + this.userSettingKey = userSettingKey; + } + + private Locale defaultLocale; + + public void setDefaultLocale( Locale defaultLocale ) + { + this.defaultLocale = defaultLocale; + } + + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private UserSettingService userSettingService; + + public void setUserSettingService( UserSettingService userSettingService ) + { + this.userSettingService = userSettingService; + } + + // ------------------------------------------------------------------------- + // LocaleManager implementation + // ------------------------------------------------------------------------- + + @Override + public Locale getCurrentLocale() + { + Locale locale = getUserSelectedDBLocale(); + + if ( locale != null ) + { + return locale; + } + + if ( defaultLocale != null ) + { + return defaultLocale; + } + + return DHIS_STANDARD_LOCALE; + } + + @Override + public void setCurrentLocale( Locale locale ) + { + try + { + userSettingService.saveUserSetting( userSettingKey, locale ); + } + catch ( NoCurrentUserException e ) + { + // Just ignore for now. No change compared to previous behaviour. + } + } + + @Override + public List getLocalesOrderedByPriority() + { + List locales = new ArrayList(); + + Locale userLocale = getUserSelectedDBLocale(); + + if ( userLocale != null ) + { + locales.add( userLocale ); + } + + locales.add( DHIS_STANDARD_LOCALE ); + + return locales; + } + + @Override + public Locale getFallbackLocale() + { + return DHIS_STANDARD_LOCALE; + } + + private Locale getUserSelectedDBLocale() + { + return (Locale) userSettingService.getUserSetting( this.userSettingKey, null ); + } + +} === modified file 'dhis-2/dhis-i18n/dhis-i18n-db/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-i18n/dhis-i18n-db/src/main/resources/META-INF/dhis/beans.xml 2009-11-12 17:59:58 +0000 +++ dhis-2/dhis-i18n/dhis-i18n-db/src/main/resources/META-INF/dhis/beans.xml 2010-03-10 09:10:48 +0000 @@ -1,209 +1,204 @@ - - - - - - - - - - - name - shortName - description - - - - - - - - - name - - - - - - - - - name - - - - - - - - - - name - shortName - description - numeratorDescription - denominatorDescription - - - - - - - - - name - - - - - - - - - name - - - - - - - - - name - - - - - - - - - name - description - region - - - - - - - - - name - shortName - comment - - - - - - - - - name - - - - - - - - - name - description - - - - - - - - - name - - - - - - - - - name - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + currentLocaleDB + + + en_GB + + + + + + + + + + name + shortName + description + + + + + + + + + name + + + + + + + + + name + + + + + + + + + + name + shortName + description + numeratorDescription + denominatorDescription + + + + + + + + + name + + + + + + + + + name + + + + + + + + + name + + + + + + + + + name + description + region + + + + + + + + + name + shortName + comment + + + + + + + + + name + + + + + + + + + name + description + + + + + + + + + name + + + + + + + + + name + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +