dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5130
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-11-09 14:51:55 +0700
message:
  Fixed bug translation after database setting changed.
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2011-11-03 01:02:13 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2011-11-09 07:51:55 +0000
@@ -321,17 +321,17 @@
 
     public Collection<DataElement> getDataElementsLikeName( String name )
     {
-        return dataElementStore.getDataElementsLikeName( name );
+        return i18n( i18nService, dataElementStore.getDataElementsLikeName( name ) );
     }
 
     public Collection<DataElement> getDataElementsBetween( int first, int max )
     {
-        return dataElementStore.getDataElementsBetween( first, max );
+        return i18n( i18nService, dataElementStore.getDataElementsBetween( first, max ) );
     }
 
     public Collection<DataElement> getDataElementsBetweenByName( String name, int first, int max )
     {
-        return dataElementStore.getDataElementsBetweenByName( name, first, max );
+        return i18n( i18nService, dataElementStore.getDataElementsBetweenByName( name, first, max ) );
     }
 
     public int getDataElementCount()

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java	2011-09-27 10:12:47 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java	2011-11-09 07:51:55 +0000
@@ -137,7 +137,6 @@
         return i18n( i18nService, dataSetStore.getDataSet( uuid ) );
     }
 
-
     public DataSet getDataSetByName( String name )
     {
         return i18n( i18nService, dataSetStore.getDataSetByName( name ) );
@@ -308,13 +307,12 @@
     @Override
     public Collection<DataSet> getDataSetsBetween( int first, int max )
     {
-        return dataSetStore.getDataSetsBetween( first, max );
+        return i18n( i18nService, dataSetStore.getDataSetsBetween( first, max ) );
     }
 
     @Override
     public Collection<DataSet> getDataSetsBetweenByName( String name, int first, int max )
     {
-        return dataSetStore.getDataSetsBetweenByName( name, first, max );
+        return i18n( i18nService, dataSetStore.getDataSetsBetweenByName( name, first, max ) );
     }
-
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java	2011-11-03 14:27:18 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java	2011-11-09 07:51:55 +0000
@@ -49,7 +49,6 @@
 import org.hisp.dhis.system.util.ConversionUtils;
 import org.hisp.dhis.system.util.Filter;
 import org.hisp.dhis.system.util.FilterUtils;
-import org.hisp.dhis.system.util.UUIdUtils;
 import org.hisp.dhis.user.CurrentUserService;
 import org.hisp.dhis.user.User;
 import org.hisp.dhis.version.VersionService;