diff --git a/app/locales/en/translations.js b/app/locales/en/translations.js index 48081d8a46..9fae150470 100644 --- a/app/locales/en/translations.js +++ b/app/locales/en/translations.js @@ -759,7 +759,7 @@ export default { procedures: { titles: { add_charge_item: 'Add Charge Item', - delete_charge_item: 'Edit Charge Item', + delete_charge_item: 'Delete Charge Item', medication_used: 'Medication Used', delete_medication_used: 'Delete Medication Used', add_medication_used: 'Add Medication Used', diff --git a/app/mixins/charge-actions.js b/app/mixins/charge-actions.js index 209b0b5e27..02ad53c611 100644 --- a/app/mixins/charge-actions.js +++ b/app/mixins/charge-actions.js @@ -59,7 +59,7 @@ export default Ember.Mixin.create({ message: 'Are you sure you want to delete this charged item?', chargeToDelete: charge, updateButtonAction: 'confirm', - updateButtonText: 'Ok' + updateButtonText: this.get('i18n').t('buttons.ok') })); }, diff --git a/app/patients/socialwork/expense/controller.js b/app/patients/socialwork/expense/controller.js index e9e9f2a592..5c29373090 100644 --- a/app/patients/socialwork/expense/controller.js +++ b/app/patients/socialwork/expense/controller.js @@ -28,7 +28,7 @@ export default Ember.Controller.extend(IsUpdateDisabled, { if (isNew) { return this.get('i18n').t('buttons.add'); } else { - return this.get('i18n').t('buttons.add'); + return this.get('i18n').t('buttons.update'); } }.property('model.isNew'), diff --git a/app/patients/socialwork/family-info/controller.js b/app/patients/socialwork/family-info/controller.js index 8210d77680..712be6e69f 100644 --- a/app/patients/socialwork/family-info/controller.js +++ b/app/patients/socialwork/family-info/controller.js @@ -13,7 +13,7 @@ export default Ember.Controller.extend(IsUpdateDisabled, { if (isNew) { return this.get('i18n').t('buttons.add'); } else { - return this.get('i18n').t('buttons.add'); + return this.get('i18n').t('buttons.update'); } }.property('model.isNew'), diff --git a/app/procedures/charge/template.hbs b/app/procedures/charge/template.hbs index 95893b705e..4cc017cd73 100644 --- a/app/procedures/charge/template.hbs +++ b/app/procedures/charge/template.hbs @@ -5,7 +5,7 @@ updateButtonAction=updateButtonAction updateButtonText=updateButtonText }} {{#em-form model=model submitButton=false }} - {{pricing-typeahead property="itemName" label=(t 'labels.item') content=pricingList selection=selectedItem class="required"}} + {{pricing-typeahead property="itemName" label=(t 'inventory.labels.item') content=pricingList selection=selectedItem class="required"}}
{{em-input label=(t 'labels.quantity') property="quantity" class="col-xs-3 required"}} {{date-picker property="dateCharged" label="Date Charged" class="col-xs-4 required"}} diff --git a/app/procedures/edit/controller.js b/app/procedures/edit/controller.js index 6ae1e9090f..ce19900238 100644 --- a/app/procedures/edit/controller.js +++ b/app/procedures/edit/controller.js @@ -85,7 +85,7 @@ export default AbstractEditController.extend(ChargeActions, PatientSubmodule, { title: this.get('i18n').t('procedures.titles.delete_medication_used'), message: this.get('i18n').t('procedures.messages.delete_medication'), chargeToDelete: charge, - updateButtonAction: this.get('i18n').t('buttons.confirm'), + updateButtonAction: 'confirm', updateButtonText: this.get('i18n').t('buttons.ok') })); } diff --git a/app/procedures/edit/template.hbs b/app/procedures/edit/template.hbs index 77aeed475e..e36a96b118 100644 --- a/app/procedures/edit/template.hbs +++ b/app/procedures/edit/template.hbs @@ -55,7 +55,7 @@
- + diff --git a/app/visits/edit/controller.js b/app/visits/edit/controller.js index 572e86d5d8..dc9281cd86 100644 --- a/app/visits/edit/controller.js +++ b/app/visits/edit/controller.js @@ -350,7 +350,7 @@ export default AbstractEditController.extend(ChargeActions, PatientSubmodule, Pa message: 'Are you sure you want to delete this note?', noteToDelete: note, updateButtonAction: 'confirm', - updateButtonText: 'Ok' + updateButtonText: this.get('i18n').t('buttons.ok') })); },
{{t 'labels.item'}}{{t 'inventory.labels.item'}} {{t 'labels.quantity'}} {{t 'labels.action'}}