dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8444
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-10-09 12:25:36 +0700
message:
  translation.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/scheduling.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/scheduleSendMessage.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-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-10-08 16:00:32 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-10-09 05:25:36 +0000
@@ -122,7 +122,6 @@
 manage_relationship=Relationship management
 relationship_already_exists=Relationship already exists
 nr=No
-unenroll=Un-enroll
 enroll=Enroll
 date_of_incident=Date of incident
 date_of_enrollment=Date of enrollment

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/scheduling.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/scheduling.js	2012-09-25 09:12:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/scheduling.js	2012-10-09 05:25:36 +0000
@@ -6,12 +6,16 @@
 		gateWayId: getFieldValue("gatewayId"),
 		timeSendingMessage: getFieldValue("timeSendingMessage")
 	}, function( json ){
-		setMessage(i18n_scheduling_is + " " + json.scheduleTasks.status);
+		var status = json.scheduleTasks.status;
+		if( status=='not_started' ){
+			status = i18n_not_started;
+		}
+		setMessage(i18n_scheduling_is + " " + status);
 		if( json.scheduleTasks.running=="true" ){
-			setFieldValue('scheduledBtn', i18n_stop );
+			setFieldValue('scheduledBtn', i18n_stop);
 		}
 		else{
-			setFieldValue('scheduledBtn', i18n_start );
+			setFieldValue('scheduledBtn', i18n_start);
 		}
 	});
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/scheduleSendMessage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/scheduleSendMessage.vm	2012-09-28 06:26:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/scheduleSendMessage.vm	2012-10-09 05:25:36 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString('schedule_sending_message') #openHelp( "schedule_sending_message" )</h3>
+<h3>$i18n.getString('schedule_message') #openHelp( "schedule_sending_message" )</h3>
 <table>
 	<tbody>
 		<tr>
@@ -30,6 +30,7 @@
 	var i18n_scheduled = '$encoder.jsEscape( $i18n.getString( "run_success" ) , "'" )';
 	var i18n_start = '$encoder.jsEscape( $i18n.getString( "start" ) , "'" )';
 	var i18n_stop = '$encoder.jsEscape( $i18n.getString( "stop" ) , "'" )';
+	var i18n_not_started = '$encoder.jsEscape( $i18n.getString( "not_started" ) , "'" )';
 	var i18n_scheduling_is = '$encoder.jsEscape( $i18n.getString( "scheduling_is" ) , "'" )';
 	var i18n_execute_success = '$encoder.jsEscape( $i18n.getString( "execute_success" ) , "'" )';
 </script>
\ No newline at end of file