dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #30547
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15508: Remove unused translation in UI ( tracker module )
------------------------------------------------------------
revno: 15508
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-06-02 10:07:05 +0800
message:
Remove unused translation in UI ( tracker module )
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramReminder.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageReminder.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attributeInListNoProgram.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attributeVisitSchedule.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramReminder.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageReminder.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-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties 2014-05-25 04:29:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties 2014-06-02 02:07:05 +0000
@@ -76,7 +76,6 @@
blood_group=Blood group
attribute_options=Attribute options
add_more_option=Add Option
-remove_option=Remove Option
mandatory=Mandatory
tracked_entity_attribute_group_management=Tracked entity attribute group management
move_selected=Move selected items
@@ -91,7 +90,6 @@
warning_delete_tracked_entity_attribute_option=This option has relationship with tracked entity attribute values
success_delete_tracked_entity_attribute_option=Deleted tracked entity attribute option successfully
error_delete_tracked_entity_attribute_option=Can not find tracked entity attribute option to delete
-at_least_2_option=Please add at least two attribute options
combo=Predefined value
related=Related
validation_criteria=Validation Criteria
@@ -495,4 +493,6 @@
whole_system = Whole system
orgunit = Organisation unit
program_within_orgunit = Program within organisation unit
-auto_save_registration_forms = Auto save registration form
\ No newline at end of file
+auto_save_registration_forms = Auto save registration form
+show_advanced_options = Show advanced options
+hide_advanced_options = Hide advanced options
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeForm.vm 2014-05-30 08:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeForm.vm 2014-06-02 02:07:05 +0000
@@ -103,10 +103,5 @@
</form>
<script type="text/javascript">
- var i18n_remove_option = '$encoder.jsEscape( $i18n.getString( "remove_option" ) , "'") ';
- var i18n_field_is_required = '$encoder.jsEscape( $i18n.getString( "field_is_required" ) , "'") ';
- var i18n_current_date = '$encoder.jsEscape( $i18n.getString( "current_date" ) , "'") ';
- var i18n_incident_date = '$encoder.jsEscape( $i18n.getString( "incident_date" ) , "'") ';
- var i18n_enrollment_date = '$encoder.jsEscape( $i18n.getString( "enrollment_date" ) , "'") ';
var isSubmit = true;
</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeGroupForm.vm 2014-04-26 12:14:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeGroupForm.vm 2014-06-02 02:07:05 +0000
@@ -63,6 +63,3 @@
</form>
-<script>
- var i18n_remove_option = '$encoder.jsEscape( $i18n.getString( "remove_option" ) , "'") ';
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm 2014-05-30 08:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm 2014-06-02 02:07:05 +0000
@@ -46,8 +46,11 @@
});
checkValueIsExist( "name", "validateProgram.action" );
+ jQuery('[name=nonAnonymous]').hide();
+ jQuery('[name=advanced]').hide();
});
-
+ var i18n_hide_advanced_options = '$encoder.jsEscape( $i18n.getString( "hide_advanced_options" ) , "'") ';
+
</script>
<h3>$i18n.getString( "create_new_program" ) #openHelp( "program_information" )</h3>
@@ -86,17 +89,6 @@
<td></td>
</tr>
- <tr>
- <td><label for="dataEntryMethod">$i18n.getString( "data_entry_method_for_option_sets" ) </label></td>
- <td>
- <select id='dataEntryMethod' name='dataEntryMethod' style="width: 335px;">
- <option value='false' selected>$i18n.getString('drop_down_lists')</option>
- <option value='true'>$i18n.getString('radio_buttons')</option>
- </select>
- </td>
- <td></td>
- </tr>
-
<tr name='nonAnonymous'>
<td><label for="trackedEntityId">$i18n.getString( "tracked_entity" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
@@ -109,7 +101,18 @@
</td>
<td></td>
</tr>
-
+
+ <tr name='advanced'>
+ <td><label for="dataEntryMethod">$i18n.getString( "data_entry_method_for_option_sets" ) </label></td>
+ <td>
+ <select id='dataEntryMethod' name='dataEntryMethod' style="width: 335px;">
+ <option value='false' selected>$i18n.getString('drop_down_lists')</option>
+ <option value='true'>$i18n.getString('radio_buttons')</option>
+ </select>
+ </td>
+ <td></td>
+ </tr>
+
<tr name='nonAnonymous'>
<th colspan="2" style="width: 590px;">$i18n.getString( "enrollment_details" )</th>
</tr>
@@ -276,6 +279,8 @@
</tr>
</table>
+<p><a href='advancedOptionToggle()' id='advancedOptionsLink'>$i18n.getString('show_advanced_options')<a></p>
+
<table>
<tr>
<td colspan='3'>
@@ -286,3 +291,6 @@
</table>
</form>
+<script>
+ var i18n_hide_advanced_options = '$encoder.jsEscape( $i18n.getString( "hide_advanced_options" ) , "'") ';
+</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramReminder.vm 2014-05-30 08:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramReminder.vm 2014-06-02 02:07:05 +0000
@@ -135,37 +135,6 @@
</form>
<script>
- var i18n_reminder = '$encoder.jsEscape( $i18n.getString( "reminder" ) , "'")';
- var i18n_remove_reminder = '$encoder.jsEscape( $i18n.getString( "remove_reminder" ) , "'")';
- var i18n_days_before_after_comparison_date = '$encoder.jsEscape( $i18n.getString( "days_before_after_comparison_date" ) , "'")';
- var i18n_params = '$encoder.jsEscape( $i18n.getString( "params" ) , "'")';
- var i18n_program_name = '$encoder.jsEscape( $i18n.getString( "program_name" ) , "'")';
- var i18n_incident_date = '$encoder.jsEscape( $i18n.getString( "incident_date" ) , "'")';
- var i18n_days_since_incident_date = '$encoder.jsEscape( $i18n.getString( "days_since_incident_date" ) , "'")';
- 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_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_tracked_entity_sms_only = '$encoder.jsEscape( $i18n.getString( "tracked_entity_sms_only" ) , "'")';
- var i18n_attribute_users = '$encoder.jsEscape( $i18n.getString( "attribute_users" ) , "'")';
- var i18n_orgunit_phone_number_sms_only = '$encoder.jsEscape( $i18n.getString( "orgunit_phone_number_sms_only" ) , "'")';
- var i18n_all_users_at_orgunit = '$encoder.jsEscape( $i18n.getString( "all_users_at_orgunit" ) , "'")';
- var i18n_send_when_to = '$encoder.jsEscape( $i18n.getString( "send_base_on" ) , "'")';
- var i18n_days_scheduled = '$encoder.jsEscape( $i18n.getString( "days_scheduled" ) , "'")';
- var i18n_complete_program = '$encoder.jsEscape( $i18n.getString( "complete_program" ) , "'")';
- 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_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_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-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageReminder.vm 2014-05-30 08:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageReminder.vm 2014-06-02 02:07:05 +0000
@@ -122,39 +122,8 @@
</tr>
</table>
</form>
-
+
<script>
- var i18n_reminder = '$encoder.jsEscape( $i18n.getString( "reminder" ) , "'")';
- var i18n_remove_reminder = '$encoder.jsEscape( $i18n.getString( "remove_reminder" ) , "'")';
- var i18n_days_before_after_comparison_date = '$encoder.jsEscape( $i18n.getString( "days_before_after_comparison_date" ) , "'")';
- var i18n_params = '$encoder.jsEscape( $i18n.getString( "params" ) , "'")';
- var i18n_program_name = '$encoder.jsEscape( $i18n.getString( "program_name" ) , "'")';
- var i18n_incident_date = '$encoder.jsEscape( $i18n.getString( "incident_date" ) , "'")';
- var i18n_days_since_incident_date = '$encoder.jsEscape( $i18n.getString( "days_since_incident_date" ) , "'")';
- 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_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_tracked_entity_sms_only = '$encoder.jsEscape( $i18n.getString( "tracked_entity_sms_only" ) , "'")';
- var i18n_attribute_users = '$encoder.jsEscape( $i18n.getString( "attribute_users" ) , "'")';
- var i18n_orgunit_phone_number_sms_only = '$encoder.jsEscape( $i18n.getString( "orgunit_phone_number_sms_only" ) , "'")';
- var i18n_all_users_at_orgunit = '$encoder.jsEscape( $i18n.getString( "all_users_at_orgunit" ) , "'")';
- var i18n_send_when_to = '$encoder.jsEscape( $i18n.getString( "send_base_on" ) , "'")';
- var i18n_days_scheduled = '$encoder.jsEscape( $i18n.getString( "days_scheduled" ) , "'")';
- var i18n_complete_program = '$encoder.jsEscape( $i18n.getString( "complete_program" ) , "'")';
- 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_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_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-program/src/main/webapp/dhis-web-maintenance-program/attributeInListNoProgram.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attributeInListNoProgram.vm 2014-06-02 01:08:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attributeInListNoProgram.vm 2014-06-02 02:07:05 +0000
@@ -74,7 +74,3 @@
</table>
</form>
-
-<script>
- var i18n_remove_option = '$encoder.jsEscape( $i18n.getString( "remove_option" ) , "'") ';
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attributeVisitSchedule.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attributeVisitSchedule.vm 2014-06-02 01:32:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attributeVisitSchedule.vm 2014-06-02 02:07:05 +0000
@@ -43,7 +43,7 @@
<input type="button" value="<<" onclick="moveAllById( 'selectedAttributeIds', 'availableAttributes' )" class='filterButton' />
</td>
<td>
- <select style="height:200px; width:100%; margin-top: 22px;" multiple="multiple" id="selectedAttributeIds" name="selectedAttributeIds" size="15" ondblclick="moveSelectedById( 'selectedAttributeIds', 'availableAttributes' )" >
+ <select style="height:200px;width:100%;margin-top:22px;" multiple="multiple" id="selectedAttributeIds" name="selectedAttributeIds" size="15" ondblclick="moveSelectedById( 'selectedAttributeIds', 'availableAttributes' )" >
#foreach($attribute in $selectedAttributes)
<option value='$attribute.id'>$attribute.name</option>
#end
@@ -64,6 +64,3 @@
</form>
-<script>
- var i18n_remove_option = '$encoder.jsEscape( $i18n.getString( "remove_option" ) , "'") ';
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm 2014-05-30 08:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm 2014-06-02 02:07:05 +0000
@@ -98,11 +98,5 @@
</form>
<script>
- var i18n_remove_option = '$encoder.jsEscape( $i18n.getString( "remove_option" ) , "'") ';
- var i118_at_least_2_option = '$encoder.jsEscape( $i18n.getString( "at_least_2_option" ) , "'") ';
- var i18n_field_is_required = '$encoder.jsEscape( $i18n.getString( "field_is_required" ) , "'") ';
- var i18n_current_date = '$encoder.jsEscape( $i18n.getString( "current_date" ) , "'") ';
- var i18n_incident_date = '$encoder.jsEscape( $i18n.getString( "incident_date" ) , "'") ';
- var i18n_enrollment_date = '$encoder.jsEscape( $i18n.getString( "enrollment_date" ) , "'") ';
var isSubmit = true;
</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm 2014-04-26 12:14:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm 2014-06-02 02:07:05 +0000
@@ -71,8 +71,4 @@
</tr>
</table>
-</form>
-
-<script>
- var i18n_remove_option = '$encoder.jsEscape( $i18n.getString( "remove_option" ) , "'") ';
-</script>
+</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm 2014-05-30 08:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm 2014-06-02 02:07:05 +0000
@@ -305,40 +305,8 @@
</tr>
</table>
</form>
+
<script>
- var i18n_reminder = '$encoder.jsEscape( $i18n.getString( "reminder" ) , "'")';
- var i18n_remove_reminder = '$encoder.jsEscape( $i18n.getString( "remove_reminder" ) , "'")';
- var i18n_days_before_after_comparison_date = '$encoder.jsEscape( $i18n.getString( "days_before_after_comparison_date" ) , "'")';
- var i18n_params = '$encoder.jsEscape( $i18n.getString( "params" ) , "'")';
- var i18n_tracked_entity_name = '$encoder.jsEscape( $i18n.getString( "tracked_entity_name" ) , "'")';
- var i18n_program_name = '$encoder.jsEscape( $i18n.getString( "program_name" ) , "'")';
- var i18n_incident_date = '$encoder.jsEscape( $i18n.getString( "incident_date" ) , "'")';
- var i18n_days_since_incident_date = '$encoder.jsEscape( $i18n.getString( "days_since_incident_date" ) , "'")';
- 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_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_tracked_entity_sms_only = '$encoder.jsEscape( $i18n.getString( "tracked_entity_sms_only" ) , "'")';
- var i18n_attribute_users = '$encoder.jsEscape( $i18n.getString( "attribute_users" ) , "'")';
- var i18n_orgunit_phone_number_sms_only = '$encoder.jsEscape( $i18n.getString( "orgunit_phone_number_sms_only" ) , "'")';
- var i18n_all_users_at_orgunit = '$encoder.jsEscape( $i18n.getString( "all_users_at_orgunit" ) , "'")';
- var i18n_send_when_to = '$encoder.jsEscape( $i18n.getString( "send_base_on" ) , "'")';
- var i18n_days_scheduled = '$encoder.jsEscape( $i18n.getString( "days_scheduled" ) , "'")';
- var i18n_complete_program = '$encoder.jsEscape( $i18n.getString( "complete_program" ) , "'")';
- 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_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_send_message = '$encoder.jsEscape( $i18n.getString( "send_message" ) , "'")';
- var i18n_message = '$encoder.jsEscape( $i18n.getString( "message" ) , "'")';
- var i18n_both = '$encoder.jsEscape( $i18n.getString( "both" ) , "'")';
-
+ var i18n_characters_without_params = '$encoder.jsEscape( $i18n.getString( "characters_without_params" ) , "'")';
programOnChange();
</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm 2014-05-30 08:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm 2014-06-02 02:07:05 +0000
@@ -95,7 +95,6 @@
var i18n_params = '$encoder.jsEscape( $i18n.getString( "params" ) , "'")';
var i18n_tracked_entity_name = '$encoder.jsEscape( $i18n.getString( "tracked_entity_name" ) , "'")';
var i18n_program_name = '$encoder.jsEscape( $i18n.getString( "program_name" ) , "'")';
- var i18n_incident_date = '$encoder.jsEscape( $i18n.getString( "incident_date" ) , "'")';
var i18n_days_since_incident_date = '$encoder.jsEscape( $i18n.getString( "days_since_incident_date" ) , "'")';
var i18n_orgunit_name = '$encoder.jsEscape( $i18n.getString( "orgunit_name" ) , "'")';
var i18n_enrollment_date = '$encoder.jsEscape( $i18n.getString( "enrollement_date" ) , "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramReminder.vm 2014-05-30 08:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramReminder.vm 2014-06-02 02:07:05 +0000
@@ -4,7 +4,6 @@
var i18n_days_before_after_comparison_date = '$encoder.jsEscape( $i18n.getString( "days_before_after_comparison_date" ) , "'")';
var i18n_params = '$encoder.jsEscape( $i18n.getString( "params" ) , "'")';
var i18n_program_name = '$encoder.jsEscape( $i18n.getString( "program_name" ) , "'")';
- var i18n_incident_date = '$encoder.jsEscape( $i18n.getString( "incident_date" ) , "'")';
var i18n_days_since_incident_date = '$encoder.jsEscape( $i18n.getString( "days_since_incident_date" ) , "'")';
var i18n_orgunit_name = '$encoder.jsEscape( $i18n.getString( "orgunit_name" ) , "'")';
var i18n_enrollment_date = '$encoder.jsEscape( $i18n.getString( "enrollement_date" ) , "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm 2014-05-30 08:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm 2014-06-02 02:07:05 +0000
@@ -243,39 +243,7 @@
</form>
<script type="text/javascript">
- var i18n_invalid_min_max_days = '$encoder.jsEscape( $i18n.getString( "invalid_min_max_days" ) , "'")';
- var i18n_value_must_positive = '$encoder.jsEscape( $i18n.getString( "value_must_positive" ) , "'")';
- var i18n_value_must_integer = '$encoder.jsEscape( $i18n.getString( "value_must_integer" ) , "'")';
- var i18n_compulsory_checkbox_title = '$encoder.jsEscape( $i18n.getString( "compulsory_checkbox_title" ) , "'")';
- var i18n_reminder = '$encoder.jsEscape( $i18n.getString( "reminder" ) , "'")';
- var i18n_remove_reminder = '$encoder.jsEscape( $i18n.getString( "remove_reminder" ) , "'")';
- var i18n_params = '$encoder.jsEscape( $i18n.getString( "params" ) , "'")';
- var i18n_program_name = '$encoder.jsEscape( $i18n.getString( "program_name" ) , "'")';
- var i18n_program_stage_name = '$encoder.jsEscape( $i18n.getString( "program_stage_name" ) , "'")';
- var i18n_due_date = '$encoder.jsEscape( $i18n.getString( "due_date" ) , "'")';
- var i18n_orgunit_name = '$encoder.jsEscape( $i18n.getString( "orgunit_name" ) , "'")';
- var i18n_days_since_due_date = '$encoder.jsEscape( $i18n.getString( "days_since_due_date" ) , "'")';
- var i18n_message = '$encoder.jsEscape( $i18n.getString( "message" ) , "'")';
- var i18n_recipients = '$encoder.jsEscape( $i18n.getString( "recipients" ) , "'")';
- var i18n_tracked_entity_sms_only = '$encoder.jsEscape( $i18n.getString( "tracked_entity_sms_only" ) , "'")';
- var i18n_attribute_users = '$encoder.jsEscape( $i18n.getString( "attribute_users" ) , "'")';
- var i18n_orgunit_phone_number_sms_only = '$encoder.jsEscape( $i18n.getString( "orgunit_phone_number_sms_only" ) , "'")';
- var i18n_all_users_at_orgunit = '$encoder.jsEscape( $i18n.getString( "all_users_at_orgunit" ) , "'")';
- var i18n_send_when_to = '$encoder.jsEscape( $i18n.getString( "send_base_on" ) , "'")';
- var i18n_days_scheduled = '$encoder.jsEscape( $i18n.getString( "days_scheduled" ) , "'")';
- var i18n_complete_event = '$encoder.jsEscape( $i18n.getString( "complete_event" ) , "'")';
- var i18n_program_stage_name = '$encoder.jsEscape( $i18n.getString( "program_stage_name" ) , "'" )';
- 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_both = '$encoder.jsEscape( $i18n.getString( "both" ) , "'")';
-
+
var attrOptions = "";
#foreach($programAttribute in $programStage.program.attributes)
attrOptions+="<option value={attributeid=$programAttribute.attribute.uid}>$programAttribute.attribute.displayName</option>";
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageReminder.vm 2014-05-30 08:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageReminder.vm 2014-06-02 02:07:05 +0000
@@ -1,36 +1,5 @@
<script>
- var i18n_reminder = '$encoder.jsEscape( $i18n.getString( "reminder" ) , "'")';
- var i18n_remove_reminder = '$encoder.jsEscape( $i18n.getString( "remove_reminder" ) , "'")';
- var i18n_days_before_after_comparison_date = '$encoder.jsEscape( $i18n.getString( "days_before_after_comparison_date" ) , "'")';
- var i18n_params = '$encoder.jsEscape( $i18n.getString( "params" ) , "'")';
- var i18n_incident_date = '$encoder.jsEscape( $i18n.getString( "incident_date" ) , "'")';
- var i18n_days_since_incident_date = '$encoder.jsEscape( $i18n.getString( "days_since_incident_date" ) , "'")';
- 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_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_tracked_entity_sms_only = '$encoder.jsEscape( $i18n.getString( "tracked_entity_sms_only" ) , "'")';
- var i18n_attribute_users = '$encoder.jsEscape( $i18n.getString( "attribute_users" ) , "'")';
- var i18n_orgunit_phone_number_sms_only = '$encoder.jsEscape( $i18n.getString( "orgunit_phone_number_sms_only" ) , "'")';
- var i18n_all_users_at_orgunit = '$encoder.jsEscape( $i18n.getString( "all_users_at_orgunit" ) , "'")';
- var i18n_send_when_to = '$encoder.jsEscape( $i18n.getString( "send_base_on" ) , "'")';
- var i18n_days_scheduled = '$encoder.jsEscape( $i18n.getString( "days_scheduled" ) , "'")';
- var i18n_complete_program = '$encoder.jsEscape( $i18n.getString( "complete_program" ) , "'")';
- 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_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_send_message = '$encoder.jsEscape( $i18n.getString( "send_message" ) , "'")';
- var i18n_both = '$encoder.jsEscape( $i18n.getString( "both" ) , "'")';
-
+
jQuery( document ).ready( function()
{
showHideUserGroup();
@@ -40,6 +9,7 @@
});
checkValueIsExist( "name", "validateReminder.action",{id:getFieldValue('id')} );
});
+ var i18n_characters_without_params = '$encoder.jsEscape( $i18n.getString( "characters_without_params" ) , "'")';
</script>
@@ -160,4 +130,3 @@
</table>
</form>
-
