=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/DefaultI18nService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/DefaultI18nService.java 2015-10-19 11:25:31 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/DefaultI18nService.java 2015-10-21 09:23:15 +0000 @@ -31,7 +31,6 @@ import org.hisp.dhis.common.IdentifiableObject; import org.hisp.dhis.common.NameableObject; import org.hisp.dhis.dataelement.DataElement; -import org.hisp.dhis.i18n.locale.LocaleManager; import org.hisp.dhis.translation.Translation; import org.hisp.dhis.translation.TranslationService; import org.hisp.dhis.user.UserSettingService; @@ -103,7 +102,7 @@ private void internationaliseObject( Object object, Locale locale ) { - if ( locale == null || object == null || locale.equals( LocaleManager.DEFAULT_LOCALE ) ) + if ( locale == null || object == null ) { return; } @@ -128,7 +127,7 @@ private void internationaliseCollection( Collection objects, Locale locale ) { - if ( locale == null || objects == null || locale.equals( LocaleManager.DEFAULT_LOCALE ) || objects.size() == 0 ) + if ( locale == null || objects == null || objects.size() == 0 ) { return; }