dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16271
committer: Tran Chau<tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-07-29 19:54:22 +0700
message:
  Add translation functionality for OrganisationUnit object.
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm


--
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/organisationunit/DefaultOrganisationUnitService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java	2014-06-23 11:10:21 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java	2014-07-29 12:54:22 +0000
@@ -167,30 +167,30 @@
 
     public OrganisationUnit getOrganisationUnit( int id )
     {
-        return organisationUnitStore.get( id );
+        return i18n( i18nService, organisationUnitStore.get( id ) );
     }
 
     public Collection<OrganisationUnit> getAllOrganisationUnits()
     {
-        return organisationUnitStore.getAll();
+        return i18n( i18nService, organisationUnitStore.getAll() );
     }
 
     @Override
     public Collection<OrganisationUnit> getAllOrganisationUnitsByStatus( boolean status )
     {
-        return organisationUnitStore.getAllOrganisationUnitsByStatus( status );
+        return i18n( i18nService, organisationUnitStore.getAllOrganisationUnitsByStatus( status ) );
     }
 
     @Override
     public Collection<OrganisationUnit> getAllOrganisationUnitsByLastUpdated( Date lastUpdated )
     {
-        return organisationUnitStore.getAllOrganisationUnitsByLastUpdated( lastUpdated );
+        return i18n( i18nService,  organisationUnitStore.getAllOrganisationUnitsByLastUpdated( lastUpdated ) );
     }
 
     @Override
     public Collection<OrganisationUnit> getAllOrganisationUnitsByStatusLastUpdated( boolean status, Date lastUpdated )
     {
-        return organisationUnitStore.getAllOrganisationUnitsByStatusLastUpdated( status, lastUpdated );
+        return i18n( i18nService, organisationUnitStore.getAllOrganisationUnitsByStatusLastUpdated( status, lastUpdated ) );
     }
 
     public void searchOrganisationUnitByName( List<OrganisationUnit> orgUnits, String key )
@@ -221,27 +221,27 @@
 
     public List<OrganisationUnit> getOrganisationUnitsByUid( Collection<String> uids )
     {
-        return organisationUnitStore.getByUid( uids );
+        return new ArrayList<OrganisationUnit>( i18n( i18nService, organisationUnitStore.getByUid( uids ) ) );
     }
 
     public OrganisationUnit getOrganisationUnit( String uid )
     {
-        return organisationUnitStore.getByUid( uid );
+        return i18n( i18nService, organisationUnitStore.getByUid( uid ) );
     }
 
     public OrganisationUnit getOrganisationUnitByUuid( String uuid )
     {
-        return organisationUnitStore.getByUuid( uuid );
+        return i18n( i18nService, organisationUnitStore.getByUuid( uuid ) );
     }
 
     public List<OrganisationUnit> getOrganisationUnitByName( String name )
     {
-        return organisationUnitStore.getAllEqName( name );
+        return new ArrayList<OrganisationUnit>( i18n( i18nService, organisationUnitStore.getAllEqName( name ) ) );
     }
 
     public OrganisationUnit getOrganisationUnitByCode( String code )
     {
-        return organisationUnitStore.getByCode( code );
+        return i18n( i18nService, organisationUnitStore.getByCode( code ) );
     }
 
     public Collection<OrganisationUnit> getOrganisationUnitByNameIgnoreCase( String name )
@@ -251,7 +251,7 @@
 
     public Collection<OrganisationUnit> getRootOrganisationUnits()
     {
-        return organisationUnitStore.getRootOrganisationUnits();
+        return i18n( i18nService, organisationUnitStore.getRootOrganisationUnits());
     }
 
     public int getLevelOfOrganisationUnit( int id )
@@ -518,13 +518,13 @@
 
     public Collection<OrganisationUnit> getOrganisationUnitsWithoutGroups()
     {
-        return organisationUnitStore.getOrganisationUnitsWithoutGroups();
+        return i18n( i18nService, organisationUnitStore.getOrganisationUnitsWithoutGroups() );
     }
 
     public Collection<OrganisationUnit> getOrganisationUnitsByNameAndGroups( String query,
         Collection<OrganisationUnitGroup> groups, boolean limit )
     {
-        return organisationUnitStore.getOrganisationUnitsByNameAndGroups( query, groups, limit );
+        return i18n( i18nService, organisationUnitStore.getOrganisationUnitsByNameAndGroups( query, groups, limit ) );
     }
 
     @SuppressWarnings("unchecked")
@@ -638,31 +638,31 @@
 
     public Collection<OrganisationUnit> getOrganisationUnitsBetween( int first, int max )
     {
-        return organisationUnitStore.getAllOrderedName( first, max );
+        return i18n( i18nService,  organisationUnitStore.getAllOrderedName( first, max ) );
     }
 
     public Collection<OrganisationUnit> getOrganisationUnitsBetweenByName( String name, int first, int max )
     {
-        return organisationUnitStore.getAllLikeNameOrderedName( name, first, max );
+        return i18n( i18nService, organisationUnitStore.getAllLikeNameOrderedName( name, first, max ) );
     }
 
     @Override
     public Collection<OrganisationUnit> getOrganisationUnitsBetweenByStatus( boolean status, int first, int max )
     {
-        return organisationUnitStore.getBetweenByStatus( status, first, max );
+        return i18n( i18nService, organisationUnitStore.getBetweenByStatus( status, first, max ) );
     }
 
     @Override
     public Collection<OrganisationUnit> getOrganisationUnitsBetweenByLastUpdated( Date lastUpdated, int first, int max )
     {
-        return organisationUnitStore.getBetweenByLastUpdated( lastUpdated, first, max );
+        return i18n( i18nService, organisationUnitStore.getBetweenByLastUpdated( lastUpdated, first, max ) );
     }
 
     @Override
     public Collection<OrganisationUnit> getOrganisationUnitsBetweenByStatusLastUpdated( boolean status,
         Date lastUpdated, int first, int max )
     {
-        return organisationUnitStore.getBetweenByStatusLastUpdated( status, lastUpdated, first, max );
+        return i18n( i18nService, organisationUnitStore.getBetweenByStatusLastUpdated( status, lastUpdated, first, max ));
     }
 
     @Override

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm	2014-06-13 08:01:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm	2014-07-29 12:54:22 +0000
@@ -19,7 +19,8 @@
 <div id="contextMenu" class="contextMenu">
   <ul id="contextMenuItems" class="contextMenuItems">
     <li><a data-target-fn="showUpdateOrganisationUnitForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>
-    <li data-enabled="canDelete"><a data-target-fn="removeOrganisationUnit"><i class="fa fa-trash-o"></i>&nbsp;&nbsp;$i18n.getString( "remove" )</a></li>
+    <li data-enabled="canUpdate"><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i>&nbsp;&nbsp;$i18n.getString( "translation_translate" )</a></li>
+	<li data-enabled="canDelete"><a data-target-fn="removeOrganisationUnit"><i class="fa fa-trash-o"></i>&nbsp;&nbsp;$i18n.getString( "remove" )</a></li>
     <li><a data-target-fn="showOrganisationUnitDetails"><i class="fa fa-info-circle"></i>&nbsp;&nbsp;$i18n.getString( "show_details" )</a></li>
   </ul>
 </div>