=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java 2012-09-06 03:50:03 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java 2012-09-20 03:11:15 +0000 @@ -328,11 +328,11 @@ // --------------------------------------------------------------------- grid.addRow(); - grid.addValue( i18n.getString( "date_of_enrollment" ) ); + grid.addValue( programInstance.getProgram().getDateOfEnrollmentDescription() ); grid.addValue( format.formatDate( programInstance.getEnrollmentDate() ) ); - + grid.addRow(); - grid.addValue( i18n.getString( "date_of_incident" ) ); + grid.addValue( programInstance.getProgram().getDateOfIncidentDescription() ); grid.addValue( format.formatDate( programInstance.getDateOfIncident() ) ); getProgramStageInstancesReport( grid, programInstance, format, i18n ); @@ -372,7 +372,7 @@ grid.addValue( format.formatDate( programStageInstance.getDueDate() ) ); grid.addRow(); - grid.addValue( i18n.getString( "report_date" ) ); + grid.addValue( programStageInstance.getProgramStage().getReportDateDescription() ); grid.addValue( executionDateValue ); // -----------------------------------------------------------------