------------------------------------------------------------
revno: 21352
committer: Abyot Asalefew Gizaw <aby...@gmail.com>
branch nick: dhis2
timestamp: Mon 2015-12-07 09:53:38 +0100
message:
tracker-capture: enrollment lable change terminate -> cancel
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties
--
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-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js 2015-12-04 10:49:47 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js 2015-12-07 08:53:38 +0000
@@ -162,13 +162,13 @@
$scope.broadCastSelections('mainDashboard');
};
- $scope.terminateEnrollment = function(){
+ $scope.cancelEnrollment = function(){
var modalOptions = {
- closeButtonText: 'cancel',
- actionButtonText: 'terminate',
- headerText: 'terminate_enrollment',
- bodyText: 'are_you_sure_to_terminate_enrollment'
+ closeButtonText: 'no',
+ actionButtonText: 'yes',
+ headerText: 'cancel_enrollment',
+ bodyText: 'are_you_sure_to_cancel_enrollment'
};
ModalService.showModal({}, modalOptions).then(function(result){
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html 2015-09-15 16:03:55 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html 2015-12-07 08:53:38 +0000
@@ -63,8 +63,8 @@
<button type="button"
class="btn btn-warning"
ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
- ng-click="terminateEnrollment()">
- {{'terminate'| translate}}
+ ng-click="cancelEnrollment()">
+ {{'cancel'| translate}}
</button>
<button type="button"
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties 2015-12-04 10:10:40 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties 2015-12-07 08:53:38 +0000
@@ -83,8 +83,7 @@
change_location=Manage location
details_history=Details/history
history=History
-terminate=Terminate
-terminated=Terminated
+canceled=Canceled
delete=Delete
remove=Remove
entity=Entity
@@ -125,7 +124,7 @@
enrollment=Enrollment
enrolling_orgunit=Enrolling organisation unit
delete_enrollment=Delete enrollment
-terminate_enrollment=Terminate enrollment
+cancel_enrollment=Cancel enrollment
complete_enrollment=Complete enrollment
enrollment_date=Enrollment date
notes=Notes
@@ -299,7 +298,7 @@
are_you_sure_to_delete_enrollment=Are you sure you want to delete the selected enrollment?
would_you_like_to_complete_enrollment=Would you like to complete the current enrollment?
are_you_sure_to_complete_enrollment=Are you sure you want to complete the selected enrollment?
-are_you_sure_to_terminate_enrollment=Are you sure you want to terminate the selected enrollment?
+are_you_sure_to_cancel_enrollment=Are you sure you want to cancel the selected enrollment?
are_you_sure_to_delete_event=Are you sure you want to delete the selected event?
are_you_sure_to_complete_event=Are you sure you want to complete the selected event?
please_fix_errors_before_completing=Please review and fix the following error(s) before completing the event:
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
