Suman | BAH-311 | Remove some of the hard coded value and enable inte…

…rnationalization for those values

ui/Gruntfile.js

@@ -35,7 +35,7 @@ module.exports = function (grunt) {
         'components/angular-bindonce/bindonce.min.js',
         'components/angular-recursion/angular-recursion.min.js',
         'components/ngInfiniteScroll/build/ng-infinite-scroll.min.js',
-        'components/moment/min/moment.min.js',
+        'components/moment/min/moment-with-locales.min.js',
         'components/select2/select2.min.js',
         'components/angular-ui-select2/src/select2.js',
         'components/angular-ui-router/release/angular-ui-router.min.js',

ui/app/admin/app.js

@@ -59,7 +59,8 @@ angular.module('admin')
             $httpProvider.defaults.headers.common['Disable-WWW-Authenticate'] = true;
             $bahmniTranslateProvider.init({app: 'admin', shouldMerge: true});
         }
-    ]).run(['$rootScope', '$templateCache', function ($rootScope, $templateCache) {
+    ]).run(['$rootScope', '$templateCache', '$window', function ($rootScope, $templateCache, $window) {
+        moment.locale($window.localStorage["NG_TRANSLATE_LANG_KEY"] || "en");
         // Disable caching view template partials
         $rootScope.$on('$viewContentLoaded', $templateCache.removeAll);
     }]);

ui/app/admin/index.html

@@ -32,7 +32,7 @@
         <script src="../components/stacktrace-js/dist/stacktrace.min.js"></script>
         <script src="../components/ng-clip/dest/ng-clip.min.js"></script>
         <script src="../components/zeroclipboard/dist/ZeroClipboard.min.js"></script>
-        <script src="../components/moment/min/moment.min.js"></script>
+        <script src="../components/moment/min/moment-with-locales.min.js"></script>
         <script src="../components/angular-translate/angular-translate.min.js"></script>
         <script src="../components/angular-cookies/angular-cookies.min.js"></script>
         <script src="../components/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js"></script>

ui/app/adt/app.js

@@ -93,4 +93,6 @@ angular.module('adt').config(['$stateProvider', '$httpProvider', '$urlRouterProv
         });
 
         $bahmniTranslateProvider.init({app: 'adt', shouldMerge: true});
+    }]).run(['$window', function ($window) {
+        moment.locale($window.localStorage["NG_TRANSLATE_LANG_KEY"] || "en");
     }]);

ui/app/adt/index.html

@@ -33,7 +33,7 @@
         <script src="../components/angular/angular.min.js"></script>
         <script src="../components/angular-sanitize/angular-sanitize.min.js"></script>
         <script src="../components/angular-recursion/angular-recursion.min.js"></script>
-        <script src="../components/moment/min/moment.min.js"></script>
+        <script src="../components/moment/min/moment-with-locales.min.js"></script>
         <script src="../components/select2/select2.min.js"></script>
         <script src="../components/angular-ui-select2/src/select2.js"></script>
         <script src="../components/angular-ui-router/release/angular-ui-router.min.js"></script>

ui/app/adt/views/dashboard.html

@@ -2,10 +2,10 @@
     <div class="box">
         <div>
             <label>
-                <span class="fl adt-disposition-action">Patient Movement:</span>
+                <span class="fl adt-disposition-action">{{ 'PATIENT_MOVEMENT_LABEL'|translate }}:</span>
                 <select id="dispositionAction" ng-model="dispositionAction"
                         ng-options="d.name.name for d in dispositionActions" class="disposition-action">
-                    <option value="">Select</option>
+                    <option value="">{{ 'PATIENT_MOVEMENT_SELECT_LABEL'|translate }}</option>
                 </select>
             </label>
         </div>

ui/app/adt/views/home.html

@@ -4,7 +4,7 @@
 <div ng-if="isBedManagementEnabled">
     <li class="tab-item ward-list-tab"
         ng-click="search.searchType=undefined; search.navigated=false" ng-class="{'tab-selected': (search.searchType === undefined)}">
-        <a href>Ward List</a>
+        <a href>{{ 'WARD_LIST_LABEL'|translate }}</a>
     </li>
     <div ui-view="wards" id="ward-list" ng-show="search.searchType==undefined" class="opd-content-wrapper"></div>
 </div>

ui/app/adt/views/ward.html

@@ -5,7 +5,7 @@ <h2 class="section-title">
             <i class="fa fa-caret-down" ng-show="expanded"></i>
             <span class="section-title-text">
                 <span>{{ward.ward.name}} -  </span>
-                <small>(Total Beds: {{ward.totalBeds}} | Available Beds: {{ward.totalBeds-ward.occupiedBeds}})</small>
+                <small>({{ 'TOTAL_BEDS_LABEL'|translate }}: {{ward.totalBeds}} | {{ 'AVAILABLE_BEDS_LABEL'|translate }}: {{ward.totalBeds-ward.occupiedBeds}})</small>
             </span>
         </span>
         <span class="quick-links" ng-if="readOnly">

ui/app/adt/views/wardLayout.html

@@ -1,15 +1,15 @@
 <div>
     <div class="bed-info" ng-show="selectedBed.bed.bedNumber">
 		<ul>
-			<li>Bed: {{selectedBed.bed.bedNumber}}</li>
+			<li>{{ 'BED_LABEL'|translate }}: {{selectedBed.bed.bedNumber}}</li>
 			<div class="patient-info" ng-repeat="patientInfo in selectedBed.patientInfo">
                 <li>{{patientInfo.identifier}}</li>
                 <li>{{patientInfo.name}} ({{patientInfo.gender}})</li>
             </div>
 			<li ng-show="!readOnly"><a class="assign" ng-show="!getCurrentBed()"
-                ng-click="assignBed(selectedBed)">Assign</a></li>
+                ng-click="assignBed(selectedBed)">{{ 'ASSIGN_BED_LABEL'|translate }}</a></li>
 			<li ng-show="!readOnly"><a class="transfer" ng-show="getCurrentBed() && selectedBed.bed.bedId != getCurrentBed().bedId"
-                ng-click="assignBed(selectedBed)">Transfer</a></li>
+                ng-click="assignBed(selectedBed)">{{ 'TRANSFER_BED_LABEL'|translate }}</a></li>
 		</ul>
     </div>
     <div class="bed-assignment" ng-repeat="layout in ward.layouts">

ui/app/adt/views/wardList.html

@@ -1,6 +1,6 @@
 <div class="ward-details-container">
     <span ng-if="tableDetails.length == 0" class="no-data-info">
-        There are no patients in this ward.
+        {{ 'EMPTY_WARD_MESSAGE'|translate }}
     </span>
     <table class="table ward-details-content" ng-if="tableDetails.length > 0">
         <thead>

ui/app/appointments/app.js

@@ -204,4 +204,6 @@ angular
             });
 
             $bahmniTranslateProvider.init({app: 'appointments', shouldMerge: true});
+        }]).run(['$window', function ($window) {
+            moment.locale($window.localStorage["NG_TRANSLATE_LANG_KEY"] || "en");
         }]);

ui/app/appointments/index.html

@@ -33,7 +33,7 @@
         <script src="../components/angular/angular.min.js"></script>
         <script src="../components/ng-tags-input/ng-tags-input.min.js"></script>
         <script src="../components/angular-sanitize/angular-sanitize.min.js"></script>
-        <script src="../components/moment/min/moment.min.js"></script>
+        <script src="../components/moment/min/moment-with-locales.min.js"></script>
         <script src="../components/ngInfiniteScroll/build/ng-infinite-scroll.min.js"></script>
         <script src="../components/angular-bindonce/bindonce.min.js"></script>
         <script src="../components/select2/select2.min.js"></script>

ui/app/clinical/app.js

@@ -452,13 +452,14 @@ angular.module('consultation')
             $httpProvider.defaults.headers.common['Disable-WWW-Authenticate'] = true;
 
             $bahmniTranslateProvider.init({app: 'clinical', shouldMerge: true});
-        }]).run(['stateChangeSpinner', '$rootScope', 'auditLogService',
-            function (stateChangeSpinner, $rootScope, auditLogService) {
+        }]).run(['stateChangeSpinner', '$rootScope', 'auditLogService', '$window',
+            function (stateChangeSpinner, $rootScope, auditLogService, $window) {
+                moment.locale($window.localStorage["NG_TRANSLATE_LANG_KEY"] || "en");
                 FastClick.attach(document.body);
                 stateChangeSpinner.activate();
                 var cleanUpStateChangeSuccess = $rootScope.$on('$stateChangeSuccess', function (event, toState, toParams) {
                     auditLogService.log(toParams.patientUuid, Bahmni.Clinical.StateNameEvenTypeMap[toState.name], undefined, "MODULE_LABEL_CLINICAL_KEY");
-                    window.scrollTo(0, 0);
+                    $window.scrollTo(0, 0);
                 });
                 var cleanUpNgDialogOpened = $rootScope.$on('ngDialog.opened', function () {
                     $('html').addClass('ngdialog-open');

ui/app/clinical/common/views/treatmentTablePrint.html

@@ -1,10 +1,10 @@
 <table class="printPrescription">
     <tr>
-        <th class="sl-no-heading">S. No.</th>
-        <th class="drug-name-heading">Drug Name</th>
-        <th class="dosage-instructions-heading">Dosage Instructions</th>
-        <th class="quantity-heading">Quantity</th>
-        <th class="start-date-heading">Start Date</th>
+        <th class="sl-no-heading">{{'TREATMENT_SL_NO'|translate}}</th>
+        <th class="drug-name-heading">{{'MEDICATION_DRUG_NAME_TITLE'|translate}}</th>
+        <th class="dosage-instructions-heading">{{'MEDICATION_DOSAGE_INFORMATION_LABEL'|translate}}</th>
+        <th class="quantity-heading">{{'DRUG_DETAILS_QUANTITY_TEXT'|translate}}</th>
+        <th class="start-date-heading">{{'MEDICATION_LABEL_START_DATE'|translate}}</th>
     </tr>
     <tbody ng-repeat="drugOrder in drugOrders" ng-class="{'strike-through': drugOrder.isDiscontinuedOrStopped()}">
     <tr>
@@ -21,7 +21,7 @@
     <tr ng-if="::drugOrder.additionalInstructions">
         <td></td>
         <td colspan="4" class="inline-notes notes">
-            <p class="left"><strong>Treatment Notes: </strong>{{drugOrder.additionalInstructions}}</p>
+            <p class="left"><strong>{{'TREATMENT_NOTES'|translate}}: </strong>{{drugOrder.additionalInstructions}}</p>
         </td>
     </tr>
     </tbody>

ui/app/clinical/common/views/visitHeader.html

@@ -38,8 +38,8 @@
 
             </button>
             <span class="grouped-buttons" ng-if="visitHistory.activeVisit || retrospectiveEntry">
-                <a class=" btn--left btn--success "  ng-click="openConsultation()">Consultation</a>
-                <a class="btn--right btn--success " title="Open in new window"ng-click="collapseControlPanel()" ui-sref="patient.dashboard.show.observations({patientUuid: patient.uuid,programUuid: programUuid,conceptSetGroupName: 'observations'})" target="_blank"><i class="fa fa-external-link"></i></a>
+                <a class=" btn--left btn--success "  ng-click="openConsultation()">{{'CONSULTATION_TAB_KEY'|translate}}</a>
+                <a class="btn--right btn--success " title="{{'OPEN_IN_NEW_WINDOW'|translate}}" ng-click="collapseControlPanel()" ui-sref="patient.dashboard.show.observations({patientUuid: patient.uuid,programUuid: programUuid,conceptSetGroupName: 'observations'})" target="_blank"><i class="fa fa-external-link"></i></a>
            </span>
            <button class="toggle-patient" ng-click="toggleControlPanel()" ng-class="{'shift': showControlPanel}">
                <i class="fa fa-bars fa-white fa-large"></i>

ui/app/clinical/constants.js

@@ -19,10 +19,10 @@ Bahmni.Clinical.Constants = (function () {
         weight: "Weight"
     };
     var errorMessages = {
-        discontinuingAndOrderingSameDrug: "Discontinuing and ordering the same drug is not allowed. Instead, use edit",
-        incompleteForm: "Please click on Add or Clear to continue",
+        discontinuingAndOrderingSameDrug: "DISCONTINUING_AND_ORDERING_SAME_DRUG_NOT_ALLOWED",
+        incompleteForm: "INCOMPLETE_FORM_ERROR_MESSAGE",
         invalidItems: "Highlighted items in New Prescription section are incomplete. Please edit or remove them to continue",
-        conceptNotNumeric: "Concept ':conceptName''s datatype is not Numeric. At :placeErrorAccurred."
+        conceptNotNumeric: "CONCEPT_NOT_NUMERIC"
     };
     var bacteriologyConstants = {
         otherSampleType: "Other",
@@ -46,9 +46,9 @@ Bahmni.Clinical.Constants = (function () {
         otherInvestigationsConceptSetName: "Other Investigations",
         otherInvestigationCategoriesConceptSetName: "Other Investigations Categories",
         commentConceptName: "COMMENTS",
-        messageForNoLabOrders: "No lab orders.",
-        messageForNoObservation: "No observations captured for this visit.",
-        messageForNoActiveVisit: "No active visit.",
+        messageForNoLabOrders: "NO_LAB_ORDERS_MESSAGE",
+        messageForNoObservation: "NO_OBSERVATIONS_CAPTURED",
+        messageForNoActiveVisit: "NO_ACTIVE_VISIT_MESSAGE",
         dischargeSummaryConceptName: "Discharge Summary",
         flexibleDosingInstructionsClass: "org.openmrs.module.bahmniemrapi.drugorder.dosinginstructions.FlexibleDosingInstructions",
         reviseAction: 'REVISE',

ui/app/clinical/consultation/controllers/addTreatmentController.js

@@ -3,10 +3,10 @@
 angular.module('bahmni.clinical')
     .controller('AddTreatmentController', ['$scope', '$rootScope', 'contextChangeHandler', 'treatmentConfig', 'drugService',
         '$timeout', 'clinicalAppConfigService', 'ngDialog', '$window', 'messagingService', 'appService', 'activeDrugOrders',
-        'orderSetService', '$q', 'locationService', 'spinner',
+        'orderSetService', '$q', 'locationService', 'spinner', '$translate',
         function ($scope, $rootScope, contextChangeHandler, treatmentConfig, drugService, $timeout,
                   clinicalAppConfigService, ngDialog, $window, messagingService, appService, activeDrugOrders,
-                  orderSetService, $q, locationService, spinner) {
+                  orderSetService, $q, locationService, spinner, $translate) {
             var DateUtil = Bahmni.Common.Util.DateUtil;
             var DrugOrderViewModel = Bahmni.Clinical.DrugOrderViewModel;
             var scrollTop = _.partial($window.scrollTo, 0, 0);
@@ -466,14 +466,14 @@ angular.module('bahmni.clinical')
             var contextChange = function () {
                 var errorMessages = Bahmni.Clinical.Constants.errorMessages;
                 if (isSameDrugBeingDiscontinuedAndOrdered()) {
-                    return {allow: false, errorMessage: errorMessages.discontinuingAndOrderingSameDrug};
+                    return {allow: false, errorMessage: $translate.instant(errorMessages.discontinuingAndOrderingSameDrug)};
                 }
                 if ($scope.incompleteDrugOrders()) {
                     $scope.formInvalid = true;
                     return {allow: false};
                 }
                 if ($scope.unaddedDrugOrders()) {
-                    return {allow: false, errorMessage: errorMessages.incompleteForm};
+                    return {allow: false, errorMessage: $translate.instant(errorMessages.incompleteForm)};
                 }
                 return {allow: true};
             };

ui/app/clinical/consultation/views/bacteriology.html

@@ -2,7 +2,7 @@
     <div ng-class="{'disableBacteriologyInRetroMode':isRetrospectiveMode()}">
         <div class="infoMsgRetrospectiveModeEnabled" ng-if="isRetrospectiveMode()">
             <i class="fa fa-info-circle"></i>
-            <span><strong>Bacteriology</strong> entry is <strong>NOT allowed</strong> in retrospective mode</span>
+            <span ng-bind-html="'BACTERIOLOGY_NOT_ALLOWED_IN_RETROSPECTIVE_MESSAGE'|translate"></span>
         </div>
         <div ng-repeat="newSpecimen in newSpecimens track by $id(newSpecimen)" class="sample-container">
             <form class="form">

ui/app/clinical/consultation/views/conditions.html

@@ -26,7 +26,7 @@
                                                 active: consultation.condition.isNonCoded
                                             }"
                         ng-disabled="consultation.condition.concept.uuid">
-                    <span>{{'CLINICAL_ACCEPT'|translate}}</span>
+                    <span>{{'ACCEPT'|translate}}</span>
                 </button>
             </div>
             <div class="col col2">