← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8454: Translations

 

------------------------------------------------------------
revno: 8454
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-10-10 09:23:29 +0700
message:
  Translations
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js


--
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-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-10-09 10:03:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-10-10 02:23:29 +0000
@@ -113,7 +113,6 @@
 intro_validation_criteria=Create, modify and view validation criteria. A criteria is used for validation of person data.
 intro_schedule_message=Scheduled automatic messages to be sent in order to notify persons about upcoming or overdue visits.
 intro_program_attribute=Create, modify and view program attributes. A program can have any number of attributes.
-intro_import_data=Import information of patients automatically from an Excel template file into the person database.
 intro_configuration=Set the Excel XML template file used for automatically importing person data.
 inheritable=Inheritable
 patient_attribute_details=Person attribute details
@@ -279,7 +278,7 @@
 orgunit_name = Organisation unit name
 days_since_due_date = Days since due date
 scheduling = Scheduling
-schedule_message = Schedule message
+schedule_message = Message
 schedule = Schedule
 start = Start
 stop = Stop

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js	2012-10-09 10:03:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js	2012-10-10 02:23:29 +0000
@@ -71,9 +71,9 @@
 			var index = eval(i) + 1;
 			templateMessage += "<p class='bold'>" + i18n_template_reminder_message + " " + index + "</p>";
 			templateMessage += "<p class='bold'>" + i18n_days_before_after_due_date + ":</p>" ;
+			templateMessage	+= "<p>" + json.programStage.patientReminders[i].daysAllowedSendMessage + "</p>";
+			templateMessage	+= "<p class='bold'>" + i18n_message + ":</p>";
 			templateMessage	+= "<p>" + json.programStage.patientReminders[i].templateMessage + "</p>";
-			templateMessage	+= "<p class='bold'>" + i18n_message + ":</p>";
-			templateMessage	+= "<p>" + json.programStage.patientReminders[i].daysAllowedSendMessage + "</p>";
 		}
 		setInnerHTML('templateMessageField', templateMessage);