dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12727
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-10-16 15:45:47 +0200
message:
  remove duplicate i18n decls
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.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-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm	2013-10-16 07:40:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm	2013-10-16 13:45:47 +0000
@@ -338,8 +338,7 @@
 	var i18n_orgunit_name = '$encoder.jsEscape( $i18n.getString( "orgunit_name" ) , "'")';   
 	var i18n_enrollment_date = '$encoder.jsEscape( $i18n.getString( "enrollement_date" ) , "'")';   
 	var i18n_days_since_enrollment_date = '$encoder.jsEscape( $i18n.getString( "days_since_enrollment_date" ) , "'")';   
-	var i18n_message = '$encoder.jsEscape( $i18n.getString( "message" ) , "'")';   
-	var i18n_name_exists = '$encoder.jsEscape( $i18n.getString( "name_exists" ) , "'")';   
+	var i18n_name_exists = '$encoder.jsEscape( $i18n.getString( "name_exists" ) , "'")';
 	var i18n_date_to_compare = '$encoder.jsEscape( $i18n.getString( "date_to_compare" ) , "'")'; 
 	var i18n_recipients = '$encoder.jsEscape( $i18n.getString( "recipients" ) , "'")'; 
 	var i18n_patient_sms_only = '$encoder.jsEscape( $i18n.getString( "patient_sms_only" ) , "'")'; 
@@ -352,14 +351,13 @@
 	var i18n_program_enrollment = '$encoder.jsEscape( $i18n.getString( "program_enrollment" ) , "'")';
 	var i18n_user_group = '$encoder.jsEscape( $i18n.getString( "user_group" ) , "'")';
 	var i18n_characters_without_params = '$encoder.jsEscape( $i18n.getString( "characters_without_params" ) , "'")';
-	var i18n_send_message = '$encoder.jsEscape( $i18n.getString( "send_message" ) , "'")';
 	var i18n_days = '$encoder.jsEscape( $i18n.getString( "days" ) , "'")';
-	var i18n_send_message = '$encoder.jsEscape( $i18n.getString( "send_message" ) , "'")';
 	var i18n_before = '$encoder.jsEscape( $i18n.getString( "before" ) , "'")';
 	var i18n_after = '$encoder.jsEscape( $i18n.getString( "after" ) , "'")';
 	var i18n_scheduled_date = '$encoder.jsEscape( $i18n.getString( "scheduled_date" ) , "'")';
 	var i18n_message_type = '$encoder.jsEscape( $i18n.getString( "message_type" ) , "'")';
 	var i18n_direct_sms = '$encoder.jsEscape( $i18n.getString( "direct_sms" ) , "'")';
 	var i18n_message = '$encoder.jsEscape( $i18n.getString( "message" ) , "'")';
+    var i18n_send_message = '$encoder.jsEscape( $i18n.getString( "send_message" ) , "'")';
 	var i18n_both = '$encoder.jsEscape( $i18n.getString( "both" ) , "'")';
 </script>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm	2013-10-10 03:11:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm	2013-10-16 13:45:47 +0000
@@ -473,8 +473,7 @@
 	var i18n_orgunit_name = '$encoder.jsEscape( $i18n.getString( "orgunit_name" ) , "'")';   
 	var i18n_enrollment_date = '$encoder.jsEscape( $i18n.getString( "enrollement_date" ) , "'")';   
 	var i18n_days_since_enrollment_date = '$encoder.jsEscape( $i18n.getString( "days_since_enrollment_date" ) , "'")';   
-	var i18n_message = '$encoder.jsEscape( $i18n.getString( "message" ) , "'")';   
-	var i18n_name_exists = '$encoder.jsEscape( $i18n.getString( "name_exists" ) , "'")';   
+	var i18n_name_exists = '$encoder.jsEscape( $i18n.getString( "name_exists" ) , "'")';
 	var i18n_date_to_compare = '$encoder.jsEscape( $i18n.getString( "date_to_compare" ) , "'")'; 
 	var i18n_recipients = '$encoder.jsEscape( $i18n.getString( "recipients" ) , "'")'; 
 	var i18n_patient_sms_only = '$encoder.jsEscape( $i18n.getString( "patient_sms_only" ) , "'")'; 
@@ -487,15 +486,15 @@
 	var i18n_program_enrollment = '$encoder.jsEscape( $i18n.getString( "program_enrollment" ) , "'")';
 	var i18n_complete_program_stage = '$encoder.jsEscape( $i18n.getString( "complete_program_stage" ) , "'")';
 	var i18n_user_group = '$encoder.jsEscape( $i18n.getString( "user_group" ) , "'")';
-	var i18n_send_message = '$encoder.jsEscape( $i18n.getString( "send_message" ) , "'")';
 	var i18n_days = '$encoder.jsEscape( $i18n.getString( "days" ) , "'")';
-	var i18n_before = '$encoder.jsEscape( $i18n.getString( "before" ) , "'")';
-	var i18n_after = '$encoder.jsEscape( $i18n.getString( "after" ) , "'")';
-	var i18n_scheduled_date = '$encoder.jsEscape( $i18n.getString( "scheduled_date" ) , "'")';
-	var i18n_message_type = '$encoder.jsEscape( $i18n.getString( "message_type" ) , "'")';
-	var i18n_direct_sms = '$encoder.jsEscape( $i18n.getString( "direct_sms" ) , "'")';
-	var i18n_message = '$encoder.jsEscape( $i18n.getString( "message" ) , "'")';
+    var i18n_before = '$encoder.jsEscape( $i18n.getString( "before" ) , "'")';
+    var i18n_after = '$encoder.jsEscape( $i18n.getString( "after" ) , "'")';
+    var i18n_scheduled_date = '$encoder.jsEscape( $i18n.getString( "scheduled_date" ) , "'")';
+    var i18n_message_type = '$encoder.jsEscape( $i18n.getString( "message_type" ) , "'")';
+    var i18n_direct_sms = '$encoder.jsEscape( $i18n.getString( "direct_sms" ) , "'")';
+    var i18n_send_message = '$encoder.jsEscape( $i18n.getString( "send_message" ) , "'")';
+    var i18n_message = '$encoder.jsEscape( $i18n.getString( "message" ) , "'")';
 	var i18n_both = '$encoder.jsEscape( $i18n.getString( "both" ) , "'")';
-	
+
 	programOnChange();
 </script>