Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Translation bugs #555

Merged
merged 5 commits into from
Jul 6, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/locales/en/translations.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion app/mixins/charge-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}));
},

Expand Down
2 changes: 1 addition & 1 deletion app/patients/socialwork/expense/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'),

Expand Down
2 changes: 1 addition & 1 deletion app/patients/socialwork/family-info/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'),

Expand Down
2 changes: 1 addition & 1 deletion app/procedures/charge/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}
<div class="row">
{{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"}}
Expand Down
2 changes: 1 addition & 1 deletion app/procedures/edit/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}));
}
Expand Down
2 changes: 1 addition & 1 deletion app/procedures/edit/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<div class="panel-body detail-section-content">
<table class="table">
<tr class="table-header">
<th>{{t 'labels.item'}}</th>
<th>{{t 'inventory.labels.item'}}</th>
<th>{{t 'labels.quantity'}}</th>
<th>{{t 'labels.action'}}</th>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion app/visits/edit/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}));
},

Expand Down