From d96bf3def6a74222b6bb5fbb091837f03c362328 Mon Sep 17 00:00:00 2001 From: David Pierce Date: Mon, 25 Jul 2016 07:32:27 -0700 Subject: [PATCH] Fixes Issues 581, 582, 583, 586, 587, 588, 589 (#603) Fixes #581 Fixes #582 Fixes #583 Fixes #586 Fixes #587 Fixes #588 Fixes #589 * Fixes Issues 586-589 Updates vitals, visits, labs and patients translation keys. * Fixes issue 583 Updates imaging translation keys * Fixes issues 581-583 Updates loading, inventory and imaging translation keys. * Fixes test errors --- app/imaging/completed/route.js | 2 +- app/imaging/completed/template.hbs | 2 +- app/imaging/edit/controller.js | 8 +- app/imaging/edit/route.js | 4 +- app/imaging/edit/template.hbs | 2 +- app/imaging/index/route.js | 2 +- app/imaging/route.js | 4 +- app/inventory/adjust/template.hbs | 10 +- app/inventory/barcode/template.hbs | 23 +- app/inventory/batch/controller.js | 6 +- app/inventory/batch/template.hbs | 28 +- app/inventory/delete/controller.js | 2 +- app/inventory/edit/route.js | 4 +- app/inventory/edit/template.hbs | 32 +- app/inventory/index/template.hbs | 2 +- app/inventory/purchase/edit/controller.js | 4 +- app/inventory/quick-add/controller.js | 2 +- app/inventory/quick-add/template.hbs | 4 +- app/inventory/reports/controller.js | 86 ++-- app/inventory/reports/route.js | 2 +- app/inventory/reports/template.hbs | 8 +- app/inventory/request/controller.js | 8 +- app/inventory/request/route.js | 4 +- app/inventory/request/template.hbs | 26 +- app/inventory/search/template.hbs | 4 +- app/inventory/transfer/template.hbs | 10 +- app/labs/completed/route.js | 2 +- app/labs/completed/template.hbs | 4 +- app/labs/delete/controller.js | 2 +- app/labs/delete/template.hbs | 2 +- app/labs/edit/controller.js | 8 +- app/labs/edit/route.js | 4 +- app/labs/edit/template.hbs | 6 +- app/labs/index/route.js | 2 +- app/labs/index/template.hbs | 4 +- app/labs/route.js | 4 +- app/locales/de/translations.js | 28 +- app/locales/en/translations.js | 420 +++++++++--------- app/locales/es-CO/translations.js | 300 ++++++------- app/locales/es/translations.js | 298 ++++++------- app/locales/fr/translations.js | 298 ++++++------- app/locales/pt-BR/translations.js | 40 +- app/locales/ru/translations.js | 28 +- app/locales/tr/translations.js | 28 +- app/medication/edit/controller.js | 2 +- app/models/patient-note.js | 4 +- app/patients/delete/template.hbs | 2 +- app/patients/edit/controller.js | 22 +- app/patients/edit/template.hbs | 50 +-- app/patients/imaging/template.hbs | 2 +- app/patients/index/route.js | 2 +- app/patients/index/template.hbs | 6 +- app/patients/labs/template.hbs | 4 +- app/patients/notes/controller.js | 4 +- app/patients/notes/template.hbs | 4 +- app/patients/photo/controller.js | 4 +- app/patients/quick-add/template.hbs | 2 +- app/patients/reports/controller.js | 6 +- app/patients/reports/route.js | 2 +- app/patients/reports/template.hbs | 2 +- app/patients/route.js | 2 +- app/patients/socialwork/expense/controller.js | 2 +- .../socialwork/family-info/controller.js | 2 +- app/templates/components/patient-summary.hbs | 4 +- app/templates/inv-purchase.hbs | 14 +- app/templates/inventory-basic.hbs | 10 +- app/templates/item-charges.hbs | 2 +- app/visits/edit/template.hbs | 34 +- app/visits/vitals/edit/template.hbs | 6 +- 69 files changed, 980 insertions(+), 981 deletions(-) diff --git a/app/imaging/completed/route.js b/app/imaging/completed/route.js index 4d0a68ae69..590e486ec6 100755 --- a/app/imaging/completed/route.js +++ b/app/imaging/completed/route.js @@ -1,6 +1,6 @@ import { translationMacro as t } from 'ember-i18n'; import ImagingIndexRoute from 'hospitalrun/imaging/index/route'; export default ImagingIndexRoute.extend({ - pageTitle: t('imaging.titles.completed_imaging'), + pageTitle: t('imaging.titles.completedImaging'), searchStatus: 'Completed' }); diff --git a/app/imaging/completed/template.hbs b/app/imaging/completed/template.hbs index 6eb79f93d1..a28bbd5d30 100644 --- a/app/imaging/completed/template.hbs +++ b/app/imaging/completed/template.hbs @@ -16,7 +16,7 @@ {{else}}
-

{{t 'imaging.messages.no_completed'}}

+

{{t 'imaging.messages.noCompleted'}}

{{/if}} {{/item-listing}} diff --git a/app/imaging/edit/controller.js b/app/imaging/edit/controller.js index 581cfec0d3..4a3e88baa6 100644 --- a/app/imaging/edit/controller.js +++ b/app/imaging/edit/controller.js @@ -104,11 +104,11 @@ export default AbstractEditController.extend(ChargeActions, PatientSubmodule, { alertTitle, alertMessage; if (this.get('model.status') === 'Completed') { - alertTitle = i18n.t('imaging.alerts.completed_title'); - alertMessage = i18n.t('imaging.alerts.completed_message'); + alertTitle = i18n.t('imaging.alerts.completedTitle'); + alertMessage = i18n.t('imaging.alerts.completedMessage'); } else { - alertTitle = i18n.t('imaging.alerts.saved_title'); - alertMessage = i18n.t('imaging.alerts.saved_message'); + alertTitle = i18n.t('imaging.alerts.savedTitle'); + alertMessage = i18n.t('imaging.alerts.savedMessage'); } if (multipleRecords) { afterDialogAction = this.get('cancelAction'); diff --git a/app/imaging/edit/route.js b/app/imaging/edit/route.js index af9f1e558d..76a3efa8ec 100644 --- a/app/imaging/edit/route.js +++ b/app/imaging/edit/route.js @@ -4,9 +4,9 @@ import ChargeRoute from 'hospitalrun/mixins/charge-route'; import Ember from 'ember'; import PatientListRoute from 'hospitalrun/mixins/patient-list-route'; export default AbstractEditRoute.extend(ChargeRoute, PatientListRoute, { - editTitle: t('imaging.titles.edit_title'), + editTitle: t('imaging.titles.editTitle'), modelName: 'imaging', - newTitle: t('imaging.titles.new_title'), + newTitle: t('imaging.titles.editTitle'), pricingCategory: 'Imaging', actions: { diff --git a/app/imaging/edit/template.hbs b/app/imaging/edit/template.hbs index c7bdaf9630..7c834a46ac 100644 --- a/app/imaging/edit/template.hbs +++ b/app/imaging/edit/template.hbs @@ -10,7 +10,7 @@ {{em-select class="col-xs-3 required" label=(t 'labels.visit') property="visit" content=patientVisitsForSelect optionValuePath="selectObject" optionLabelPath="selectObject.visitDescription" - prompt=(t 'imaging.labels.add_new_visit') + prompt=(t 'imaging.labels.addNewVisit') selected=model.visit }} diff --git a/app/imaging/index/route.js b/app/imaging/index/route.js index 72561007d7..0b3b0723ef 100644 --- a/app/imaging/index/route.js +++ b/app/imaging/index/route.js @@ -2,7 +2,7 @@ import { translationMacro as t } from 'ember-i18n'; import AbstractIndexRoute from 'hospitalrun/routes/abstract-index-route'; export default AbstractIndexRoute.extend({ modelName: 'imaging', - pageTitle: t('imaging.page_title'), + pageTitle: t('imaging.pageTitle'), searchStatus: 'Requested', _getStartKeyFromItem: function(item) { diff --git a/app/imaging/route.js b/app/imaging/route.js index 3f4f8640c1..3b0e67c8ad 100644 --- a/app/imaging/route.js +++ b/app/imaging/route.js @@ -11,6 +11,6 @@ export default AbstractModuleRoute.extend({ }], allowSearch: false, moduleName: 'imaging', - newButtonText: t('imaging.buttons.new_button'), - sectionTitle: t('imaging.section_title') + newButtonText: t('imaging.buttons.newButton'), + sectionTitle: t('imaging.sectionTitle') }); diff --git a/app/inventory/adjust/template.hbs b/app/inventory/adjust/template.hbs index a17a6a432b..8effad70b3 100644 --- a/app/inventory/adjust/template.hbs +++ b/app/inventory/adjust/template.hbs @@ -9,15 +9,15 @@

{{model.adjustmentItem.name}}

- +

{{model.locationName}}

- +

{{model.quantity}}

- {{em-select class="col-sm-4" label=(t 'inventory.labels.adjustment_type') + {{em-select class="col-sm-4" label=(t 'inventory.labels.adjustmentType') property="transactionType" content=adjustmentTypes optionValuePath="type" optionLabelPath="name" }} @@ -25,8 +25,8 @@
{{em-text label=(t 'inventory.labels.reason') property="reason" rows=3}}
- {{date-picker property="dateCompleted" label=(t 'inventory.labels.adjustment_date') class="col-sm-4 required"}} + {{date-picker property="dateCompleted" label=(t 'inventory.labels.adjustmentDate') class="col-sm-4 required"}} {{select-or-typeahead property="expenseAccount" label=(t 'inventory.labels.expense') list=expenseAccountList selection=model.expenseAccount class="col-sm-8"}}
{{/em-form}} -{{/modal-dialog}} \ No newline at end of file +{{/modal-dialog}} diff --git a/app/inventory/barcode/template.hbs b/app/inventory/barcode/template.hbs index d9c4b7ed13..e22dadeb5e 100644 --- a/app/inventory/barcode/template.hbs +++ b/app/inventory/barcode/template.hbs @@ -7,25 +7,24 @@ {{#if havePrinters}}
-

{{t 'inventory.labels.print_barcode'}}

-
+

{{t 'inventory.labels.printBarcode'}}

+
-
- {{#unless singlePrinter}} +
+ {{#unless singlePrinter}} - {{select-list - content=printers - optionLabelPath='name' - optionValuePath='name' - value=selectedPrinter - class="form-control" + {{select-list + content=printers + optionLabelPath='name' + optionValuePath='name' + value=selectedPrinter + class="form-control" action=(action (mut selectedPrinter)) id="printerSelect" - }} + }} {{/unless}}
{{/if}} - diff --git a/app/inventory/batch/controller.js b/app/inventory/batch/controller.js index bf210e5bf6..9a6107c3ee 100755 --- a/app/inventory/batch/controller.js +++ b/app/inventory/batch/controller.js @@ -193,7 +193,7 @@ export default AbstractEditController.extend(InventoryId, InventoryLocations, In }.bind(this)); Ember.RSVP.all(inventorySaves).then(function() { this.updateLookupLists(); - this.displayAlert(this.get('i18n').t('inventory.titles.purchase_saved'), this.get('i18n').t('inventory.messages.purchase_saved'), 'allItems'); + this.displayAlert(this.get('i18n').t('inventory.titles.purchaseSaved'), this.get('i18n').t('inventory.messages.purchaseSaved'), 'allItems'); }.bind(this)); }.bind(this)); }.bind(this)); @@ -221,11 +221,11 @@ export default AbstractEditController.extend(InventoryId, InventoryLocations, In }, showRemoveItem: function(item) { - var message = this.get('i18n').t('inventory.messages.remove_item'), + var message = this.get('i18n').t('inventory.messages.removeItem'), model = Ember.Object.create({ itemToRemove: item }), - title = this.get('i18n').t('inventory.titles.remove_item'); + title = this.get('i18n').t('inventory.titles.removeItem'); this.displayConfirm(title, message, 'removeItem', model); }, diff --git a/app/inventory/batch/template.hbs b/app/inventory/batch/template.hbs index d5188755ae..13c0c80179 100755 --- a/app/inventory/batch/template.hbs +++ b/app/inventory/batch/template.hbs @@ -1,13 +1,13 @@ {{#edit-panel editPanelProps=editPanelProps}} {{#em-form model=model submitButton=false }}
- {{date-picker property="dateReceived" label=(t 'inventory.labels.date_received') class="col-sm-4 required"}} + {{date-picker property="dateReceived" label=(t 'inventory.labels.dateReceived') class="col-sm-4 required"}} {{select-or-typeahead property="vendor" label=(t 'inventory.labels.vendor') list=vendorList selection=model.vendor className="col-sm-4 required test-vendor"}} - {{em-input property="invoiceNo" label=(t 'inventory.labels.invoice_number') class="col-sm-4 test-invoice-number"}} + {{em-input property="invoiceNo" label=(t 'inventory.labels.invoiceNumber') class="col-sm-4 test-invoice-number"}}
{{select-or-typeahead property="location" label=(t 'inventory.labels.location') list=warehouseList selection=model.location className="col-sm-5"}} - {{select-or-typeahead property="aisleLocation" label=(t 'inventory.labels.aisle_location') list=aisleLocationList selection=model.aisleLocation className="col-sm-5"}} + {{select-or-typeahead property="aisleLocation" label=(t 'inventory.labels.aisleLocation') list=aisleLocationList selection=model.aisleLocation className="col-sm-5"}}
{{em-checkbox label=(t 'inventory.labels.gift') property="giftInKind"}} @@ -15,14 +15,14 @@
-

{{t 'inventory.labels.invoice_line_item'}}

+

{{t 'inventory.labels.invoiceLineItem'}}

{{inventory-typeahead class="col-sm-7 required test-inv-item" property="inventoryItemTypeAhead" - label=(t 'inventory.labels.inventory_item') + label=(t 'inventory.labels.inventoryItem') content=inventoryList selection=selectedInventoryItem showQuantity=false @@ -34,12 +34,12 @@

{{model.inventoryItem.distributionUnit}}

{{/if}}
- {{em-input property="purchaseCost" label=(t 'inventory.labels.purchase_cost') class="col-sm-2 required test-inv-cost"}} + {{em-input property="purchaseCost" label=(t 'inventory.labels.purchaseCost') class="col-sm-2 required test-inv-cost"}}
- {{em-input property="vendorItemNo" label=(t 'inventory.labels.vendor_item_number') class="col-sm-4"}} - {{em-input property="lotNumber" label=(t 'inventory.labels.serial_number') class="col-sm-4"}} - {{date-picker property="expirationDate" label=(t 'inventory.labels.expiration_date') minDate="now" class="col-sm-2"}} + {{em-input property="vendorItemNo" label=(t 'inventory.labels.vendorItemNumber') class="col-sm-4"}} + {{em-input property="lotNumber" label=(t 'inventory.labels.serialNumber') class="col-sm-4"}} + {{date-picker property="expirationDate" label=(t 'inventory.labels.expirationDate') minDate="now" class="col-sm-2"}}

@@ -52,15 +52,15 @@

{{#if model.invoiceItems}} -

{{t 'inventory.labels.invoice_items'}}

+

{{t 'inventory.labels.invoiceItems'}}

- - - + + + {{#each model.invoiceItems as |invoiceItem|}} @@ -102,7 +102,7 @@ {{/each}}
{{t 'inventory.labels.name'}} {{t 'labels.quantity'}} {{t 'inventory.labels.cost'}}{{t 'inventory.labels.item_number'}}{{t 'inventory.labels.serial_number'}}{{t 'inventory.labels.expiration_date'}}{{t 'inventory.labels.itemNumber'}}{{t 'inventory.labels.serialNumber'}}{{t 'inventory.labels.expirationDate'}} {{t 'inventory.labels.action'}}
-

{{t 'inventory.labels.total_received' total=totalReceived}}

+

{{t 'inventory.labels.totalReceived' total=totalReceived}}

{{/if}} {{/em-form}} {{/edit-panel}} diff --git a/app/inventory/delete/controller.js b/app/inventory/delete/controller.js index 27d143d7ff..247b57483b 100644 --- a/app/inventory/delete/controller.js +++ b/app/inventory/delete/controller.js @@ -1,5 +1,5 @@ import { translationMacro as t } from 'ember-i18n'; import AbstractDeleteController from 'hospitalrun/controllers/abstract-delete-controller'; export default AbstractDeleteController.extend({ - title: t('inventory.labels.delete_item') + title: t('inventory.labels.deleteItem') }); diff --git a/app/inventory/edit/route.js b/app/inventory/edit/route.js index 29d28ba231..2225da4cbd 100644 --- a/app/inventory/edit/route.js +++ b/app/inventory/edit/route.js @@ -3,9 +3,9 @@ import Ember from 'ember'; import { translationMacro as t } from 'ember-i18n'; import InventoryId from 'hospitalrun/mixins/inventory-id'; export default AbstractEditRoute.extend(InventoryId, { - editTitle: t('inventory.labels.edit_item'), + editTitle: t('inventory.labels.editItem'), modelName: 'inventory', - newTitle: t('inventory.labels.new_item'), + newTitle: t('inventory.labels.newItem'), actions: { adjustItems: function(inventoryLocation) { diff --git a/app/inventory/edit/template.hbs b/app/inventory/edit/template.hbs index 5a8962f45d..1c8d120bc6 100644 --- a/app/inventory/edit/template.hbs +++ b/app/inventory/edit/template.hbs @@ -2,7 +2,7 @@ {{#em-form model=model submitButton=false }} {{partial 'inventory-basic'}} {{#if model.isNew}} -

{{t 'inventory.labels.purchase_info'}}

+

{{t 'inventory.labels.purchaseInfo'}}

{{partial 'inv-purchase'}} {{else}} {{#if quantityDiscrepency}} @@ -18,21 +18,21 @@

{{t 'inventory.labels.purchases'}} {{#if canAddPurchase}} - + {{/if}}

- - - - - + + + + + - - + + - + {{#each model.purchases as |purchase|}} @@ -43,9 +43,9 @@ @@ -61,7 +61,7 @@
{{t 'inventory.labels.date_received'}}{{t 'inventory.labels.purchase_cost'}}{{t 'inventory.labels.cost_per_unit'}}{{t 'inventory.labels.original_quantity'}}{{t 'inventory.labels.current_quantity'}}{{t 'inventory.labels.dateReceived'}}{{t 'inventory.labels.purchaseCost'}}{{t 'inventory.labels.costPerUnit'}}{{t 'inventory.labels.originalQuantity'}}{{t 'inventory.labels.currentQuantity'}} {{t 'inventory.labels.gift'}}{{t 'inventory.labels.serial_number'}}{{t 'inventory.labels.expiration_date'}}{{t 'inventory.labels.serialNumber'}}{{t 'inventory.labels.expirationDate'}} {{t 'inventory.labels.vendor'}}{{t 'inventory.labels.invoice_number'}}{{t 'inventory.labels.invoiceNumber'}}
{{purchase.currentQuantity}} {{#if purchase.giftInKind}} - {{t 'inventory.labels.gift_in_kind_yes'}} + {{t 'inventory.labels.giftInKindYes'}} {{else}} - {{t 'inventory.labels.gift_in_kind_no'}} + {{t 'inventory.labels.giftInKindNo'}} {{/if}} {{purchase.lotNumber}}
- + {{#if canAdjustLocation}} @@ -87,7 +87,7 @@

{{t 'inventory.labels.transactions'}}

{{t 'inventory.labels.location'}}{{t 'inventory.labels.aisle_location'}}{{t 'inventory.labels.aisleLocation'}} {{t 'labels.quantity'}}{{t 'labels.action'}}
- + @@ -125,11 +125,11 @@ {{/if}} {{/if}} {{#if transaction.isTransfer}} - {{t 'inventory.edit.transferred_from'}} + {{t 'inventory.edit.transferredFrom'}} {{#each transaction.locationsAffected as |location|}} {{location.name}}
{{/each}} - {{t 'inventory.edit.transferred_to'}} {{transaction.deliveryDetails}} + {{t 'inventory.edit.transferredTo'}} {{transaction.deliveryDetails}} {{/if}} diff --git a/app/inventory/index/template.hbs b/app/inventory/index/template.hbs index d480cd0b43..5dfeda9831 100755 --- a/app/inventory/index/template.hbs +++ b/app/inventory/index/template.hbs @@ -26,7 +26,7 @@
{{t 'inventory.labels.date_completed'}}{{t 'inventory.labels.dateCompleted'}} {{t 'labels.quantity'}} {{t 'inventory.labels.transaction'}} {{t 'inventory.labels.expense'}}
{{else}}
-

{{t 'inventory.messages.no_requests'}}{{#if canAdd}} {{t 'inventory.messages.create_request'}}{{/if}}

+

{{t 'inventory.messages.noRequests'}}{{#if canAdd}} {{t 'inventory.messages.createRequest'}}{{/if}}

{{/if}} {{/item-listing}} diff --git a/app/inventory/purchase/edit/controller.js b/app/inventory/purchase/edit/controller.js index a5aeb6f3f9..bf9bf37387 100644 --- a/app/inventory/purchase/edit/controller.js +++ b/app/inventory/purchase/edit/controller.js @@ -44,9 +44,9 @@ export default AbstractEditController.extend(UnitTypes, { let i18n = this.get('i18n'); var isNew = this.get('model.isNew'); if (isNew) { - return i18n.t('inventory.titles.add_purchase'); + return i18n.t('inventory.titles.addPurchase'); } - return i18n.t('inventory.titles.edit_purchase'); + return i18n.t('inventory.titles.editPurchase'); }.property('model.isNew'), beforeUpdate: function() { diff --git a/app/inventory/quick-add/controller.js b/app/inventory/quick-add/controller.js index 3d24298a9c..5f684c76ad 100644 --- a/app/inventory/quick-add/controller.js +++ b/app/inventory/quick-add/controller.js @@ -1,7 +1,7 @@ import InventoryEditController from 'hospitalrun/inventory/edit/controller'; import { translationMacro as t } from 'ember-i18n'; export default InventoryEditController.extend({ - title: t('inventory.titles.inventory_item'), + title: t('inventory.titles.inventoryItem'), updateCapability: 'add_inventory_item', diff --git a/app/inventory/quick-add/template.hbs b/app/inventory/quick-add/template.hbs index c3c61e78e0..a797db0b2a 100644 --- a/app/inventory/quick-add/template.hbs +++ b/app/inventory/quick-add/template.hbs @@ -1,9 +1,9 @@ {{#modal-dialog isUpdateDisabled=isUpdateDisabled - title=(t 'inventory.titles.quick_add_title') + title=(t 'inventory.titles.quickAddTitle') updateButtonAction=updateButtonAction updateButtonText=updateButtonText }} - + {{#em-form model=model submitButton=false }} {{partial 'inventory-basic'}} {{/em-form}} diff --git a/app/inventory/reports/controller.js b/app/inventory/reports/controller.js index cae6f4641f..7188961722 100644 --- a/app/inventory/reports/controller.js +++ b/app/inventory/reports/controller.js @@ -11,7 +11,7 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number endDate: null, expenseCategories: Ember.computed(function() { let i18n = this.get('i18n'); - return [i18n.t('inventory.labels.inventory_consumed'), i18n.t('inventory.labels.gift_usage'), i18n.t('inventory.labels.inventory_obsolence')]; + return [i18n.t('inventory.labels.inventoryConsumed'), i18n.t('inventory.labels.giftUsage'), i18n.t('inventory.labels.inventoryObsolence')]; }), expenseMap: null, filterLocation: null, @@ -42,7 +42,7 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number property: 'inventoryItem.name' }, transactionType: { - label: i18n.t('inventory.labels.adjustment_type'), + label: i18n.t('inventory.labels.adjustmentType'), include: false, property: 'transactionType' }, @@ -62,18 +62,18 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number property: 'inventoryItem.inventoryType' }, xref: { - label: i18n.t('inventory.labels.cross_reference'), + label: i18n.t('inventory.labels.crossReference'), include: false, property: 'inventoryItem.crossReference' }, reorder: { - label: i18n.t('inventory.labels.reorder_point'), + label: i18n.t('inventory.labels.reorderPoint'), include: false, property: 'inventoryItem.reorderPoint', format: '_numberFormat' }, price: { - label: i18n.t('inventory.labels.sale_price_per_unit'), + label: i18n.t('inventory.labels.salePricePerUnit'), include: false, property: 'inventoryItem.price', format: '_numberFormat' @@ -85,28 +85,28 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number format: '_numberFormat' }, consumedPerDay: { - label: i18n.t('inventory.labels.consumption_rate'), + label: i18n.t('inventory.labels.consumptionRate'), include: false, property: 'consumedPerDay' }, daysLeft: { - label: i18n.t('inventory.labels.days_left'), + label: i18n.t('inventory.labels.daysLeft'), include: false, property: 'daysLeft' }, unit: { - label: i18n.t('inventory.labels.distribution_unit'), + label: i18n.t('inventory.labels.distributionUnit'), include: true, property: 'inventoryItem.distributionUnit' }, unitcost: { - label: i18n.t('inventory.labels.unit_cost'), + label: i18n.t('inventory.labels.unitCost'), include: true, property: 'unitCost', format: '_numberFormat' }, total: { - label: i18n.t('inventory.labels.total_cost'), + label: i18n.t('inventory.labels.totalCost'), include: true, property: 'totalCost', format: '_numberFormat' @@ -138,43 +138,43 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number reportTypes: Ember.computed(function() { let i18n = this.get('i18n'); return [{ - name: i18n.t('inventory.reports.days_supply'), + name: i18n.t('inventory.reports.daysSupply'), value: 'daysLeft' }, { name: i18n.t('inventory.reports.adjustment'), value: 'detailedAdjustment' }, { - name: i18n.t('inventory.reports.purchase_detail'), + name: i18n.t('inventory.reports.purchaseDetail'), value: 'detailedPurchase' }, { - name: i18n.t('inventory.reports.stock_usage_detail'), + name: i18n.t('inventory.reports.stockUsageDetail'), value: 'detailedUsage' }, { - name: i18n.t('inventory.reports.stock_transfer_detail'), + name: i18n.t('inventory.reports.stockTransferDetail'), value: 'detailedTransfer' }, { - name: i18n.t('inventory.reports.expense_detail'), + name: i18n.t('inventory.reports.expenseDetail'), value: 'detailedExpense' }, { name: i18n.t('inventory.reports.expiration'), value: 'expiration' }, { - name: i18n.t('inventory.reports.inv_location'), + name: i18n.t('inventory.reports.invLocation'), value: 'byLocation' }, { - name: i18n.t('inventory.reports.inv_valuation'), + name: i18n.t('inventory.reports.invValuation'), value: 'valuation' }, { - name: i18n.t('inventory.reports.expense_sum'), + name: i18n.t('inventory.reports.expenseSum'), value: 'summaryExpense' }, { - name: i18n.t('inventory.reports.purchase_sum'), + name: i18n.t('inventory.reports.purchaseSum'), value: 'summaryPurchase' }, { - name: i18n.t('inventory.reports.stock_usage_sum'), + name: i18n.t('inventory.reports.stockUsageSum'), value: 'summaryUsage' }, { - name: i18n.t('inventory.reports.stock_transfer_sum'), + name: i18n.t('inventory.reports.stockTransferSum'), value: 'summaryTransfer' }, { name: i18n.t('inventory.reports.finance'), @@ -478,7 +478,7 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number totalLabel; this._addReportRow({ inventoryItem: { - name: i18n.t('inventory.reports.rows.expenses_for') + category + name: i18n.t('inventory.reports.rows.expensesFor') + category } }); expenseMap[category].expenseAccounts.forEach(function(expenseAccount) { @@ -488,17 +488,17 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number }.bind(this)); } if (Ember.isEmpty(expenseAccount.name)) { - expenseAccountName = i18n.t('inventory.reports.rows.no_account'); + expenseAccountName = i18n.t('inventory.reports.rows.noAccount'); } else { expenseAccountName = expenseAccount.name; } - totalLabel = i18n.t('inventory.reports.rows.subtotal_for', { category: category, account: expenseAccountName }); + totalLabel = i18n.t('inventory.reports.rows.subtotalFor', { category: category, account: expenseAccountName }); this._addReportRow({ totalCost: totalLabel + this._numberFormat(expenseAccount.total) }, true); categoryTotal += expenseAccount.total; }.bind(this)); - totalLabel = i18n.t('inventory.reports.rows.total_for', { var: category }); + totalLabel = i18n.t('inventory.reports.rows.totalFor', { var: category }); this._addReportRow({ totalCost: totalLabel + this._numberFormat(categoryTotal) }, true); @@ -519,7 +519,7 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number locationSummary = locationSummary.sortBy('name'); locationSummary.forEach(function(location) { parentLocation = this._getWarehouseLocationName(location.name); - var label = i18n.t('inventory.reports.rows.total_for', { var: currentLocation }); + var label = i18n.t('inventory.reports.rows.totalFor', { var: currentLocation }); if (currentLocation !== parentLocation) { this._addTotalsRow(label, locationCost, parentCount); parentCount = 0; @@ -548,7 +548,7 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number } }.bind(this)); if (parentCount > 0) { - this._addTotalsRow(i18n.t('inventory.reports.rows.total_for', { var: parentLocation }), locationCost, parentCount); + this._addTotalsRow(i18n.t('inventory.reports.rows.totalFor', { var: parentLocation }), locationCost, parentCount); } }, @@ -594,7 +594,7 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number ]); this.set('showReportResults', true); this.set('reportHeaders', - [i18n.t('labels.id'), i18n.t('labels.name'), i18n.t('inventory.labels.current_quantity'), i18n.t('inventory.labels.distribution_unit'), i18n.t('inventory.labels.expiration_date'), i18n.t('inventory.labels.location')]); + [i18n.t('labels.id'), i18n.t('labels.name'), i18n.t('inventory.labels.currentQuantity'), i18n.t('inventory.labels.distributionUnit'), i18n.t('inventory.labels.expirationDate'), i18n.t('inventory.labels.location')]); this._generateExport(); this._setReportTitle(); this.closeProgressModal(); @@ -614,9 +614,9 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number var i = this._numberFormat(beginningBalance + inventoryAdjustment); let i18n = this.get('i18n'); if ((beginningBalance + inventoryAdjustment) < 0) { - this.get('reportRows').addObject([i18n.t('inventory.reports.rows.balance_end'), '', '(' + i + ')']); + this.get('reportRows').addObject([i18n.t('inventory.reports.rows.balanceEnd'), '', '(' + i + ')']); } else { - this.get('reportRows').addObject([i18n.t('inventory.reports.rows.balance_end'), '', i]); + this.get('reportRows').addObject([i18n.t('inventory.reports.rows.balanceEnd'), '', i]); } this.set('showReportResults', true); this.set('reportHeaders', [i18n.t('inventory.reports.rows.category'), i18n.t('labels.type'), i18n.t('inventory.labels.total')]); @@ -624,7 +624,7 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number this._setReportTitle(); this.closeProgressModal(); }.bind(this), function(err) { - this._notifyReportError(this.get('i18n').t('inventory.reports.rows.err_in_fin_sum') + err); + this._notifyReportError(this.get('i18n').t('inventory.reports.rows.errInFinSum') + err); }.bind(this)); }.bind(this)); }, @@ -684,7 +684,7 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number purchaseTotal += i; this.get('reportRows').addObject(['', key, this._numberFormat(i)]); }.bind(this)); - this.get('reportRows').addObject([i18n.t('inventory.reports.rows.total_purchases'), '', this._numberFormat(purchaseTotal)]); + this.get('reportRows').addObject([i18n.t('inventory.reports.rows.totalPurchases'), '', this._numberFormat(purchaseTotal)]); adjustedValue += purchaseTotal; } // write the consumed rows @@ -692,7 +692,7 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number this.get('reportRows').addObject([i18n.t('inventory.reports.rows.consumed'), '', '']); var overallValue = 0; if (Object.keys(consumed).length > 0) { - this.get('reportRows').addObject([i18n.t('inventory.reports.rows.consumed_puchases'), '', '']); + this.get('reportRows').addObject([i18n.t('inventory.reports.rows.consumedPuchases'), '', '']); var consumedTotal = 0; Object.keys(consumed).forEach(function(key) { var i = this._getValidNumber(consumed[key]); @@ -700,10 +700,10 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number this.get('reportRows').addObject(['', key, '(' + this._numberFormat(i) + ')']); }.bind(this)); overallValue += consumedTotal; - this.get('reportRows').addObject([i18n.t('inventory.reports.rows.consumed_purchases_total'), '', '(' + this._numberFormat(consumedTotal) + ')']); + this.get('reportRows').addObject([i18n.t('inventory.reports.rows.consumedPurchasesTotal'), '', '(' + this._numberFormat(consumedTotal) + ')']); } if (Object.keys(gikConsumed).length > 0) { - this.get('reportRows').addObject([i18n.t('inventory.reports.rows.consumed_gik'), '', '']); + this.get('reportRows').addObject([i18n.t('inventory.reports.rows.consumedGik'), '', '']); var gikTotal = 0; Object.keys(gikConsumed).forEach(function(key) { var i = this._getValidNumber(gikConsumed[key]); @@ -711,9 +711,9 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number this.get('reportRows').addObject(['', key, '(' + this._numberFormat(i) + ')']); }.bind(this)); overallValue += gikTotal; - this.get('reportRows').addObject([i18n.t('inventory.reports.rows.consumed_gik_total'), '', '(' + this._numberFormat(gikTotal) + ')']); + this.get('reportRows').addObject([i18n.t('inventory.reports.rows.consumedGikTotal'), '', '(' + this._numberFormat(gikTotal) + ')']); } - this.get('reportRows').addObject([i18n.t('inventory.reports.rows.consumed_total'), '', '(' + this._numberFormat(overallValue) + ')']); + this.get('reportRows').addObject([i18n.t('inventory.reports.rows.consumedTotal'), '', '(' + this._numberFormat(overallValue) + ')']); adjustedValue -= overallValue; } // write the adjustment rows @@ -735,9 +735,9 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number } }.bind(this)); if (adjustmentTotal < 0) { - this.get('reportRows').addObject([i18n.t('inventory.reports.rows.adjustments_total'), '', '(' + this._numberFormat(adjustmentTotal) + ')']); + this.get('reportRows').addObject([i18n.t('inventory.reports.rows.adjustmentsTotal'), '', '(' + this._numberFormat(adjustmentTotal) + ')']); } else { - this.get('reportRows').addObject([i18n.t('inventory.reports.rows.adjustments_total'), '', this._numberFormat(adjustmentTotal)]); + this.get('reportRows').addObject([i18n.t('inventory.reports.rows.adjustmentsTotal'), '', this._numberFormat(adjustmentTotal)]); } adjustedValue += adjustmentTotal; @@ -805,9 +805,9 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number } }.bind(this)); if (beginningBalance < 0) { - this.get('reportRows').addObject([i18n.t('inventory.reports.rows.balance_begin'), '', '(' + this._numberFormat(beginningBalance) + ')']); + this.get('reportRows').addObject([i18n.t('inventory.reports.rows.balanceBegin'), '', '(' + this._numberFormat(beginningBalance) + ')']); } else { - this.get('reportRows').addObject([i18n.t('inventory.reports.rows.balance_begin'), '', this._numberFormat(beginningBalance)]); + this.get('reportRows').addObject([i18n.t('inventory.reports.rows.balanceBegin'), '', this._numberFormat(beginningBalance)]); } resolve(beginningBalance); }.bind(this), reject); @@ -1107,10 +1107,10 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number } this._finishReport(); }.bind(this), function(err) { - this._notifyReportError(i18n.t('inventory.reports.rows.err_in_find_pur') + err); + this._notifyReportError(i18n.t('inventory.reports.rows.errInFindPur') + err); }.bind(this)); }.bind(this), function(err) { - this._notifyReportError(i18n.t('inventory.reports.rows.err_in_find_pur') + err); + this._notifyReportError(i18n.t('inventory.reports.rows.errInFindPur') + err); }.bind(this)); }, diff --git a/app/inventory/reports/route.js b/app/inventory/reports/route.js index 5db351e3c0..e80df5a70c 100644 --- a/app/inventory/reports/route.js +++ b/app/inventory/reports/route.js @@ -2,7 +2,7 @@ import AbstractIndexRoute from 'hospitalrun/routes/abstract-index-route'; import Ember from 'ember'; import { translationMacro as t } from 'ember-i18n'; export default AbstractIndexRoute.extend({ - pageTitle: t('inventory.titles.inventory_report'), + pageTitle: t('inventory.titles.inventoryReport'), // No model for reports; data gets retrieved when report is run. model: function() { diff --git a/app/inventory/reports/template.hbs b/app/inventory/reports/template.hbs index b46fb17e55..301855393e 100644 --- a/app/inventory/reports/template.hbs +++ b/app/inventory/reports/template.hbs @@ -3,7 +3,7 @@ {{#em-form model=this submitButton=false }}
- + {{select-list action=(action (mut reportType)) class='form-control' @@ -23,10 +23,10 @@
{{#if showEffectiveDate}} - {{date-picker property="endDate" label=(t 'inventory.labels.date_effective') class="col-sm-4"}} + {{date-picker property="endDate" label=(t 'inventory.labels.dateEffective') class="col-sm-4"}} {{else}} - {{date-picker property="startDate" label=(t 'inventory.labels.date_start') class="col-sm-4 test-start-date"}} - {{date-picker property="endDate" label=(t 'inventory.labels.date_end') class="col-sm-4 test-end-date"}} + {{date-picker property="startDate" label=(t 'inventory.labels.dateStart') class="col-sm-4 test-start-date"}} + {{date-picker property="endDate" label=(t 'inventory.labels.dateEnd') class="col-sm-4 test-end-date"}} {{/if}}
{{#if useFieldPicker}} diff --git a/app/inventory/request/controller.js b/app/inventory/request/controller.js index cfa5e52961..15821700d0 100755 --- a/app/inventory/request/controller.js +++ b/app/inventory/request/controller.js @@ -120,11 +120,11 @@ export default AbstractEditController.extend(FulfillRequest, InventoryLocations, }, showRemoveItem: function(item) { - var message = this.get('i18n').t('inventory.messages.remove_item_request'), + var message = this.get('i18n').t('inventory.messages.removeItemRequest'), model = Ember.Object.create({ itemToRemove: item }), - title = this.get('i18n').t('inventory.titles.remove_item'); + title = this.get('i18n').t('inventory.titles.removeItem'); this.displayConfirm(title, message, 'removeItem', model); }, @@ -190,9 +190,9 @@ export default AbstractEditController.extend(FulfillRequest, InventoryLocations, afterUpdate: function() { var updateViaFulfillRequest = this.get('updateViaFulfillRequest'); if (updateViaFulfillRequest) { - this.displayAlert(this.get('i18n').t('inventory.titles.request_fulfilled'), this.get('i18n').t('inventory.messages.request_fulfilled'), 'allRequests'); + this.displayAlert(this.get('i18n').t('inventory.titles.requestFulfilled'), this.get('i18n').t('inventory.messages.requestFulfilled'), 'allRequests'); } else { - this.displayAlert(this.get('i18n').t('inventory.titles.request_updated'), this.get('i18n').t('inventory.messages.request_updated')); + this.displayAlert(this.get('i18n').t('inventory.titles.requestUpdated'), this.get('i18n').t('inventory.messages.requestUpdated')); } }, diff --git a/app/inventory/request/route.js b/app/inventory/request/route.js index bbabf87abc..043b1bafaa 100755 --- a/app/inventory/request/route.js +++ b/app/inventory/request/route.js @@ -2,9 +2,9 @@ import AbstractEditRoute from 'hospitalrun/routes/abstract-edit-route'; import Ember from 'ember'; import { translationMacro as t } from 'ember-i18n'; export default AbstractEditRoute.extend({ - editTitle: t('inventory.titles.edit_request'), + editTitle: t('inventory.titles.editRequest'), modelName: 'inv-request', - newTitle: t('inventory.titles.add_request'), + newTitle: t('inventory.titles.addRequest'), database: Ember.inject.service(), getNewData: function() { return Ember.RSVP.resolve({ diff --git a/app/inventory/request/template.hbs b/app/inventory/request/template.hbs index 4039f7be8c..7a754bd160 100755 --- a/app/inventory/request/template.hbs +++ b/app/inventory/request/template.hbs @@ -6,11 +6,11 @@

{{model.inventoryItem.name}}

- +

{{model.quantity}}

- +

{{model.inventoryItem.quantity}}

{{else}} @@ -18,7 +18,7 @@ {{inventory-typeahead class="col-sm-8 test-inv-item" property="inventoryItemTypeAhead" - label=(t 'inventory.labels.inventory_item') + label=(t 'inventory.labels.inventoryItem') content=inventoryList selection=selectedInventoryItem }} @@ -31,7 +31,7 @@
{{#if showRequestedItems}} -

{{t 'inventory.labels.requested_items'}}

+

{{t 'inventory.labels.requestedItems'}}

@@ -60,26 +60,26 @@ {{/if}} {{#if canFulfill}}
- +
- {{em-checkbox label=(t 'inventory.labels.fulfill_request') property="shouldFulfillRequest"}} + {{em-checkbox label=(t 'inventory.labels.fulfillRequest') property="shouldFulfillRequest"}} {{/if}} {{/if}} - {{select-or-typeahead property="deliveryLocation" label=(t 'inventory.labels.delivery_location') list=warehouseList selection=model.deliveryLocation class="test-delivery-location"}} - {{select-or-typeahead property="deliveryAisle" label=(t 'inventory.labels.delivery_aisle') list=aisleLocationList selection=model.deliveryAisle class="test-delivery-aisle"}} - {{select-or-typeahead property="expenseAccount" label=(t 'inventory.labels.bill_to') list=expenseAccountList selection=model.expenseAccount class="test-bill-to"}} + {{select-or-typeahead property="deliveryLocation" label=(t 'inventory.labels.deliveryLocation') list=warehouseList selection=model.deliveryLocation class="test-delivery-location"}} + {{select-or-typeahead property="deliveryAisle" label=(t 'inventory.labels.deliveryAisle') list=aisleLocationList selection=model.deliveryAisle class="test-delivery-aisle"}} + {{select-or-typeahead property="expenseAccount" label=(t 'inventory.labels.billTo') list=expenseAccountList selection=model.expenseAccount class="test-bill-to"}} {{#if isFulfilling}}
{{date-picker property="dateCompleted" label=(t 'labels.dateCompleted') class="col-sm-4"}}
- {{inventory-location-picker label=(t 'inventory.labels.pull_from') quantityRequested=model.quantity + {{inventory-location-picker label=(t 'inventory.labels.pullFrom') quantityRequested=model.quantity locationList=model.inventoryItem.availableLocations selectedLocations=model.inventoryLocations }}
- +
- {{em-checkbox label=(t 'inventory.labels.mark_as_consumed') property="markAsConsumed"}} + {{em-checkbox label=(t 'inventory.labels.markAsConsumed') property="markAsConsumed"}} {{/if}} {{/em-form}} -{{/edit-panel}} \ No newline at end of file +{{/edit-panel}} diff --git a/app/inventory/search/template.hbs b/app/inventory/search/template.hbs index 80762bdbb5..38676c9b93 100644 --- a/app/inventory/search/template.hbs +++ b/app/inventory/search/template.hbs @@ -1,3 +1,3 @@ -{{#search-listing newButtonText=(t 'inventory.labels.new_item') allButtonText=(t 'inventory.labels.all_inventory')}} +{{#search-listing newButtonText=(t 'inventory.labels.newItem') allButtonText=(t 'inventory.labels.allInventory')}} {{partial 'inventory/listing'}} -{{/search-listing}} \ No newline at end of file +{{/search-listing}} diff --git a/app/inventory/transfer/template.hbs b/app/inventory/transfer/template.hbs index feb885a233..f1ca026ac1 100644 --- a/app/inventory/transfer/template.hbs +++ b/app/inventory/transfer/template.hbs @@ -9,20 +9,20 @@

{{model.transferItem.name}}

- +

{{model.locationName}}

- +

{{model.quantity}}

- {{select-or-typeahead class="required" property="transferLocation" label=(t 'inventory.labels.transfer_to') list=warehouseList selection=model.transferLocation }} - {{select-or-typeahead property="transferAisleLocation" label=(t 'inventory.labels.transfer_to_aisle') list=aisleLocationList selection=model.transferAisleLocation }} + {{select-or-typeahead class="required" property="transferLocation" label=(t 'inventory.labels.transferTo') list=warehouseList selection=model.transferLocation }} + {{select-or-typeahead property="transferAisleLocation" label=(t 'inventory.labels.transferToAisle') list=aisleLocationList selection=model.transferAisleLocation }}
{{em-input property="adjustmentQuantity" label=(t 'labels.quantity') class="col-sm-3 required"}}
- {{date-picker property="dateCompleted" label=(t 'inventory.labels.date_tranferred') class="col-sm-4 required"}} + {{date-picker property="dateCompleted" label=(t 'inventory.labels.dateTransferred') class="col-sm-4 required"}}
{{/em-form}} {{/modal-dialog}} diff --git a/app/labs/completed/route.js b/app/labs/completed/route.js index 6ab691ff2d..44329d7e35 100755 --- a/app/labs/completed/route.js +++ b/app/labs/completed/route.js @@ -2,6 +2,6 @@ import LabsIndexRoute from 'hospitalrun/labs/index/route'; import { translationMacro as t } from 'ember-i18n'; export default LabsIndexRoute.extend({ - pageTitle: t('labs.completed_title'), + pageTitle: t('labs.completedTitle'), searchStatus: 'Completed' }); diff --git a/app/labs/completed/template.hbs b/app/labs/completed/template.hbs index 5ead09343d..1015111ce7 100644 --- a/app/labs/completed/template.hbs +++ b/app/labs/completed/template.hbs @@ -6,7 +6,7 @@ - + @@ -16,7 +16,7 @@
{{t 'labels.name'}} {{t 'labels.dateCompleted'}} {{t 'labels.patient'}} {{t 'labels.requestedBy'}}{{t 'labs.labels.lab_type'}}{{t 'labs.labels.labType'}} {{t 'labels.results'}} {{t 'labels.notes'}}
{{else}}
-

{{t 'labs.messages.no_completed'}}

+

{{t 'labs.messages.noCompleted'}}

{{/if}} {{/item-listing}} diff --git a/app/labs/delete/controller.js b/app/labs/delete/controller.js index 9a861668c0..2788abf301 100644 --- a/app/labs/delete/controller.js +++ b/app/labs/delete/controller.js @@ -3,7 +3,7 @@ import PatientSubmodule from 'hospitalrun/mixins/patient-submodule'; import { translationMacro as t } from 'ember-i18n'; export default AbstractDeleteController.extend(PatientSubmodule, { - title: t('labs.delete_title'), + title: t('labs.deleteTitle'), actions: { delete: function() { diff --git a/app/labs/delete/template.hbs b/app/labs/delete/template.hbs index 6710b72b7c..c4545f9077 100644 --- a/app/labs/delete/template.hbs +++ b/app/labs/delete/template.hbs @@ -5,6 +5,6 @@ updateButtonText=updateButtonText }}
- {{t 'labs.messages.confirm_deletion'}} + {{t 'labs.messages.confirmDeletion'}}
{{/modal-dialog}} diff --git a/app/labs/edit/controller.js b/app/labs/edit/controller.js index d2faf404c1..479d1b8b13 100644 --- a/app/labs/edit/controller.js +++ b/app/labs/edit/controller.js @@ -94,11 +94,11 @@ export default AbstractEditController.extend(ChargeActions, PatientSubmodule, { alertMessage, alertTitle; if (this.get('model.status') === 'Completed') { - alertTitle = i18n.t('labs.alerts.request_completed_title'); - alertMessage = i18n.t('labs.alerts.request_completed_message'); + alertTitle = i18n.t('labs.alerts.requestCompletedTitle'); + alertMessage = i18n.t('labs.alerts.requestCompletedMessage'); } else { - alertTitle = i18n.t('labs.alerts.request_saved_title'); - alertMessage = i18n.t('labs.alerts.request_saved_message'); + alertTitle = i18n.t('labs.alerts.requestSavedTitle'); + alertMessage = i18n.t('labs.alerts.requestSavedMessage'); } if (multipleRecords) { afterDialogAction = this.get('cancelAction'); diff --git a/app/labs/edit/route.js b/app/labs/edit/route.js index 18e5ff8877..3d586ebea3 100644 --- a/app/labs/edit/route.js +++ b/app/labs/edit/route.js @@ -5,9 +5,9 @@ import PatientListRoute from 'hospitalrun/mixins/patient-list-route'; import { translationMacro as t } from 'ember-i18n'; export default AbstractEditRoute.extend(ChargeRoute, PatientListRoute, { - editTitle: t('labs.edit_title'), + editTitle: t('labs.editTitle'), modelName: 'lab', - newTitle: t('labs.new_title'), + newTitle: t('labs.newTitle'), pricingCategory: 'Lab', actions: { diff --git a/app/labs/edit/template.hbs b/app/labs/edit/template.hbs index 70866daa17..cfd3880222 100644 --- a/app/labs/edit/template.hbs +++ b/app/labs/edit/template.hbs @@ -10,12 +10,12 @@ {{em-select class="col-xs-3 required test-visit-type" label=(t 'labels.visit') property="visit" content=patientVisitsForSelect optionValuePath="selectObject" optionLabelPath="selectObject.visitDescription" - prompt=(t 'labs.labels.add_new_visit') + prompt=(t 'labs.labels.addNewVisit') selected=model.visit }} {{checkbox-or-typeahead property="labTypeName" - label=(t 'labs.labels.lab_type') list=objectTypeList + label=(t 'labs.labels.labType') list=objectTypeList selection=selectedLabType optionLabelPath='name' typeAheadType='pricing' @@ -30,7 +30,7 @@

{{model.visit.visitDate}}

- +

{{model.labType.name}}

diff --git a/app/labs/index/route.js b/app/labs/index/route.js index 293c0cd301..4cff3a09d4 100644 --- a/app/labs/index/route.js +++ b/app/labs/index/route.js @@ -3,7 +3,7 @@ import { translationMacro as t } from 'ember-i18n'; export default AbstractIndexRoute.extend({ modelName: 'lab', - pageTitle: t('labs.requests_title'), + pageTitle: t('labs.requestsTitle'), searchStatus: 'Requested', _getStartKeyFromItem: function(item) { diff --git a/app/labs/index/template.hbs b/app/labs/index/template.hbs index ce5cb23de1..18228c7426 100644 --- a/app/labs/index/template.hbs +++ b/app/labs/index/template.hbs @@ -5,7 +5,7 @@ {{t 'labels.dateRequested'}} {{t 'labels.patient'}} {{t 'labels.requestedBy'}} - {{t 'labs.labels.lab_type'}} + {{t 'labs.labels.labType'}} {{t 'labels.notes'}} {{#if showActions}} {{t 'labels.actions'}} @@ -21,7 +21,7 @@ {{else}}
-

{{t 'labs.messages.no_items_found'}} {{#if canAdd}}{{t 'labs.messages.create_new_record'}}{{/if}}

+

{{t 'labs.messages.noItemsFound'}} {{#if canAdd}}{{t 'labs.messages.createNewRecord'}}{{/if}}

{{/if}} {{/item-listing}} diff --git a/app/labs/route.js b/app/labs/route.js index 180fbe87e3..0875cb3943 100644 --- a/app/labs/route.js +++ b/app/labs/route.js @@ -8,6 +8,6 @@ export default AbstractModuleRoute.extend({ }], allowSearch: false, moduleName: 'labs', - newButtonText: t('labs.buttons.new_button'), - sectionTitle: t('labs.section_title') + newButtonText: t('labs.buttons.newButton'), + sectionTitle: t('labs.sectionTitle') }); diff --git a/app/locales/de/translations.js b/app/locales/de/translations.js index cc13c855cf..846dafd3ad 100644 --- a/app/locales/de/translations.js +++ b/app/locales/de/translations.js @@ -172,33 +172,33 @@ export default { }, inventory: { messages: { - no_requests: 'Keine Anfragen gefunden.', - create_request: 'Neue Anfrage erstellen?' + noRequests: 'Keine Anfragen gefunden.', + createRequest: 'Neue Anfrage erstellen?' } }, imaging: { - page_title: 'Anfrage zur Bildgebung', - section_title: 'Bildgebung', + pageTitle: 'Anfrage zur Bildgebung', + sectionTitle: 'Bildgebung', buttons: { - new_button: '+ Neue Bildgebung' + newButton: '+ Neue Bildgebung' }, labels: { radiologist: 'Radiologe', - add_new_visit: '--Neuen Besuch hinzufügen--' + addNewVisit: '--Neuen Besuch hinzufügen--' }, messages: { - no_completed: 'Keine erledigten Einträge gefunden.' + noCompleted: 'Keine erledigten Einträge gefunden.' }, titles: { - completed_imaging: 'Erledigte Bildgebung', - edit_title: 'Bildgebungs-Anfrage bearbeiten', - new_title: 'Neue Bildgebungs-Anfrage' + completedImaging: 'Erledigte Bildgebung', + editTitle: 'Bildgebungs-Anfrage bearbeiten', + newTitle: 'Neue Bildgebungs-Anfrage' }, alerts: { - completed_title: 'Bildgebungs-Anfrage gestellt', - completed_message: 'Die Anfrage zur Bildgebung wurde abgeschlossen.', - saved_title: 'Bildgebungs-Anfrage gespeichert', - saved_message: 'Die Anfrage zur Bildgebung wurde gespeichert.' + completedTitle: 'Bildgebungs-Anfrage gestellt', + completedMessage: 'Die Anfrage zur Bildgebung wurde abgeschlossen.', + savedTitle: 'Bildgebungs-Anfrage gespeichert', + savedMessage: 'Die Anfrage zur Bildgebung wurde gespeichert.' } } }; diff --git a/app/locales/en/translations.js b/app/locales/en/translations.js index 9ffea1a175..319e66fe8b 100644 --- a/app/locales/en/translations.js +++ b/app/locales/en/translations.js @@ -367,10 +367,10 @@ export default { forAuthorizedPersons: 'This report is for authorized persons only.' }, alerts: { - please_wait: 'Please Wait' + pleaseWait: 'Please Wait' }, headings: { - charged_items: 'Charged Items' + chargedItems: 'Charged Items' }, buttons: { addItem: 'Add Item', @@ -440,198 +440,198 @@ export default { quantity: 'Quantity at Completion:', reason: 'Reason:', returned: 'Returned from Patient:', - transferred_from: 'Transferred From:', - transferred_to: 'Transferred To:' + transferredFrom: 'Transferred From:', + transferredTo: 'Transferred To:' }, labels: { action: 'Action', add: 'Add', adjust: 'Adjust', - adjustment_date: 'Adjustment Date', - adjustment_for: 'Adjustment For', - adjustment_type: 'Adjustment Type', + adjustmentDate: 'Adjustment Date', + adjustmentFor: 'Adjustment For', + adjustmentType: 'Adjustment Type', aisle: 'Aisle', - aisle_location: 'Aisle Location', - all_inventory: 'All Inventory', - bill_to: 'Bill To', - consume_purchases: 'Consume Purchases', - consumption_rate: 'Consumption Rate', + aisleLocation: 'Aisle Location', + allInventory: 'All Inventory', + billTo: 'Bill To', + consumePurchases: 'Consume Purchases', + consumptionRate: 'Consumption Rate', cost: 'Cost', - cost_per_unit: 'Cost per Unit', - cross_reference: 'Cross Reference', - current_quantity: 'Current Quantity', - date_completed: 'Date Completed', - date_effective: 'Effective Date', - date_end: 'End Date', - date_start: 'Start Date', - date_received: 'Date Received', - date_tranferred: 'Date Transferred', - days_left: 'Days Left', - delivery_aisle: 'Delivery Aisle', - delivery_location: 'Delivery Location', - distribution_unit: 'Distribution Unit', - delete_item: 'Delete Item', + costPerUnit: 'Cost per Unit', + crossReference: 'Cross Reference', + currentQuantity: 'Current Quantity', + dateCompleted: 'Date Completed', + dateEffective: 'Effective Date', + dateEnd: 'End Date', + dateStart: 'Start Date', + dateReceived: 'Date Received', + dateTransferred: 'Date Transferred', + daysLeft: 'Days Left', + deliveryAisle: 'Delivery Aisle', + deliveryLocation: 'Delivery Location', + distributionUnit: 'Distribution Unit', + deleteItem: 'Delete Item', details: 'Details', - edit_item: 'Edit Item', + editItem: 'Edit Item', expense: 'Expense To', - expiration_date: 'Expiration Date', - fulfill_request: 'Fulfill Request', - fulfill_request_now: 'Fulfill Request Now', + expirationDate: 'Expiration Date', + fulfillRequest: 'Fulfill Request', + fulfillRequestNow: 'Fulfill Request Now', gift: 'Gift in Kind', - gift_usage: 'Gift in Kind Usage', - gift_in_kind_no: 'N', - gift_in_kind_yes: 'Y', - inventory_consumed: 'Inventory Consumed', - inventory_item: 'Inventory Item', - inventory_obsolence: 'Inventory Obsolence', - invoice_items: 'Invoice Items', - invoice_line_item: 'Invoice Line Item', - invoice_number: 'Invoice Number', + giftUsage: 'Gift in Kind Usage', + giftInKindNo: 'N', + giftInKindYes: 'Y', + inventoryConsumed: 'Inventory Consumed', + inventoryItem: 'Inventory Item', + inventoryObsolence: 'Inventory Obsolence', + invoiceItems: 'Invoice Items', + invoiceLineItem: 'Invoice Line Item', + invoiceNumber: 'Invoice Number', item: 'Item', items: 'Items', - item_number: 'Item Number', + itemNumber: 'Item Number', location: 'Location', locations: 'Locations', name: 'Name', - mark_as_consumed: 'Mark as Consumed', - new_item: 'New Item', - all_items: 'All Items', - original_quantity: 'Original Quantity', + markAsConsumed: 'Mark as Consumed', + newItem: 'New Item', + allItems: 'All Items', + originalQuantity: 'Original Quantity', print: 'Print', - print_barcode: 'Print Barcode', + printBarcode: 'Print Barcode', printer: 'Printer', - pull_from: 'Pull From', + pullFrom: 'Pull From', purchases: 'Purchases', - purchase_cost: 'Purchase Cost', - purchase_info: 'Purchase Information', + purchaseCost: 'Purchase Cost', + purchaseInfo: 'Purchase Information', quantity: 'Quantity ({{unit}})', - quantity_available: 'Quantity Available', - quantity_on_hand: 'Quantity on Hand', - quantity_requested: 'Quantity Requested', + quantityAvailable: 'Quantity Available', + quantityOnHand: 'Quantity on Hand', + quantityRequested: 'Quantity Requested', rank: 'Rank', reason: 'Reason', remove: 'Remove', - reorder_point: 'Reorder Point', - requested_items: 'Requested Items', - sale_price_per_unit: 'Sale Price per Unit', + reorderPoint: 'Reorder Point', + requestedItems: 'Requested Items', + salePricePerUnit: 'Sale Price per Unit', save: 'Save', - serial_number: 'Serial/Lot Number', + serialNumber: 'Serial/Lot Number', total: 'Total', - total_cost: 'Total Cost', - total_received: 'Total Received: {{total}}', + totalCost: 'Total Cost', + totalReceived: 'Total Received: {{total}}', transaction: 'Transaction', transactions: 'Transactions', transfer: 'Transfer', - transfer_from: 'Transfer From', - transfer_to: 'Transfer To Location', - transfer_to_aisle: 'Transfer to Aisle Location', + transferFrom: 'Transfer From', + transferTo: 'Transfer To Location', + transferToAisle: 'Transfer to Aisle Location', unit: 'Unit', - unit_cost: 'Unit Cost', + unitCost: 'Unit Cost', vendor: 'Vendor', - vendor_item_number: 'Vendor Item Number', + vendorItemNumber: 'Vendor Item Number', xref: 'XRef' }, messages: { adjust: 'Please adjust the quantities on the appropriate location(s) to account for the difference of {{difference}}.', - create_request: 'Create a new request?', + createRequest: 'Create a new request?', delete: 'Are you sure you wish to delete {{name}}?', - item_not_found: 'The inventory item {{item}} could not be found.
If you would like to create a new inventory item, fill in the information below.
Otherwise, press the Cancel button to return.', + itemNotFound: 'The inventory item {{item}} could not be found.
If you would like to create a new inventory item, fill in the information below.
Otherwise, press the Cancel button to return.', loading: 'Loading transactions ...', - purchase_saved: 'The inventory purchases have been successfully saved.', - no_requests: 'No requests found.', - no_items: 'No items found.', + purchaseSaved: 'The inventory purchases have been successfully saved.', + noRequests: 'No requests found.', + noItems: 'No items found.', quantity: 'The total quantity of ({{quantity}}) does not match the total quantity in the locations ({{locationQuantity}}).', - remove_item: 'Are you sure you want to remove this item from this invoice?', - remove_item_request: 'Are you sure you want to remove this item from this request?', - request_fulfilled: 'The inventory request has been fulfilled.', - request_updated: 'The inventory request has been updated.', + removeItem: 'Are you sure you want to remove this item from this invoice?', + removeItemRequest: 'Are you sure you want to remove this item from this request?', + requestFulfilled: 'The inventory request has been fulfilled.', + requestUpdated: 'The inventory request has been updated.', warning: 'Please fill in required fields (marked with *) and correct the errors before adding.' }, reports: { rows: { adjustments: 'Adjustments', - adjustments_total: 'Total Adjustments', - balance_begin: 'Beginning Balance', - balance_end: 'Ending Balance', + adjustmentsTotal: 'Total Adjustments', + balanceBegin: 'Beginning Balance', + balanceEnd: 'Ending Balance', category: 'Category', consumed: 'Consumed', - consumed_gik: 'GiK Consumed', - consumed_gik_total: 'Total GiK Consumed', - consumed_puchases: 'Purchases Consumed', - consumed_purchases_total: 'Total Purchases Consumed', - consumed_total: 'Total Consumed', - err_in_fin_sum: 'Error in _generateFinancialSummaryReport: ', - err_in_find_pur: 'Error in _findInventoryItemsByPurchase: ', - err_in_find_req: 'Error in _findInventoryItemsByRequest: ', - expenses_for: 'Expenses For: ', - no_account: '(No Account)', + consumedGik: 'GiK Consumed', + consumedGikTotal: 'Total GiK Consumed', + consumedPuchases: 'Purchases Consumed', + consumedPurchasesTotal: 'Total Purchases Consumed', + consumedTotal: 'Total Consumed', + errInFinSum: 'Error in _generateFinancialSummaryReport: ', + errInFindPur: 'Error in _findInventoryItemsByPurchase: ', + errInFindReq: 'Error in _findInventoryItemsByRequest: ', + expensesFor: 'Expenses For: ', + noAccount: '(No Account)', subtotal: 'Subtotal: ', - subtotal_for: 'Subtotal for {{category}} - {{account}}: ', + subtotalFor: 'Subtotal for {{category}} - {{account}}: ', total: 'Total: ', - total_for: 'Total for {{var}}: ', - total_purchases: 'Total Purchases', + totalFor: 'Total for {{var}}: ', + totalPurchases: 'Total Purchases', transfer1: '{{quantity}} from {{location}}', trasnfer2: 'From: {{source}} To: {{target}}' }, adjustment: 'Detailed Adjustment', - days_supply: 'Days Supply Left In Stock', - expense_detail: 'Detailed Expenses', - expense_sum: 'Summary Expenses', + daysSupply: 'Days Supply Left In Stock', + expenseDetail: 'Detailed Expenses', + expenseSum: 'Summary Expenses', expiration: 'Expiration Date', export: 'Export Report', fields: 'Fields to Include', finance: 'Finance Summary', generate: 'Generate Report', - inv_location: 'Inventory By Location', - inv_valuation: 'Inventory Valuation', - purchase_detail: 'Detailed Purchase', - purchase_sum: 'Summary Purchase', - report_type: 'Report Type', - stock_transfer_detail: 'Detailed Stock Transfer', - stock_transfer_sum: 'Summary Stock Transfer', - stock_usage_detail: 'Detailed Stock Usage', - stock_usage_sum: 'Summary Stock Usage' + invLocation: 'Inventory By Location', + invValuation: 'Inventory Valuation', + purchaseDetail: 'Detailed Purchase', + purchaseSum: 'Summary Purchase', + reportType: 'Report Type', + stockTransferDetail: 'Detailed Stock Transfer', + stockTransferSum: 'Summary Stock Transfer', + stockUsageDetail: 'Detailed Stock Usage', + stockUsageSum: 'Summary Stock Usage' }, titles: { - add_purchase: 'Add Purchase', - add_request: 'New Request', + addPurchase: 'Add Purchase', + addRequest: 'New Request', adjustment: 'Adjustment', - edit_purchase: 'Edit Purchase', - edit_request: 'Edit Request', - inventory_item: 'New Inventory Item', - inventory_report: 'Inventory Report', - purchase_saved: 'Inventory Purchases Saved', - quick_add_title: 'New Inventory Item', - remove_item: 'Remove Item', - request_fulfilled: 'Request Fulfilled', - request_updated: 'Request Updated', + editPurchase: 'Edit Purchase', + editRequest: 'Edit Request', + inventoryItem: 'New Inventory Item', + inventoryReport: 'Inventory Report', + purchaseSaved: 'Inventory Purchases Saved', + quickAddTitle: 'New Inventory Item', + removeItem: 'Remove Item', + requestFulfilled: 'Request Fulfilled', + requestUpdated: 'Request Updated', transfer: 'Transfer Items', warning: 'Warning!!!!!' } }, imaging: { - page_title: 'Imaging Requests', - section_title: 'Imaging', + pageTitle: 'Imaging Requests', + sectionTitle: 'Imaging', buttons: { - new_button: '+ new imaging' + newButton: '+ new imaging' }, labels: { radiologist: 'Radiologist', - add_new_visit: '--Add New Visit--' + addNewVisit: '--Add New Visit--' }, messages: { - no_completed: 'No completed items found.' + noCompleted: 'No completed items found.' }, titles: { - completed_imaging: 'Completed Imaging', - edit_title: 'Edit Imaging Request', - new_title: 'New Imaging Request' + completedImaging: 'Completed Imaging', + editTitle: 'Edit Imaging Request', + newTitle: 'New Imaging Request' }, alerts: { - completed_title: 'Imaging Request Completed', - completed_message: 'The imaging request has been completed.', - saved_title: 'Imaging Request Saved', - saved_message: 'The imaging request has been saved.' + completedTitle: 'Imaging Request Completed', + completedMessage: 'The imaging request has been completed.', + savedTitle: 'Imaging Request Saved', + savedMessage: 'The imaging request has been saved.' } }, medication: { @@ -697,73 +697,73 @@ export default { delete: 'Are you sure you wish to delete these vitals?' }, labels: { - date_recorded: 'Date Recorded', + dateRecorded: 'Date Recorded', temperature: 'Temperature', weight: 'Weight', height: 'Height', sbp: 'SBP', dbp: 'DBP', - heart_rate: 'Heart Rate', - respiratory_rate: 'Respiratory Rate' + heartRate: 'Heart Rate', + respiratoryRate: 'Respiratory Rate' } }, visits: { titles: { - additional_diagnoses: 'Additional Diagnoses' + additionalDiagnoses: 'Additional Diagnoses' }, messages: { delete: 'Are you sure you wish to delete this visit?' }, buttons: { - new_procedure: 'New Procedure', - new_lab: 'New Lab', - new_appointment: 'New Appointment', - add_diagnosis: 'Add Diagnosis', - new_imaging: 'New Imaging', - new_medication: 'New Medication', - new_vitals: 'New Vitals' + newProcedure: 'New Procedure', + newLab: 'New Lab', + newAppointment: 'New Appointment', + addDiagnosis: 'Add Diagnosis', + newImaging: 'New Imaging', + newMedication: 'New Medication', + newVitals: 'New Vitals' }, labels: { diagnosis: 'Diagnosis', procedure: 'Procedure', - authored_by: 'Authored By', + authoredBy: 'Authored By', labs: 'Labs', imaging: 'Imaging', - visit_information: 'Visit Information', + visitInformation: 'Visit Information', examiner: 'Examiner', medication: 'Medication', status: 'Visit Status', - admitting_diagnosis: 'Admitting Diagnosis', - final_diagnosis: 'Final/Billing Diagnosis', - visit_type: 'Visit Type', + admittingDiagnosis: 'Admitting Diagnosis', + finalDiagnosis: 'Final/Billing Diagnosis', + visitType: 'Visit Type', vitals: 'Vitals' } }, labs: { - section_title: 'Labs', - requests_title: 'Lab Requests', - edit_title: 'Edit Lab Request', - new_title: 'New Lab Request', - delete_title: 'Delete Request', - completed_title: 'Completed Labs', + sectionTitle: 'Labs', + requestsTitle: 'Lab Requests', + editTitle: 'Edit Lab Request', + newTitle: 'New Lab Request', + deleteTitle: 'Delete Request', + completedTitle: 'Completed Labs', labels: { - lab_type: 'Lab Type', - add_new_visit: '--Add New Visit--' + labType: 'Lab Type', + addNewVisit: '--Add New Visit--' }, messages: { - no_items_found: 'No labs found.', - create_new_record: 'Create a new record?', - confirm_deletion: 'Are you sure you wish to delete this lab request?', - no_completed: 'No completed items found.' + noItemsFound: 'No labs found.', + createNewRecord: 'Create a new record?', + confirmDeletion: 'Are you sure you wish to delete this lab request?', + noCompleted: 'No completed items found.' }, buttons: { - new_button: '+ new lab' + newButton: '+ new lab' }, alerts: { - request_completed_title: 'Lab Request Completed', - request_completed_message: 'The lab request has been completed.', - request_saved_title: 'Lab Request Saved', - request_saved_message: 'The lab request has been saved.' + requestCompletedTitle: 'Lab Request Completed', + requestCompletedMessage: 'The lab request has been completed.', + requestSavedTitle: 'Lab Request Saved', + requestSavedMessage: 'The lab request has been saved.' } }, patients: { @@ -776,98 +776,98 @@ export default { medication: 'Medication', imaging: 'Imaging', labs: 'Labs', - social_work: 'Social Work' + socialWork: 'Social Work' }, titles: { expenses: 'Expenses', additionalContacts: 'Additional Contacts', - family_information: 'Family Information', + familyInformation: 'Family Information', delete: 'Delete Patient', new: 'New Patient', edit: 'Edit Patient', patient: 'Patient Report', - patient_listing: 'Patient Listing', - patient_report: 'Patient Report', - add_photo: 'Add Photo', - edit_photo: 'Edit Photo', - social_work: 'Expense', - family_info: 'Family Info', - delete_family_member: 'Delete Family Member', - delete_expense: 'Delete Expense', - delete_photo: 'Delete Photo', - delete_contact: 'Delete Contact', - saved_patient: 'Patient Saved' + patientListing: 'Patient Listing', + patientReport: 'Patient Report', + addPhoto: 'Add Photo', + editPhoto: 'Edit Photo', + socialWork: 'Expense', + familyInfo: 'Family Info', + deleteFamilyMember: 'Delete Family Member', + deleteExpense: 'Delete Expense', + deletePhoto: 'Delete Photo', + deleteContact: 'Delete Contact', + savedPatient: 'Patient Saved' }, messages: { - are_you_sure_delete: 'Are you sure you want to delete this {{object}}?', - delete_patient: 'Are you sure you wish to delete {{firstName}} {{lastName}}?', - no_patients_found: 'No patients found.', - saved_patient: 'The patient record for {{displayName}} has been saved.', - not_found_quick_add: 'The patient {{patientFullName}} could not be found. If you would like to create a new patient, fill in the information below. Otherwise press the Cancel button to return.', - create_new_patient: 'Create a new patient record?' + areYouSureDelete: 'Are you sure you want to delete this {{object}}?', + deletePatient: 'Are you sure you wish to delete {{firstName}} {{lastName}}?', + noPatientsFound: 'No patients found.', + savedPatient: 'The patient record for {{displayName}} has been saved.', + notFoundQuickAdd: 'The patient {{patientFullName}} could not be found. If you would like to create a new patient, fill in the information below. Otherwise press the Cancel button to return.', + createNewPatient: 'Create a new patient record?' }, buttons: { - add_expense: 'Add Expense', - add_contact: 'Add Contact', - new_lab: 'New Lab', - new_visit: 'New Visit', - new_medication: 'New Medication', - new_imaging: 'New Imaging', - add_family_member: 'Add Family Member', - new_photo: 'New Photo', - new_appointment: 'New Appointment', - back_to_patients: 'Back to Patient List', - new_patient: '+ new patient' + addExpense: 'Add Expense', + addContact: 'Add Contact', + newLab: 'New Lab', + newVisit: 'New Visit', + newMedication: 'New Medication', + newImaging: 'New Imaging', + addFamilyMember: 'Add Family Member', + newPhoto: 'New Photo', + newAppointment: 'New Appointment', + backToPatients: 'Back to Patient List', + newPatient: '+ new patient' }, headings: { history: 'History', - history_since: 'History Since' + historySince: 'History Since' }, labels: { - primary_diagnosis: 'Primary Diagnoses', - secondary_diagnosis: 'Secondary Diagnoses', - monthly_cost: 'Monthly Cost', - total_montly_expense: 'Total Monthly Expenses', - patient_type: 'Patient Type', - admission_date: 'Admission Date', - patient_days: 'Patient Days', - discharge_date: 'Discharge Date', + primaryDiagnosis: 'Primary Diagnoses', + secondaryDiagnosis: 'Secondary Diagnoses', + monthlyCost: 'Monthly Cost', + totalMontlyExpense: 'Total Monthly Expenses', + patientType: 'Patient Type', + admissionDate: 'Admission Date', + patientDays: 'Patient Days', + dischargeDate: 'Discharge Date', discharge: 'Discharge', admit: 'Admit', relationships: 'Relationships', phone: 'Phone', email: 'Email', - first_name: 'First Name', - middle_name: 'Middle Name', - last_name: 'Last Name', + firstName: 'First Name', + middleName: 'Middle Name', + lastName: 'Last Name', sex: 'Sex', dob: 'DOB', - date_of_birth: 'Date Of Birth', - place_of_birth: 'Place Of Birth', + dateOfBirth: 'Date Of Birth', + placeOfBirth: 'Place Of Birth', sources: 'Sources', costs: 'Costs', - civil_status: 'Civil Status', + civilStatus: 'Civil Status', relationship: 'Relationship To Patient', education: 'Education', occupation: 'Occupation', income: 'Income', insurance: 'Insurance', - date_processed: 'Date Processed', + dateProcessed: 'Date Processed', status: 'Patient Status', - external_patient_id: 'External Patient Id', - blood_type: 'Blood Type', + externalPatientId: 'External Patient Id', + bloodType: 'Blood Type', clinic: 'Clinic Site', - referred_by: 'Referred By', - referred_date: 'Referred Date', + referredBy: 'Referred By', + referredDate: 'Referred Date', religion: 'Religion', parent: 'Parent/Guardian' }, notes: { - new_note: 'New Note for', - update_note: 'Updating Note from', - on_behalf_of_label: 'On Behalf Of', - on_behalf_of_copy: 'on behalf of', - please_select_a_visit: 'Please select a visit' + newNote: 'New Note for', + updateNote: 'Updating Note from', + onBehalfOfLabel: 'On Behalf Of', + onBehalfOfCopy: 'on behalf of', + pleaseSelectAVisit: 'Please select a visit' } }, billing: { diff --git a/app/locales/es-CO/translations.js b/app/locales/es-CO/translations.js index d50e829bdf..16788bc43a 100644 --- a/app/locales/es-CO/translations.js +++ b/app/locales/es-CO/translations.js @@ -289,14 +289,14 @@ export default { areYouSureDelete: 'Estas seguro de eliminar este usuario {{user}}?', userHasBeenSaved: 'El usuario ha sido salvado.', userSaved: 'Usuario salvado', - onBehalf_of: 'a nombre de', + onBehalfOf: 'a nombre de', newPatientHasToBeCreated: 'Un nuevo paciente debe ser creado...Por favor espere..', noNotesAvailable: 'No hay notas clínicas adicionales están disponibles para esta visita.', sorry: 'Lo sentimos, un error ha ocurrido...', forAuthorizedPersons: 'Este informe es sólo para personas autorizadas.' }, alerts: { - please_wait: 'Por favor espere' + pleaseWait: 'Por favor espere' }, buttons: { complete: 'Completado', @@ -344,197 +344,197 @@ export default { quantity: 'Quantity at Completion:', reason: 'Razón:', returned: 'Regresado al paciente:', - transferred_from: 'Transferido a:', - transferred_to: 'Transferido a:' + transferredFrom: 'Transferido a:', + transferredTo: 'Transferido a:' }, labels: { action: 'Acción', add: 'Adicionar', adjust: 'Adjustar', - adjustment_date: 'Fecha de ajuste', - adjustment_for: 'Ajustado para', - adjustment_type: 'Tipo de ajuste', + adjustmentDate: 'Fecha de ajuste', + adjustmentFor: 'Ajustado para', + adjustmentType: 'Tipo de ajuste', aisle: 'Pasillo', - aisle_location: 'Ubicación pasillo', - all_inventory: 'Todo el inventario', - bill_to: 'Facturao a', - consume_purchases: 'Consume Purchases', - consumption_rate: 'Tasa de consumo', + aisleLocation: 'Ubicación pasillo', + allInventory: 'Todo el inventario', + billTo: 'Facturao a', + consumePurchases: 'Consume Purchases', + consumptionRate: 'Tasa de consumo', cost: 'Costo', - cost_per_unit: 'Costo por Unidad', - cross_reference: 'Referencia cruzada', - current_quantity: 'Cantidad actual', - date_completed: 'Fecha completado', - date_effective: 'Gecha efectiva', - date_end: 'Fecha final', - date_start: 'Fecha inicial', - date_received: 'Fecha recibido', - date_tranferred: 'Fecha transferencia', - days_left: 'Dias restantes', - delivery_aisle: 'Enviado a pasillo', - delivery_location: 'Ubicación del envio', - distribution_unit: 'Unidad de distribución', - delete_item: 'Eliminar elemento', + costPerUnit: 'Costo por Unidad', + crossReference: 'Referencia cruzada', + currentQuantity: 'Cantidad actual', + dateCompleted: 'Fecha completado', + dateEffective: 'Gecha efectiva', + dateEnd: 'Fecha final', + dateStart: 'Fecha inicial', + dateReceived: 'Fecha recibido', + dateTransferred: 'Fecha transferencia', + daysLeft: 'Dias restantes', + deliveryAisle: 'Enviado a pasillo', + deliveryLocation: 'Ubicación del envio', + distributionUnit: 'Unidad de distribución', + deleteItem: 'Eliminar elemento', details: 'Detalles', - edit_item: 'Editar elemento', + editItem: 'Editar elemento', expense: 'Gastos a', - expiration_date: 'Fecha de vencimiento', - fulfill_request: 'Pedido de cumplimiento', - fulfill_request_now: 'Pedido de incumplimiento para hoy', + expirationDate: 'Fecha de vencimiento', + fulfillRequest: 'Pedido de cumplimiento', + fulfillRequestNow: 'Pedido de incumplimiento para hoy', gift: 'Regalo en especie', - gift_usage: 'Uso del regalo en especie', - gift_in_kind_no: 'N', - gift_in_kind_yes: 'Y', - inventory_consumed: 'Inventario consumido', - inventory_item: 'Elemento del inventario', - inventory_obsolence: 'Obsolescencia de inventario', - invoice_items: 'Articulos de factura', - invoice_line_item: 'Elemento de la factura linea', - invoice_number: 'Factura numero', + giftUsage: 'Uso del regalo en especie', + giftInKindNo: 'N', + giftInKindYes: 'Y', + inventoryConsumed: 'Inventario consumido', + inventoryItem: 'Elemento del inventario', + inventoryObsolence: 'Obsolescencia de inventario', + invoiceItems: 'Articulos de factura', + invoiceLineItem: 'Elemento de la factura linea', + invoiceNumber: 'Factura numero', item: 'Elemento', items: 'Elementos', - item_number: 'Numero de elemento', + itemNumber: 'Numero de elemento', location: 'Ubicación', locations: 'Ubicaciones', name: 'Nombre', - mark_as_consumed: 'Marcar como consumido', - new_item: 'Nuevo elemento', - original_quantity: 'Cantidad original', + markAsConsumed: 'Marcar como consumido', + newItem: 'Nuevo elemento', + originalQuantity: 'Cantidad original', print: 'Imprimir', - print_barcode: 'Imprimir codigo de barras', + printBarcode: 'Imprimir codigo de barras', printer: 'Impresora', - pull_from: 'Traido de', + pullFrom: 'Traido de', purchases: 'Compras', - purchase_cost: 'Costo de compra', - purchase_info: 'Informacion de la compra', + purchaseCost: 'Costo de compra', + purchaseInfo: 'Informacion de la compra', quantity: 'Cantidad ({{unit}})', - quantity_available: 'Cantidad disponible', - quantity_on_hand: 'Cantidad a la mano', - quantity_requested: 'Cantidad pedida', + quantityAvailable: 'Cantidad disponible', + quantityOnHand: 'Cantidad a la mano', + quantityRequested: 'Cantidad pedida', rank: 'Ranking', reason: 'Razón', remove: 'Remover', - reorder_point: 'Reordenar punto', - requested_items: 'Elementos solicitados', - sale_price_per_unit: 'Costo de venta por unidad', + reorderPoint: 'Reordenar punto', + requestedItems: 'Elementos solicitados', + salePricePerUnit: 'Costo de venta por unidad', save: 'Guardar', - serial_number: 'Serial/Numero de lote', + serialNumber: 'Serial/Numero de lote', total: 'Total', - total_cost: 'Costo total', - total_received: 'Total Recivido: {{total}}', + totalCost: 'Costo total', + totalReceived: 'Total Recivido: {{total}}', transaction: 'Transaccion', transactions: 'Transacciones', transfer: 'Translados', - transfer_from: 'Translado desde', - transfer_to: 'Translado a ubicación', - transfer_to_aisle: 'Translado a pasillo', + transferFrom: 'Translado desde', + transferTo: 'Translado a ubicación', + transferToAisle: 'Translado a pasillo', unit: 'Unidad', - unit_cost: 'Unidad Costo', + unitCost: 'Unidad Costo', vendor: 'Proveedor', - vendor_item_number: 'Proveedor numero de elemento', + vendorItemNumber: 'Proveedor numero de elemento', xref: 'XRef' }, messages: { adjust: 'Por favor ajust las cantidades en la ubicación adecuada(s) la diferencia de la cuenta es {{difference}}.', - create_request: 'Crear un nuevo pedido?', + createRequest: 'Crear un nuevo pedido?', delete: 'Estas seguro de eliminar {{name}}?', - item_not_found: 'El elemento del inventario {{item}} no se pudo encontrar.
Si desea crear un nuevo elemento, Ingrese la información abajo.
De lo contrario opria cancelar para volver.', + itemNotFound: 'El elemento del inventario {{item}} no se pudo encontrar.
Si desea crear un nuevo elemento, Ingrese la información abajo.
De lo contrario opria cancelar para volver.', loading: 'Cargando transacciones ...', - purchase_saved: 'La compra de inventario ha sido salvada.', - no_requests: 'No se encontraron pedidos.', - no_items: 'No se encontraron elementos.', + purchaseSaved: 'La compra de inventario ha sido salvada.', + noRequests: 'No se encontraron pedidos.', + noItems: 'No se encontraron elementos.', quantity: 'La cantidad total ({{quantity}}) no encaja con la cantidad total en las ubicaciones ({{locationQuantity}}).', - remove_item: 'Esta seguro de eliminar este elemento de la factura?', - remove_item_request: 'Seguro que quiere eliminar este elemento del pedido?', - request_fulfilled: 'El pedido de inventario ha sido procesado.', - request_updated: 'El pedido de inventario ha sido actualizado.', + removeItem: 'Esta seguro de eliminar este elemento de la factura?', + removeItemRequest: 'Seguro que quiere eliminar este elemento del pedido?', + requestFulfilled: 'El pedido de inventario ha sido procesado.', + requestUpdated: 'El pedido de inventario ha sido actualizado.', warning: 'Valide los campos requeridos (marcados con *) corrija los errores antes de adicionar.' }, reports: { rows: { adjustments: 'Ajustes', - adjustments_total: 'Ajustes totales', - balance_begin: 'Balance inicial', - balance_end: 'Balance Final', + adjustmentsTotal: 'Ajustes totales', + balanceBegin: 'Balance inicial', + balanceEnd: 'Balance Final', category: 'Categoria', consumed: 'Consumado', - consumed_gik: 'GiK Consumido', - consumed_gik_total: 'Total GiK Consumido', - consumed_puchases: 'Total de lo comprado consumido', - consumed_purchases_total: 'Total de lo comprado consumido', - consumed_total: 'Total consumido', - err_in_fin_sum: 'Error en _generateFinancialSummaryReport: ', - err_in_find_pur: 'Error en _findInventoryItemsByPurchase: ', - err_in_find_req: 'Error en _findInventoryItemsByRequest: ', - expenses_for: 'Gatos para: ', - no_account: '(No Cuenta)', + consumedGik: 'GiK Consumido', + consumedGikTotal: 'Total GiK Consumido', + consumedPuchases: 'Total de lo comprado consumido', + consumedPurchasesTotal: 'Total de lo comprado consumido', + consumedTotal: 'Total consumido', + errInFinSum: 'Error en _generateFinancialSummaryReport: ', + errInFindPur: 'Error en _findInventoryItemsByPurchase: ', + errInFindReq: 'Error en _findInventoryItemsByRequest: ', + expensesFor: 'Gatos para: ', + noAccount: '(No Cuenta)', subtotal: 'Subtotal: ', - subtotal_for: 'Subtotal para {{category}} - {{account}}: ', + subtotalFor: 'Subtotal para {{category}} - {{account}}: ', total: 'Total: ', - total_for: 'Total para {{var}}: ', - total_purchases: 'Compras Totales', + totalFor: 'Total para {{var}}: ', + totalPurchases: 'Compras Totales', transfer1: '{{quantity}} de {{location}}', trasnfer2: 'De: {{source}} A: {{target}}' }, adjustment: 'Ajuste detallado', - days_supply: 'Dias de inventario restante', - expense_detail: 'Gastos detallados', - expense_sum: 'Resumen de gastos', + daysSupply: 'Dias de inventario restante', + expenseDetail: 'Gastos detallados', + expenseSum: 'Resumen de gastos', expiration: 'Fecha de expiracion', export: 'Exportar reporte', fields: 'Campos a incluir', finance: 'Resumen de finanzas', generate: 'Generar reporte', - inv_location: 'Inventario por ubicacion', - inv_valuation: 'Inventario por valoracion', - purchase_detail: 'Compras detalladas', - purchase_sum: 'Resumen de compras', - report_type: 'Tipo de reporte', - stock_transfer_detail: 'Detalle de traslado de stock', - stock_transfer_sum: 'Resumen traslado de stock', - stock_usage_detail: 'Detalle de uso de stock', - stock_usage_sum: 'Resumen uso de stock' + invLocation: 'Inventario por ubicacion', + invValuation: 'Inventario por valoracion', + purchaseDetail: 'Compras detalladas', + purchaseSum: 'Resumen de compras', + reportType: 'Tipo de reporte', + stockTransferDetail: 'Detalle de traslado de stock', + stockTransferSum: 'Resumen traslado de stock', + stockUsageDetail: 'Detalle de uso de stock', + stockUsageSum: 'Resumen uso de stock' }, titles: { - add_purchase: 'Adicionar compra', - add_request: 'Nuevo pedido', + addPurchase: 'Adicionar compra', + addRequest: 'Nuevo pedido', adjustment: 'Ajuste', - edit_purchase: 'Editar compra', - edit_request: 'Editar pedido', - inventory_item: 'Nuevo elemento de inventario', - inventory_report: 'Reporte de inventario', - purchase_saved: 'Compras de inventario guardadas', - quick_add_title: 'Nuevo elemento de inventario', - remove_item: 'Remover elemento', - request_fulfilled: 'Pedido cumplido', - request_updated: 'Pedido actualizado', + editPurchase: 'Editar compra', + editRequest: 'Editar pedido', + inventoryItem: 'Nuevo elemento de inventario', + inventoryReport: 'Reporte de inventario', + purchaseSaved: 'Compras de inventario guardadas', + quickAddTitle: 'Nuevo elemento de inventario', + removeItem: 'Remover elemento', + requestFulfilled: 'Pedido cumplido', + requestUpdated: 'Pedido actualizado', transfer: 'Trasladar elementos', warning: 'Peligro!!!!!' } }, imaging: { - page_title: 'Pedido de radriografia', - section_title: 'Radiografias', + pageTitle: 'Pedido de radriografia', + sectionTitle: 'Radiografias', buttons: { - new_button: '+ new radiografia' + newButton: '+ new radiografia' }, labels: { radiologist: 'Radiologo', - add_new_visit: '--Adicionar nueva visita--' + addNewVisit: '--Adicionar nueva visita--' }, messages: { - no_completed: 'No de items encontrados.' + noCompleted: 'No de items encontrados.' }, titles: { - completed_imaging: 'Radiografia completada', - edit_title: 'Pedido de edicion de radiografia', - new_title: 'Nuevo pedido de radiografia' + completedImaging: 'Radiografia completada', + editTitle: 'Pedido de edicion de radiografia', + newTitle: 'Nuevo pedido de radiografia' }, alerts: { - completed_title: 'Pedido de radiografia completado', - completed_message: 'El pedido de radiografia ha sido completado.', - saved_title: 'Pedido de radiografia salvado', - saved_message: 'El pedido de radiografia ha sido guardado.' + completedTitle: 'Pedido de radiografia completado', + completedMessage: 'El pedido de radiografia ha sido completado.', + savedTitle: 'Pedido de radiografia salvado', + savedMessage: 'El pedido de radiografia ha sido guardado.' } }, medication: { @@ -595,48 +595,48 @@ export default { visits: { edit: { buttons: { - new_appointment: 'Nuevas citas', - add_diagnosis: 'Adicionar diagnostico', - new_procedure: 'Nuevo procedimiento', - new_lab: 'New laboratorio', - new_medication: 'Nueva mediicación', - new_imaging: 'Nueva radiografia' + newAppointment: 'Nuevas citas', + addDiagnosis: 'Adicionar diagnostico', + newProcedure: 'Nuevo procedimiento', + newLab: 'New laboratorio', + newMedication: 'Nueva mediicación', + newImaging: 'Nueva radiografia' }, labels: { diagnosis: 'Diagnostico', procedure: 'Procedimiento', - authored_by: 'Escrito por', + authoredBy: 'Escrito por', labs: 'Laboratorios', imaging: 'Radiografias', - visit_information: 'Informacion de visita' + visitInformation: 'Informacion de visita' } } }, labs: { - section_title: 'Laboratorios', - requests_title: 'Pedido de laboratorio', - edit_title: 'Editar pedido de laboratorio', - new_title: 'Nuevo pedido de laboratorio', - delete_title: 'Eliminar pedido', - completed_title: 'Completar laboratorio', + sectionTitle: 'Laboratorios', + requestsTitle: 'Pedido de laboratorio', + editTitle: 'Editar pedido de laboratorio', + newTitle: 'Nuevo pedido de laboratorio', + deleteTitle: 'Eliminar pedido', + completedTitle: 'Completar laboratorio', labels: { - lab_type: 'Tipo de laboratorio', - add_new_visit: '--Adicionar nueva visita--' + labType: 'Tipo de laboratorio', + addNewVisit: '--Adicionar nueva visita--' }, messages: { - no_items_found: 'No boratorios encontrados.', - create_new_record: 'Crear un registro?', - confirm_deletion: 'Esta seguro de eliminar esta solicitud de laboratorio?', - no_completed: 'No elementos completados encontrados.' + noItemsFound: 'No boratorios encontrados.', + createNewRecord: 'Crear un registro?', + confirmDeletion: 'Esta seguro de eliminar esta solicitud de laboratorio?', + noCompleted: 'No elementos completados encontrados.' }, buttons: { - new_button: '+ nuevo laboratorio' + newButton: '+ nuevo laboratorio' }, alerts: { - request_completed_title: 'Pedido de laboratorio competado', - request_completed_message: 'El pedido de laboratorio ha sido completado.', - request_saved_title: 'Silicitud de laboratorio guardado', - request_saved_message: 'El pedido de laboratorio ha sido guardado.' + requestCompletedTitle: 'Pedido de laboratorio competado', + requestCompletedMessage: 'El pedido de laboratorio ha sido completado.', + requestSavedTitle: 'Silicitud de laboratorio guardado', + requestSavedMessage: 'El pedido de laboratorio ha sido guardado.' } }, common: { @@ -644,10 +644,10 @@ export default { }, patients: { notes: { - on_behalf_of_label: 'A nombre de', - on_behalf_of_copy: 'a nombre de', - please_select_a_visit: 'Por favor seleccione una visista', - note_label: 'Nota' + onBehalfOfLabel: 'A nombre de', + onBehalfOfCopy: 'a nombre de', + pleaseSelectAVisit: 'Por favor seleccione una visista', + noteLabel: 'Nota' } } }; diff --git a/app/locales/es/translations.js b/app/locales/es/translations.js index 84810fece6..3de1ca94e9 100644 --- a/app/locales/es/translations.js +++ b/app/locales/es/translations.js @@ -296,7 +296,7 @@ export default { forAuthorizedPersons: 'Este informe es sólo para personas autorizadas.' }, alerts: { - please_wait: 'Por favor espere' + pleaseWait: 'Por favor espere' }, buttons: { complete: 'Completado', @@ -344,197 +344,197 @@ export default { quantity: 'Quantity at Completion:', reason: 'Razón:', returned: 'Regresado al paciente:', - transferred_from: 'Transferido a:', - transferred_to: 'Transferido a:' + transferredFrom: 'Transferido a:', + transferredTo: 'Transferido a:' }, labels: { action: 'Acción', add: 'Adicionar', adjust: 'Adjustar', - adjustment_date: 'Fecha de ajuste', - adjustment_for: 'Ajustado para', - adjustment_type: 'Tipo de ajuste', + adjustmentDate: 'Fecha de ajuste', + adjustmentFor: 'Ajustado para', + adjustmentType: 'Tipo de ajuste', aisle: 'Pasillo', - aisle_location: 'Ubicación pasillo', - all_inventory: 'Todo el inventario', - bill_to: 'Facturao a', - consume_purchases: 'Consume Purchases', - consumption_rate: 'Tasa de consumo', + aisleLocation: 'Ubicación pasillo', + allInventory: 'Todo el inventario', + billTo: 'Facturao a', + consumePurchases: 'Consume Purchases', + consumptionRate: 'Tasa de consumo', cost: 'Costo', - cost_per_unit: 'Costo por Unidad', - cross_reference: 'Referencia cruzada', - current_quantity: 'Cantidad actual', - date_completed: 'Fecha completado', - date_effective: 'Gecha efectiva', - date_end: 'Fecha final', - date_start: 'Fecha inicial', - date_received: 'Fecha recibido', - date_tranferred: 'Fecha transferencia', - days_left: 'Dias restantes', - delivery_aisle: 'Enviado a pasillo', - delivery_location: 'Ubicación del envio', - distribution_unit: 'Unidad de distribución', - delete_item: 'Eliminar elemento', + costPerUnit: 'Costo por Unidad', + crossReference: 'Referencia cruzada', + currentQuantity: 'Cantidad actual', + dateCompleted: 'Fecha completado', + dateEffective: 'Gecha efectiva', + dateEnd: 'Fecha final', + dateStart: 'Fecha inicial', + dateReceived: 'Fecha recibido', + dateTranferred: 'Fecha transferencia', + daysLeft: 'Dias restantes', + deliveryAisle: 'Enviado a pasillo', + deliveryLocation: 'Ubicación del envio', + distributionUnit: 'Unidad de distribución', + deleteItem: 'Eliminar elemento', details: 'Detalles', - edit_item: 'Editar elemento', + editItem: 'Editar elemento', expense: 'Gastos a', - expiration_date: 'Fecha de vencimiento', - fulfill_request: 'Pedido de cumplimiento', - fulfill_request_now: 'Pedido de incumplimiento para hoy', + expirationDate: 'Fecha de vencimiento', + fulfillRequest: 'Pedido de cumplimiento', + fulfillRequestNow: 'Pedido de incumplimiento para hoy', gift: 'Regalo en especie', - gift_usage: 'Uso del regalo en especie', - gift_in_kind_no: 'N', - gift_in_kind_yes: 'Y', - inventory_consumed: 'Inventario consumido', - inventory_item: 'Elemento del inventario', - inventory_obsolence: 'Obsolescencia de inventario', - invoice_items: 'Articulos de factura', - invoice_line_item: 'Elemento de la factura linea', - invoice_number: 'Factura numero', + giftUsage: 'Uso del regalo en especie', + giftInKindNo: 'N', + giftInKindYes: 'Y', + inventoryConsumed: 'Inventario consumido', + inventoryItem: 'Elemento del inventario', + inventoryObsolence: 'Obsolescencia de inventario', + invoiceItems: 'Articulos de factura', + invoiceLineItem: 'Elemento de la factura linea', + invoiceNumber: 'Factura numero', item: 'Elemento', items: 'Elementos', - item_number: 'Numero de elemento', + itemNumber: 'Numero de elemento', location: 'Ubicación', locations: 'Ubicaciones', name: 'Nombre', - mark_as_consumed: 'Marcar como consumido', - new_item: 'Nuevo elemento', - original_quantity: 'Cantidad original', + markAsConsumed: 'Marcar como consumido', + newItem: 'Nuevo elemento', + originalQuantity: 'Cantidad original', print: 'Imprimir', - print_barcode: 'Imprimir codigo de barras', + printBarcode: 'Imprimir codigo de barras', printer: 'Impresora', - pull_from: 'Traido de', + pullFrom: 'Traido de', purchases: 'Compras', - purchase_cost: 'Costo de compra', - purchase_info: 'Informacion de la compra', + purchaseCost: 'Costo de compra', + purchaseInfo: 'Informacion de la compra', quantity: 'Cantidad ({{unit}})', - quantity_available: 'Cantidad disponible', - quantity_on_hand: 'Cantidad a la mano', - quantity_requested: 'Cantidad pedida', + quantityAvailable: 'Cantidad disponible', + quantityOnHand: 'Cantidad a la mano', + quantityRequested: 'Cantidad pedida', rank: 'Ranking', reason: 'Razón', remove: 'Remover', - reorder_point: 'Reordenar punto', - requested_items: 'Elementos solicitados', - sale_price_per_unit: 'Costo de venta por unidad', + reorderPoint: 'Reordenar punto', + requestedItems: 'Elementos solicitados', + salePricePerUnit: 'Costo de venta por unidad', save: 'Guardar', - serial_number: 'Serial/Numero de lote', + serialNumber: 'Serial/Numero de lote', total: 'Total', - total_cost: 'Costo total', - total_received: 'Total Recivido: {{total}}', + totalCost: 'Costo total', + totalReceived: 'Total Recivido: {{total}}', transaction: 'Transaccion', transactions: 'Transacciones', transfer: 'Translados', - transfer_from: 'Translado desde', - transfer_to: 'Translado a ubicación', - transfer_to_aisle: 'Translado a pasillo', + transferFrom: 'Translado desde', + transferTo: 'Translado a ubicación', + transferToAisle: 'Translado a pasillo', unit: 'Unidad', - unit_cost: 'Unidad Costo', + unitCost: 'Unidad Costo', vendor: 'Proveedor', - vendor_item_number: 'Proveedor numero de elemento', + vendorItemNumber: 'Proveedor numero de elemento', xref: 'XRef' }, messages: { adjust: 'Por favor ajust las cantidades en la ubicación adecuada(s) la diferencia de la cuenta es {{difference}}.', - create_request: 'Crear un nuevo pedido?', + createRequest: 'Crear un nuevo pedido?', delete: 'Estas seguro de eliminar {{name}}?', - item_not_found: 'El elemento del inventario {{item}} no se pudo encontrar.
Si desea crear un nuevo elemento, Ingrese la información abajo.
De lo contrario opria cancelar para volver.', + itemNotFound: 'El elemento del inventario {{item}} no se pudo encontrar.
Si desea crear un nuevo elemento, Ingrese la información abajo.
De lo contrario opria cancelar para volver.', loading: 'Cargando transacciones ...', - purchase_saved: 'La compra de inventario ha sido salvada.', - no_requests: 'No se encontraron pedidos.', - no_items: 'No se encontraron elementos.', + purchaseSaved: 'La compra de inventario ha sido salvada.', + noRequests: 'No se encontraron pedidos.', + noItems: 'No se encontraron elementos.', quantity: 'La cantidad total ({{quantity}}) no encaja con la cantidad total en las ubicaciones ({{locationQuantity}}).', - remove_item: 'Esta seguro de eliminar este elemento de la factura?', - remove_item_request: 'Seguro que quiere eliminar este elemento del pedido?', - request_fulfilled: 'El pedido de inventario ha sido procesado.', - request_updated: 'El pedido de inventario ha sido actualizado.', + removeItem: 'Esta seguro de eliminar este elemento de la factura?', + removeItemRequest: 'Seguro que quiere eliminar este elemento del pedido?', + requestFulfilled: 'El pedido de inventario ha sido procesado.', + requestUpdated: 'El pedido de inventario ha sido actualizado.', warning: 'Valide los campos requeridos (marcados con *) corrija los errores antes de adicionar.' }, reports: { rows: { adjustments: 'Ajustes', - adjustments_total: 'Ajustes totales', - balance_begin: 'Balance inicial', - balance_end: 'Balance Final', + adjustmentsTotal: 'Ajustes totales', + balanceBegin: 'Balance inicial', + balanceEnd: 'Balance Final', category: 'Categoria', consumed: 'Consumado', - consumed_gik: 'GiK Consumido', - consumed_gik_total: 'Total GiK Consumido', - consumed_puchases: 'Total de lo comprado consumido', - consumed_purchases_total: 'Total de lo comprado consumido', - consumed_total: 'Total consumido', - err_in_fin_sum: 'Error en _generateFinancialSummaryReport: ', - err_in_find_pur: 'Error en _findInventoryItemsByPurchase: ', - err_in_find_req: 'Error en _findInventoryItemsByRequest: ', - expenses_for: 'Gatos para: ', - no_account: '(No Cuenta)', + consumedGik: 'GiK Consumido', + consumedGikTotal: 'Total GiK Consumido', + consumedPuchases: 'Total de lo comprado consumido', + consumedPurchasesTotal: 'Total de lo comprado consumido', + consumedTotal: 'Total consumido', + errInFinSum: 'Error en _generateFinancialSummaryReport: ', + errInFindPur: 'Error en _findInventoryItemsByPurchase: ', + errInFindReq: 'Error en _findInventoryItemsByRequest: ', + expensesFor: 'Gatos para: ', + noAccount: '(No Cuenta)', subtotal: 'Subtotal: ', - subtotal_for: 'Subtotal para {{category}} - {{account}}: ', + subtotalFor: 'Subtotal para {{category}} - {{account}}: ', total: 'Total: ', - total_for: 'Total para {{var}}: ', - total_purchases: 'Compras Totales', + totalFor: 'Total para {{var}}: ', + totalPurchases: 'Compras Totales', transfer1: '{{quantity}} de {{location}}', trasnfer2: 'De: {{source}} A: {{target}}' }, adjustment: 'Ajuste detallado', - days_supply: 'Dias de inventario restante', - expense_detail: 'Gastos detallados', - expense_sum: 'Resumen de gastos', + daysSupply: 'Dias de inventario restante', + expenseDetail: 'Gastos detallados', + expenseSum: 'Resumen de gastos', expiration: 'Fecha de expiracion', export: 'Exportar reporte', fields: 'Campos a incluir', finance: 'Resumen de finanzas', generate: 'Generar reporte', - inv_location: 'Inventario por ubicacion', - inv_valuation: 'Inventario por valoracion', - purchase_detail: 'Compras detalladas', - purchase_sum: 'Resumen de compras', - report_type: 'Tipo de reporte', - stock_transfer_detail: 'Detalle de traslado de stock', - stock_transfer_sum: 'Resumen traslado de stock', - stock_usage_detail: 'Detalle de uso de stock', - stock_usage_sum: 'Resumen uso de stock' + invLocation: 'Inventario por ubicacion', + invValuation: 'Inventario por valoracion', + purchaseDetail: 'Compras detalladas', + purchaseSum: 'Resumen de compras', + reportType: 'Tipo de reporte', + stockTransferDetail: 'Detalle de traslado de stock', + stockTransferSum: 'Resumen traslado de stock', + stockUsageDetail: 'Detalle de uso de stock', + stockUsageSum: 'Resumen uso de stock' }, titles: { - add_purchase: 'Adicionar compra', - add_request: 'Nuevo pedido', + addPurchase: 'Adicionar compra', + addRequest: 'Nuevo pedido', adjustment: 'Ajuste', - edit_purchase: 'Editar compra', - edit_request: 'Editar pedido', - inventory_item: 'Nuevo elemento de inventario', - inventory_report: 'Reporte de inventario', - purchase_saved: 'Compras de inventario guardadas', - quick_add_title: 'Nuevo elemento de inventario', - remove_item: 'Remover elemento', - request_fulfilled: 'Pedido cumplido', - request_updated: 'Pedido actualizado', + editPurchase: 'Editar compra', + editRequest: 'Editar pedido', + inventoryItem: 'Nuevo elemento de inventario', + inventoryReport: 'Reporte de inventario', + purchaseSaved: 'Compras de inventario guardadas', + quickAddTitle: 'Nuevo elemento de inventario', + removeItem: 'Remover elemento', + requestFulfilled: 'Pedido cumplido', + requestUpdated: 'Pedido actualizado', transfer: 'Trasladar elementos', warning: 'Peligro!!!!!' } }, imaging: { - page_title: 'Pedido de radriografia', - section_title: 'Radiografias', + pageTitle: 'Pedido de radriografia', + sectionTitle: 'Radiografias', buttons: { - new_button: '+ new radiografia' + newButton: '+ new radiografia' }, labels: { radiologist: 'Radiologo', - add_new_visit: '--Adicionar nueva visita--' + addNewVisit: '--Adicionar nueva visita--' }, messages: { - no_completed: 'No de items encontrados.' + noCompleted: 'No de items encontrados.' }, titles: { - completed_imaging: 'Radiografia completada', - edit_title: 'Pedido de edicion de radiografia', - new_title: 'Nuevo pedido de radiografia' + completedImaging: 'Radiografia completada', + editTitle: 'Pedido de edicion de radiografia', + newTitle: 'Nuevo pedido de radiografia' }, alerts: { - completed_title: 'Pedido de radiografia completado', - completed_message: 'El pedido de radiografia ha sido completado.', - saved_title: 'Pedido de radiografia salvado', - saved_message: 'El pedido de radiografia ha sido guardado.' + completedTitle: 'Pedido de radiografia completado', + completedMessage: 'El pedido de radiografia ha sido completado.', + savedTitle: 'Pedido de radiografia salvado', + savedMessage: 'El pedido de radiografia ha sido guardado.' } }, medication: { @@ -595,48 +595,48 @@ export default { visits: { edit: { buttons: { - new_appointment: 'Nuevas citas', - add_diagnosis: 'Adicionar diagnostico', - new_procedure: 'Nuevo procedimiento', - new_lab: 'New laboratorio', - new_medication: 'Nueva mediicación', - new_imaging: 'Nueva radiografia' + newAppointment: 'Nuevas citas', + addDiagnosis: 'Adicionar diagnostico', + newProcedure: 'Nuevo procedimiento', + newLab: 'New laboratorio', + newMedication: 'Nueva mediicación', + newImaging: 'Nueva radiografia' }, labels: { diagnosis: 'Diagnostico', procedure: 'Procedimiento', - authored_by: 'Escrito por', + authoredBy: 'Escrito por', labs: 'Laboratorios', imaging: 'Radiografias', - visit_information: 'Informacion de visita' + visitInformation: 'Informacion de visita' } } }, labs: { - section_title: 'Laboratorios', - requests_title: 'Pedido de laboratorio', - edit_title: 'Editar pedido de laboratorio', - new_title: 'Nuevo pedido de laboratorio', - delete_title: 'Eliminar pedido', - completed_title: 'Completar laboratorio', + sectionTitle: 'Laboratorios', + requestsTitle: 'Pedido de laboratorio', + editTitle: 'Editar pedido de laboratorio', + newTitle: 'Nuevo pedido de laboratorio', + deleteTitle: 'Eliminar pedido', + completedTitle: 'Completar laboratorio', labels: { - lab_type: 'Tipo de laboratorio', - add_new_visit: '--Adicionar nueva visita--' + labType: 'Tipo de laboratorio', + addNewVisit: '--Adicionar nueva visita--' }, messages: { - no_items_found: 'No boratorios encontrados.', - create_new_record: 'Crear un registro?', - confirm_deletion: 'Esta seguro de eliminar esta solicitud de laboratorio?', - no_completed: 'No elementos completados encontrados.' + noItemsFound: 'No boratorios encontrados.', + createNewRecord: 'Crear un registro?', + confirmDeletion: 'Esta seguro de eliminar esta solicitud de laboratorio?', + noCompleted: 'No elementos completados encontrados.' }, buttons: { - new_button: '+ nuevo laboratorio' + newButton: '+ nuevo laboratorio' }, alerts: { - request_completed_title: 'Pedido de laboratorio competado', - request_completed_message: 'El pedido de laboratorio ha sido completado.', - request_saved_title: 'Silicitud de laboratorio guardado', - request_saved_message: 'El pedido de laboratorio ha sido guardado.' + requestCompletedTitle: 'Pedido de laboratorio competado', + requestCompletedMessage: 'El pedido de laboratorio ha sido completado.', + requestSavedTitle: 'Silicitud de laboratorio guardado', + requestSavedMessage: 'El pedido de laboratorio ha sido guardado.' } }, common: { @@ -644,10 +644,10 @@ export default { }, patients: { notes: { - on_behalf_of_label: 'A nombre de', - on_behalf_of_copy: 'a nombre de', - please_select_a_visit: 'Por favor seleccione una visista', - note_label: 'Nota' + onBehalfOfLabel: 'A nombre de', + onBehalfOfCopy: 'a nombre de', + pleaseSelectAVisit: 'Por favor seleccione una visista', + noteLabel: 'Nota' } } }; diff --git a/app/locales/fr/translations.js b/app/locales/fr/translations.js index 8fc8a40ef0..0bf2ba1302 100644 --- a/app/locales/fr/translations.js +++ b/app/locales/fr/translations.js @@ -298,7 +298,7 @@ export default { forAuthorizedPersons: 'Ce rapport est destiné uniquement aux personnes autorisées.' }, alerts: { - please_wait: 'Veuillez attendre' + pleaseWait: 'Veuillez attendre' }, buttons: { complete: 'Traiter', @@ -346,197 +346,197 @@ export default { quantity: 'Quantité après traitement:', reason: 'Motif:', returned: 'Retourné par le patient:', - transferred_from: 'Transféré de:', - transferred_to: 'Transféré à:' + transferredFrom: 'Transféré de:', + transferredTo: 'Transféré à:' }, labels: { action: 'Action', add: 'Ajouter', adjust: 'Ajuster', - adjustment_date: 'Date d\'ajustement', - adjustment_for: 'Ajustement pour', - adjustment_type: 'Type d\'ajustement', + adjustmentDate: 'Date d\'ajustement', + adjustmentFor: 'Ajustement pour', + adjustmentType: 'Type d\'ajustement', aisle: 'Rayon', - aisle_location: 'Emplacement du rayon', - all_inventory: 'Toute l\'inventaire', - bill_to: 'Facturer à', - consume_purchases: 'Utiliser les achats', - consumption_rate: 'Taux d\'utilisation', + aisleLocation: 'Emplacement du rayon', + allInventory: 'Toute l\'inventaire', + billTo: 'Facturer à', + consumePurchases: 'Utiliser les achats', + consumptionRate: 'Taux d\'utilisation', cost: 'Coût', - cost_per_unit: 'Coût par unité', - cross_reference: 'Reference', - current_quantity: 'Quantité actuelle', - date_completed: 'Date de traitement', - date_effective: 'Date d\'effet', - date_end: 'Date de fin', - date_start: 'Date de debut', - date_received: 'Date de réception', - date_tranferred: 'Date de transfert', - days_left: 'Nombre de jours restant', - delivery_aisle: 'Rayon de livraison', - delivery_location: 'Emplacement de livraison', - distribution_unit: 'Unité de distribution', - delete_item: 'Supprimer l\'article', + costPerUnit: 'Coût par unité', + crossReference: 'Reference', + currentQuantity: 'Quantité actuelle', + dateCompleted: 'Date de traitement', + dateEffective: 'Date d\'effet', + dateEnd: 'Date de fin', + dateStart: 'Date de debut', + dateReceived: 'Date de réception', + dateTransferred: 'Date de transfert', + daysLeft: 'Nombre de jours restant', + deliveryAisle: 'Rayon de livraison', + deliveryLocation: 'Emplacement de livraison', + distributionUnit: 'Unité de distribution', + deleteItem: 'Supprimer l\'article', details: 'Détails', - edit_item: 'Modifier l\'article', + editItem: 'Modifier l\'article', expense: 'Dépenses pour', - expiration_date: 'Date d\'expiration', - fulfill_request: 'Traiter la demande', - fulfill_request_now: 'Traiter la demande maintenant', + expirationDate: 'Date d\'expiration', + fulfillRequest: 'Traiter la demande', + fulfillRequestNow: 'Traiter la demande maintenant', gift: 'Don en nature', - gift_usage: 'Utilisation de don en nature', - gift_in_kind_no: 'N', - gift_in_kind_yes: 'O', - inventory_consumed: 'Inventaire utilisé', - inventory_item: 'Article à inventorier', - inventory_obsolence: 'Inventory Obsolence', - invoice_items: 'Articles de facture', - invoice_line_item: 'Article de facture', - invoice_number: 'Numero de facture', + giftUsage: 'Utilisation de don en nature', + giftInKindNo: 'N', + giftInKindYes: 'O', + inventoryConsumed: 'Inventaire utilisé', + inventoryItem: 'Article à inventorier', + inventoryObsolence: 'Inventory Obsolence', + invoiceItems: 'Articles de facture', + invoiceLineItem: 'Article de facture', + invoiceNumber: 'Numero de facture', item: 'Article', items: 'Articles', - item_number: 'Numero d\'article', + itemNumber: 'Numero d\'article', location: 'Emplacement', locations: 'Emplacements', name: 'Nom', - mark_as_consumed: 'Marqué comme utilisé', - new_item: 'Nouvel article', - original_quantity: 'Quantité originale', + markAsConsumed: 'Marqué comme utilisé', + newItem: 'Nouvel article', + originalQuantity: 'Quantité originale', print: 'Imprimer', - print_barcode: 'Imprimer le code barre', + printBarcode: 'Imprimer le code barre', printer: 'Imprimante', - pull_from: 'Tirer de', + pullFrom: 'Tirer de', purchases: 'Achats', - purchase_cost: 'Coût d\'achat', - purchase_info: 'Détails de l\'achat', + purchaseCost: 'Coût d\'achat', + purchaseInfo: 'Détails de l\'achat', quantity: 'Quantité ({{unit}})', - quantity_available: 'Quantité disponible', - quantity_on_hand: 'Quantité en main', - quantity_requested: 'Quantité demandée', + quantityAvailable: 'Quantité disponible', + quantityOnHand: 'Quantité en main', + quantityRequested: 'Quantité demandée', rank: 'Rang', reason: 'Motif', remove: 'Retirer', - reorder_point: 'Point de commande', - requested_items: 'Articles demandés', - sale_price_per_unit: 'Prix de vente unitaire', + reorderPoint: 'Point de commande', + requestedItems: 'Articles demandés', + salePricePerUnit: 'Prix de vente unitaire', save: 'Enregistrer', - serial_number: 'Numéro de série / lot', + serialNumber: 'Numéro de série / lot', total: 'Total', - total_cost: 'Coût total', - total_received: 'Total reçu: {{total}}', + totalCost: 'Coût total', + totalReceived: 'Total reçu: {{total}}', transaction: 'Transaction', transactions: 'Transactions', transfer: 'Transférer', - transfer_from: 'Transféré de', - transfer_to: 'Transférer à l\'emplacement', - transfer_to_aisle: 'Transférer à l\'emplacement du rayon', + transferFrom: 'Transféré de', + transferTo: 'Transférer à l\'emplacement', + transferToAisle: 'Transférer à l\'emplacement du rayon', unit: 'Unité', - unit_cost: 'Coût unitaire', + unitCost: 'Coût unitaire', vendor: 'Fournisseur', - vendor_item_number: 'Numéro d\'article fournisseur', + vendorItemNumber: 'Numéro d\'article fournisseur', xref: 'XRef' }, messages: { adjust: 'Veuillez ajuster les quantités sur le ou les emplacement(s) appropriée(s) pour tenir compte de la différence de {{difference}}.', - create_request: 'Créer une nouvelle demande?', + createRequest: 'Créer une nouvelle demande?', delete: 'Etes-vous sûr que vous souhaitez supprimer {{name}}?', - item_not_found: 'L\'article d\'inventaire {{item}} ne pouvait pas être retrouvé.
Si vous voulez créer un nouvel article d\'inventaire, veuillez saisir les informations ci-dessous.
Sinon, appuyez sur le bouton Annuler pour retourner.', + itemNotFound: 'L\'article d\'inventaire {{item}} ne pouvait pas être retrouvé.
Si vous voulez créer un nouvel article d\'inventaire, veuillez saisir les informations ci-dessous.
Sinon, appuyez sur le bouton Annuler pour retourner.', loading: 'Chargement des transactions en cours…', - purchase_saved: 'Les achats d\'inventaire ont été enregistrés avec succès.', - no_requests: 'Aucune demande retrouvée.', - no_items: 'Aucun article retrouvé.', + purchaseSaved: 'Les achats d\'inventaire ont été enregistrés avec succès.', + noRequests: 'Aucune demande retrouvée.', + noItems: 'Aucun article retrouvé.', quantity: 'La quantité totale de ({{quantity}}) ne correspond pas à la quantité totale dans les emplacements ({{locationQuantity}}).', - remove_item: 'Etes-vous sûr de vouloir retirer cet article de cette facture?', - remove_item_request: 'Etes-vous sûr de vouloir supprimer cet article de cette demande?', - request_fulfilled: 'La demande d\'inventaire a été traitée.', - request_updated: 'La demande d\'inventaire a été mis à jour.', + removeItem: 'Etes-vous sûr de vouloir retirer cet article de cette facture?', + removeItemRequest: 'Etes-vous sûr de vouloir supprimer cet article de cette demande?', + requestFulfilled: 'La demande d\'inventaire a été traitée.', + requestUpdated: 'La demande d\'inventaire a été mis à jour.', warning: 'Veuillez remplir les champs obligatoires (marqués d\'un *) et corriger les erreurs avant d\'ajouter.' }, reports: { rows: { adjustments: 'Ajustements', - adjustments_total: 'Ajustements totaux', - balance_begin: 'Solde d\'ouverture', - balance_end: 'Solde de clôture', + adjustmentsTotal: 'Ajustements totaux', + balanceBegin: 'Solde d\'ouverture', + balanceEnd: 'Solde de clôture', category: 'Catégorie', consumed: 'Utilisé', - consumed_gik: 'GiK utilisé', - consumed_gik_total: 'GiK total utilisé', - consumed_puchases: 'Achats utilisés', - consumed_purchases_total: 'Achats totaux utilisés', - consumed_total: 'Total utilisé', - err_in_fin_sum: 'Erreur dans _generateFinancialSummaryReport: ', - err_in_find_pur: 'Erreur dans _findInventoryItemsByPurchase: ', - err_in_find_req: 'Erreur dans _findInventoryItemsByRequest: ', - expenses_for: 'Dépenses pour: ', - no_account: '(Pas de compte)', + consumedGik: 'GiK utilisé', + consumedGikTotal: 'GiK total utilisé', + consumedPuchases: 'Achats utilisés', + consumedPurchasesTotal: 'Achats totaux utilisés', + consumedTotal: 'Total utilisé', + errInFinSum: 'Erreur dans _generateFinancialSummaryReport: ', + errInFindPur: 'Erreur dans _findInventoryItemsByPurchase: ', + errInFindReq: 'Erreur dans _findInventoryItemsByRequest: ', + expensesFor: 'Dépenses pour: ', + noAccount: '(Pas de compte)', subtotal: 'Sous-total: ', - subtotal_for: 'Sous-total pour {{category}} - {{account}}: ', + subtotalFor: 'Sous-total pour {{category}} - {{account}}: ', total: 'Total: ', - total_for: 'Total pour {{var}}: ', - total_purchases: 'Achats totaux', + totalFor: 'Total pour {{var}}: ', + totalPurchases: 'Achats totaux', transfer1: '{{quantity}} de {{location}}', trasnfer2: 'De: {{source}} A: {{target}}' }, adjustment: 'Ajustement détaillée', - days_supply: 'Stock restant (en nombre de jours)', - expense_detail: 'Détails des dépenses', - expense_sum: 'Résumé des dépenses', + daysSupply: 'Stock restant (en nombre de jours)', + expenseDetail: 'Détails des dépenses', + expenseSum: 'Résumé des dépenses', expiration: 'Date d\'expiration', export: 'Exporter un rapport', fields: 'Champs à inclure', finance: 'Résumé des finances', generate: 'Créer un rapport', - inv_location: 'Inventaire par emplacement', - inv_valuation: 'Valorisation de l\'inventaire', - purchase_detail: 'Détails de l\'achat', - purchase_sum: 'Résumé de l\'achat', - report_type: 'Type de rapport', - stock_transfer_detail: 'Transfert détaillé du stock', - stock_transfer_sum: 'Résumé du transfert du stock', - stock_usage_detail: 'Utilisation détaillée du stock', - stock_usage_sum: 'Résumé de l\'utilisation du stock' + invLocation: 'Inventaire par emplacement', + invValuation: 'Valorisation de l\'inventaire', + purchaseDetail: 'Détails de l\'achat', + purchaseSum: 'Résumé de l\'achat', + reportType: 'Type de rapport', + stockTransferDetail: 'Transfert détaillé du stock', + stockTransferSum: 'Résumé du transfert du stock', + stockUsageDetail: 'Utilisation détaillée du stock', + stockUsageSum: 'Résumé de l\'utilisation du stock' }, titles: { - add_purchase: 'Ajouter un achat', - add_request: 'Nouvelle demande', + addPurchase: 'Ajouter un achat', + addRequest: 'Nouvelle demande', adjustment: 'Ajustement', - edit_purchase: 'Modifier l\'achat', - edit_request: 'Modifier la demande', - inventory_item: 'Nouvel article d\'inventaire', - inventory_report: 'Rapport d\'inventaire', - purchase_saved: 'Achats d\'inventaire enregistrés', - quick_add_title: 'Nouvel article d\'inventaire', - remove_item: 'Retirer l\'article', - request_fulfilled: 'Demande traitée', - request_updated: 'Demande mis à jour', + editPurchase: 'Modifier l\'achat', + editRequest: 'Modifier la demande', + inventoryItem: 'Nouvel article d\'inventaire', + inventoryReport: 'Rapport d\'inventaire', + purchaseSaved: 'Achats d\'inventaire enregistrés', + quickAddTitle: 'Nouvel article d\'inventaire', + removeItem: 'Retirer l\'article', + requestFulfilled: 'Demande traitée', + requestUpdated: 'Demande mis à jour', transfer: 'Transférer les articles', warning: 'Attention!!!!!' } }, imaging: { - page_title: 'Demandes d\'imagerie', - section_title: 'Imagerie', + pageTitle: 'Demandes d\'imagerie', + sectionTitle: 'Imagerie', buttons: { - new_button: '+ nouvelle imagerie' + newButton: '+ nouvelle imagerie' }, labels: { radiologist: 'Radiologiste', - add_new_visit: '--Ajouter une nouvelle visite--' + addNewVisit: '--Ajouter une nouvelle visite--' }, messages: { - no_completed: 'Aucun article traité retrouvé.' + noCompleted: 'Aucun article traité retrouvé.' }, titles: { - completed_imaging: 'Imagerie traitée', - edit_title: 'Modifier la demande d\'imagerie', - new_title: 'Nouvelle demande d\'imagerie' + completedImaging: 'Imagerie traitée', + editTitle: 'Modifier la demande d\'imagerie', + newTitle: 'Nouvelle demande d\'imagerie' }, alerts: { - completed_title: 'Demande d\'imagerie traitée' , - completed_message: 'La demande d\'imagerie a été traitée.', - saved_title: 'Demande d\'imagerie enregistrée', - saved_message: 'La demande d\'imagerie a été enregistrée.' + completedTitle: 'Demande d\'imagerie traitée' , + completedMessage: 'La demande d\'imagerie a été traitée.', + savedTitle: 'Demande d\'imagerie enregistrée', + savedMessage: 'La demande d\'imagerie a été enregistrée.' } }, medication: { @@ -597,48 +597,48 @@ export default { visits: { edit: { buttons: { - new_appointment: 'Nouveau rendez-vous', - add_diagnosis: 'Ajoute un diagnostic', - new_procedure: 'Nouvelle procédure', - new_lab: 'Nouveau labo', - new_imaging: 'Nouvelle imagerie', - new_medication: 'Nouveau médicament' + newAppointment: 'Nouveau rendez-vous', + addDiagnosis: 'Ajoute un diagnostic', + newProcedure: 'Nouvelle procédure', + newLab: 'Nouveau labo', + newImaging: 'Nouvelle imagerie', + newMedication: 'Nouveau médicament' }, labels: { diagnosis: 'Diagnostic', procedure: 'Procédure', - authored_by: 'Crée par', + authoredBy: 'Crée par', labs: 'Labos', imaging: 'Imagerie', - visit_information: 'Détails de la visite' + visitInformation: 'Détails de la visite' } } }, labs: { - section_title: 'Labos', - requests_title: 'Demandes de labo', - edit_title: 'Modifier la demande de labo', - new_title: 'Nouvelle demande de labo', - delete_title: 'Supprimer la demande', - completed_title: 'Labos traités', + sectionTitle: 'Labos', + requestsTitle: 'Demandes de labo', + editTitle: 'Modifier la demande de labo', + newTitle: 'Nouvelle demande de labo', + deleteTitle: 'Supprimer la demande', + completedTitle: 'Labos traités', labels: { - lab_type: 'Type de labo', - add_new_visit: '--Ajouter une nouvelle visite--' + labType: 'Type de labo', + addNewVisit: '--Ajouter une nouvelle visite--' }, messages: { - no_items_found: 'Aucun labo retrouvé.', - create_new_record: 'Créer un nouveau dossier?', - confirm_deletion: 'Etes-vous sûr de vouloir supprimer cette demande de labo?', - no_completed: 'Aucun article traité retrouvé.' + noItemsFound: 'Aucun labo retrouvé.', + createNewRecord: 'Créer un nouveau dossier?', + confirmDeletion: 'Etes-vous sûr de vouloir supprimer cette demande de labo?', + noCompleted: 'Aucun article traité retrouvé.' }, buttons: { - new_button: '+ nouveau labo' + newButton: '+ nouveau labo' }, alerts: { - request_completed_title: 'Demande de labo traitée', - request_completed_message: 'La demande de labo a été traitée.', - request_saved_title: 'Demande de labo enregistrée', - request_saved_message: 'La demande de labo a été enregistrée.' + requestCompletedTitle: 'Demande de labo traitée', + requestCompletedMessage: 'La demande de labo a été traitée.', + requestSavedTitle: 'Demande de labo enregistrée', + requestSavedMessage: 'La demande de labo a été enregistrée.' } }, common: { @@ -646,10 +646,10 @@ export default { }, patients: { notes: { - on_behalf_of_label: 'De la part de', - on_behalf_of_copy: 'de la part de', - please_select_a_visit: 'Veuillez sélectionner une visite', - note_label: 'Note' + onBehalfOfLabel: 'De la part de', + onBehalfOfCopy: 'de la part de', + pleaseSelectAVisit: 'Veuillez sélectionner une visite', + noteLabel: 'Note' } } }; diff --git a/app/locales/pt-BR/translations.js b/app/locales/pt-BR/translations.js index 7778a9e08d..881835d7bb 100644 --- a/app/locales/pt-BR/translations.js +++ b/app/locales/pt-BR/translations.js @@ -52,33 +52,33 @@ export default { }, inventory: { messages: { - no_requests: 'Requisições não encontradas.', - create_request: 'Criar uma nova requisição?' + noRequests: 'Requisições não encontradas.', + createRequest: 'Criar uma nova requisição?' } }, imaging: { - page_title: 'Requisição de imagens', - section_title: 'Imagem', + pageTitle: 'Requisição de imagens', + sectionTitle: 'Imagem', buttons: { - new_button: '+ nova imagem' - }, + newButton: '+ nova imagem' + }, labels: { - radiologist: 'Radiologista', - add_new_visit: '--Adicionar novo visitante--' - }, + radiologist: 'Radiologista', + addNewVisit: '--Adicionar novo visitante--' + }, messages: { - no_completed: 'Nenhum item completo encontrado.' - }, + noCompleted: 'Nenhum item completo encontrado.' + }, titles: { - completed_imaging: 'Imagem completa', - edit_title: 'Requisição de edição de imagem', - new_title: 'Nova requisição de imagem' - }, + completedImaging: 'Imagem completa', + editTitle: 'Requisição de edição de imagem', + newTitle: 'Nova requisição de imagem' + }, alerts: { - completed_title: 'Requisição de imagem completa.', - completed_message: 'A requisição de imagem esta completa.', - saved_title: 'Requisição de imagem salva.', - saved_message: 'A requisição de imagem foi salva.' - } + completedTitle: 'Requisição de imagem completa.', + completedMessage: 'A requisição de imagem esta completa.', + savedTitle: 'Requisição de imagem salva.', + savedMessage: 'A requisição de imagem foi salva.' + } } }; diff --git a/app/locales/ru/translations.js b/app/locales/ru/translations.js index 7f293e8a2b..1a9fa05237 100755 --- a/app/locales/ru/translations.js +++ b/app/locales/ru/translations.js @@ -51,33 +51,33 @@ export default { }, inventory: { messages: { - no_requests: 'Запросов не найдено.', - create_request: 'Создать новый запрос?' + noRequests: 'Запросов не найдено.', + createRequest: 'Создать новый запрос?' } }, imaging: { - page_title: 'Запросы на визуализацию', - section_title: 'Визуализация', + pageTitle: 'Запросы на визуализацию', + sectionTitle: 'Визуализация', buttons: { - new_button: '+ новый запрос' + newButton: '+ новый запрос' }, labels: { radiologist: 'Радиолог', - add_new_visit: '--Добавить новый тип осмотра--' + addNewVisit: '--Добавить новый тип осмотра--' }, messages: { - no_completed: 'Не найдено выполненых запросов.' + noCompleted: 'Не найдено выполненых запросов.' }, titles: { - completed_imaging: 'Выполненые запросы', - edit_title: 'Редактировать запрос на визуализацию', - new_title: 'Новый запрос на визуализацию' + completedImaging: 'Выполненые запросы', + editTitle: 'Редактировать запрос на визуализацию', + newTitle: 'Новый запрос на визуализацию' }, alerts: { - completed_title: 'Визуализация выполнена', - completed_message: 'Запрос на визуализацию удовлетворён.', - saved_title: 'Запрос сохранён', - saved_message: 'Запрос на визуализацию сохранён.' + completedTitle: 'Визуализация выполнена', + completedMessage: 'Запрос на визуализацию удовлетворён.', + savedTitle: 'Запрос сохранён', + savedMessage: 'Запрос на визуализацию сохранён.' } } }; diff --git a/app/locales/tr/translations.js b/app/locales/tr/translations.js index 8580d0b6ba..6ac571d0ed 100644 --- a/app/locales/tr/translations.js +++ b/app/locales/tr/translations.js @@ -51,33 +51,33 @@ export default { }, inventory: { messages: { - no_requests: 'Talep bulunamadı', - create_request: 'Yeni talep oluştur?' + noRequests: 'Talep bulunamadı', + createRequest: 'Yeni talep oluştur?' } }, imaging: { - page_title: 'Görüntüleme talepleri', - section_title: 'Görüntüleme', + pageTitle: 'Görüntüleme talepleri', + sectionTitle: 'Görüntüleme', buttons: { - new_button: '+ yeni görüntüleme' + newButton: '+ yeni görüntüleme' }, labels: { radiologist: 'Radyolog', - add_new_visit: '--Yeni Ziyaret Ekle--' + addNewVisit: '--Yeni Ziyaret Ekle--' }, messages: { - no_completed: 'Tamamlanmayan öğe bulunamadı.' + noCompleted: 'Tamamlanmayan öğe bulunamadı.' }, titles: { - completed_imaging: 'Görüntüleme Tamamlandı', - edit_title: 'Görüntüleme Talebini Düzenle', - new_title: 'Yeni Görüntüleme Talebi' + completedImaging: 'Görüntüleme Tamamlandı', + editTitle: 'Görüntüleme Talebini Düzenle', + newTitle: 'Yeni Görüntüleme Talebi' }, alerts: { - completed_title: 'Görüntüleme Talebi Tamamlandı', - completed_message: 'Görüntüleme talebi başarıyla tamamlandı.', - saved_title: 'Görüntüleme Talebi Kaydedildi', - saved_message: 'Görüntüleme Talebi başarıyla kaydedildi.' + completedTitle: 'Görüntüleme Talebi Tamamlandı', + completedMessage: 'Görüntüleme talebi başarıyla tamamlandı.', + savedTitle: 'Görüntüleme Talebi Kaydedildi', + savedMessage: 'Görüntüleme Talebi başarıyla kaydedildi.' } } }; diff --git a/app/medication/edit/controller.js b/app/medication/edit/controller.js index 768543a551..36ee91b26d 100644 --- a/app/medication/edit/controller.js +++ b/app/medication/edit/controller.js @@ -87,7 +87,7 @@ export default AbstractEditController.extend(InventorySelection, FulfillRequest, _addNewPatient: function() { let i18n = this.get('i18n'); - this.displayAlert(i18n.t('alerts.please_wait'), i18n.t('messages.new_patient_has_to_be_created')); + this.displayAlert(i18n.t('alerts.pleaseWait'), i18n.t('messages.newPatientHasToBeCreated')); this._getNewPatientId().then(function(friendlyId) { var patientTypeAhead = this.get('model.patientTypeAhead'), nameParts = patientTypeAhead.split(' '), diff --git a/app/models/patient-note.js b/app/models/patient-note.js index 84e3b6c827..9d2c36c4c9 100644 --- a/app/models/patient-note.js +++ b/app/models/patient-note.js @@ -5,7 +5,7 @@ export default AbstractModel.extend({ authoredBy: function() { if (!Ember.isEmpty(this.get('attribution'))) { let i18n = this.get('i18n'); - return this.get('createdBy') + ' ' + i18n.t('patients.notes.on_behalf_of_copy') + ' ' + this.get('attribution'); + return this.get('createdBy') + ' ' + i18n.t('patients.notes.onBehalfOfCopy') + ' ' + this.get('attribution'); } else { return this.get('createdBy'); } @@ -39,4 +39,4 @@ export default AbstractModel.extend({ presence: true } } -}); \ No newline at end of file +}); diff --git a/app/patients/delete/template.hbs b/app/patients/delete/template.hbs index bae56861be..d4dd50186d 100644 --- a/app/patients/delete/template.hbs +++ b/app/patients/delete/template.hbs @@ -5,6 +5,6 @@ updateButtonText=updateButtonText }}
- {{t 'patients.messages.delete_patient' model}} + {{t 'patients.messages.deletePatient' model}}
{{/modal-dialog}} diff --git a/app/patients/edit/controller.js b/app/patients/edit/controller.js index 0219fa7234..cb610c229f 100644 --- a/app/patients/edit/controller.js +++ b/app/patients/edit/controller.js @@ -369,8 +369,8 @@ export default AbstractEditController.extend(BloodTypes, ReturnTo, UserSession, showDeleteContact: function(contact) { this.send('openModal', 'dialog', Ember.Object.create({ confirmAction: 'deleteContact', - title: this.get('i18n').t('patients.titles.delete_contact'), - message: this.get('i18n').t('patients.titles.delete_photo', { object: 'contact' }), + title: this.get('i18n').t('patients.titles.deleteContact'), + message: this.get('i18n').t('patients.titles.deletePhoto', { object: 'contact' }), contactToDelete: contact, updateButtonAction: 'confirm', updateButtonText: this.get('i18n').t('buttons.ok') @@ -380,8 +380,8 @@ export default AbstractEditController.extend(BloodTypes, ReturnTo, UserSession, showDeleteExpense: function(expense) { this.send('openModal', 'dialog', Ember.Object.create({ confirmAction: 'deleteExpense', - title: this.get('i18n').t('patients.titles.delete_expense'), - message: this.get('i18n').t('patients.titles.delete_photo', { object: 'expense' }), + title: this.get('i18n').t('patients.titles.deleteExpense'), + message: this.get('i18n').t('patients.titles.deletePhoto', { object: 'expense' }), expenseToDelete: expense, updateButtonAction: 'confirm', updateButtonText: this.get('i18n').t('buttons.ok') @@ -391,8 +391,8 @@ export default AbstractEditController.extend(BloodTypes, ReturnTo, UserSession, showDeleteFamily: function(familyInfo) { this.send('openModal', 'dialog', Ember.Object.create({ confirmAction: 'deleteFamily', - title: this.get('i18n').t('patients.titles.delete_family_member'), - message: this.get('i18n').t('patients.titles.delete_photo', { object: 'family member' }), + title: this.get('i18n').t('patients.titles.deleteFamilyMember'), + message: this.get('i18n').t('patients.titles.deletePhoto', { object: 'family member' }), familyToDelete: familyInfo, updateButtonAction: 'confirm', updateButtonText: this.get('i18n').t('buttons.ok') @@ -415,8 +415,8 @@ export default AbstractEditController.extend(BloodTypes, ReturnTo, UserSession, showDeletePhoto: function(photo) { this.send('openModal', 'dialog', Ember.Object.create({ confirmAction: 'deletePhoto', - title: this.get('i18n').t('patients.titles.delete_photo'), - message: this.get('i18n').t('patients.titles.delete_photo', { object: 'photo' }), + title: this.get('i18n').t('patients.titles.deletePhoto'), + message: this.get('i18n').t('patients.titles.deletePhoto', { object: 'photo' }), photoToDelete: photo, updateButtonAction: 'confirm', updateButtonText: this.get('i18n').t('buttons.ok') @@ -521,10 +521,10 @@ export default AbstractEditController.extend(BloodTypes, ReturnTo, UserSession, afterUpdate: function(record) { this.send('openModal', 'dialog', Ember.Object.create({ - title: this.get('i18n').t('patients.titles.saved_patient'), - message: this.get('i18n').t('patients.messages.saved_patient', record), + title: this.get('i18n').t('patients.titles.savedPatient'), + message: this.get('i18n').t('patients.messages.savedPatient', record), updateButtonAction: 'returnToPatient', - updateButtonText: this.get('i18n').t('patients.buttons.back_to_patients'), + updateButtonText: this.get('i18n').t('patients.buttons.backToPatients'), cancelButtonText: this.get('i18n').t('buttons.close') })); } diff --git a/app/patients/edit/template.hbs b/app/patients/edit/template.hbs index 7afeb2e49d..2594f4bf8d 100644 --- a/app/patients/edit/template.hbs +++ b/app/patients/edit/template.hbs @@ -12,7 +12,7 @@
  • {{t 'patients.navigation.imaging'}}
  • {{t 'patients.navigation.labs'}}
    • {{#if canAddSocialWork}} -
  • {{t 'patients.navigation.social_work'}}
    • +
  • {{t 'patients.navigation.socialWork'}}
    • {{/if}} {{/unless}} @@ -46,7 +46,7 @@ {{#if visit.historySince}}
    -
    {{t "patients.headings.history_since"}}
    +
    {{t "patients.headings.historySince"}}
    {{html-line-break visit.historySince}}
    {{/if}} @@ -130,19 +130,19 @@
    {{em-input property="friendlyId" label=(t 'labels.id') class="form-input-group required test-id"}} - {{em-input property="firstName" label=(t 'patients.labels.first_name') class="form-input-group required test-first-name"}} - {{em-input property="middleName" label=(t 'patients.labels.middle_name') class="form-input-group test-middle-name"}} - {{em-input property="lastName" label=(t 'patients.labels.last_name') class="form-input-group required test-last-name"}} + {{em-input property="firstName" label=(t 'patients.labels.firstName') class="form-input-group required test-first-name"}} + {{em-input property="middleName" label=(t 'patients.labels.middleName') class="form-input-group test-middle-name"}} + {{em-input property="lastName" label=(t 'patients.labels.lastName') class="form-input-group required test-last-name"}} {{select-or-typeahead property="sex" label=(t 'patients.labels.sex') class="form-input-group" list=sexList selection=model.sex}} - {{date-picker property="dateOfBirth" label=(t 'patients.labels.date_of_birth') class="form-input-group " maxDate="now"}} + {{date-picker property="dateOfBirth" label=(t 'patients.labels.dateOfBirth') class="form-input-group " maxDate="now"}}

    {{model.age}}

    - {{em-input property="placeOfBirth" label=(t 'patients.labels.place_of_birth') class="form-input-group"}} + {{em-input property="placeOfBirth" label=(t 'patients.labels.placeOfBirth') class="form-input-group"}} {{em-input property="occupation" label=(t 'patients.labels.occupation') class="form-input-group"}}
    - +
    {{ext-radio content=patientTypes value=model.patientType showInline=true }}
    @@ -150,17 +150,17 @@
    {{select-or-typeahead property="status" label=(t 'patients.labels.status') list=statusList selection=model.status class="form-input-group" }} - {{em-input property="externalPatientId" label=(t 'patients.labels.external_patient_id') class="form-input-group"}} + {{em-input property="externalPatientId" label=(t 'patients.labels.externalPatientId') class="form-input-group"}} {{em-select prompt=" " - label=(t 'patients.labels.blood_type') + label=(t 'patients.labels.bloodType') property="bloodType" content=bloodTypes class="form-input-group" }} {{select-or-typeahead property="clinic" label=(t 'patients.labels.clinic') list=clinicList selection=model.clinic class="form-input-group"}} - {{em-input property="referredBy" label=(t 'patients.labels.referred_by') class="form-input-group"}} - {{date-picker property="referredDate" label=(t 'patients.labels.referred_date') class="form-input-group"}} + {{em-input property="referredBy" label=(t 'patients.labels.referredBy') class="form-input-group"}} + {{date-picker property="referredDate" label=(t 'patients.labels.referredDate') class="form-input-group"}} {{em-input property="religion" label=(t 'patients.labels.religion') class="form-input-group"}} {{em-input property="parent" label=(t 'patients.labels.parent') class="form-input-group"}} {{em-select label=(t 'billing.labels.paymentProfile') @@ -179,7 +179,7 @@ {{#if canAddContact}}
    {{/if}} @@ -243,7 +243,7 @@ {{#if canAddPhoto}}
    {{/if}} @@ -277,7 +277,7 @@ {{#if canAddAppointment}}
    {{/if}} @@ -319,7 +319,7 @@ {{#if canAddVisit}}
    {{/if}} @@ -361,7 +361,7 @@ {{#if canAddMedication}}
    {{/if}} @@ -375,7 +375,7 @@ {{#if canAddImaging}}
    {{/if}} @@ -389,7 +389,7 @@ {{#if canAddLab}}
    {{/if}} @@ -403,16 +403,16 @@

    - {{t 'patients.titles.family_information'}} + {{t 'patients.titles.familyInformation'}}

    - + @@ -444,14 +444,14 @@

    {{t 'patients.titles.expenses'}}

    {{t 'labels.name'}} {{t 'labels.age'}}{{t 'patients.labels.civil_status'}}{{t 'patients.labels.civilStatus'}} {{t 'patients.labels.relationship'}} {{t 'patients.labels.education'}} {{t 'patients.labels.occupation'}}
    - + {{#each model.expenses as |expense|}} @@ -471,7 +471,7 @@ {{/each}} {{#if showExpenseTotal}} - + diff --git a/app/patients/imaging/template.hbs b/app/patients/imaging/template.hbs index 4a34c54432..7f791e8a82 100644 --- a/app/patients/imaging/template.hbs +++ b/app/patients/imaging/template.hbs @@ -3,7 +3,7 @@ - + diff --git a/app/patients/index/route.js b/app/patients/index/route.js index 88e7f144d6..48416842e1 100644 --- a/app/patients/index/route.js +++ b/app/patients/index/route.js @@ -3,7 +3,7 @@ import { translationMacro as t } from 'ember-i18n'; export default AbstractIndexRoute.extend({ modelName: 'patient', - pageTitle: t('patients.titles.patient_listing'), + pageTitle: t('patients.titles.patientListing'), _getStartKeyFromItem: function(item) { var displayPatientId = item.get('displayPatientId'); diff --git a/app/patients/index/template.hbs b/app/patients/index/template.hbs index 40156b080d..124f881c73 100644 --- a/app/patients/index/template.hbs +++ b/app/patients/index/template.hbs @@ -4,8 +4,8 @@ {{#sortable-column sortBy='id' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.id'}}{{/sortable-column}} - {{#sortable-column sortBy='firstName' sortDesc=sortDesc sortKey=sortKey }}{{t 'patients.labels.first_name'}}{{/sortable-column}} - {{#sortable-column sortBy='lastName' sortDesc=sortDesc sortKey=sortKey }}{{t 'patients.labels.last_name'}}{{/sortable-column}} + {{#sortable-column sortBy='firstName' sortDesc=sortDesc sortKey=sortKey }}{{t 'patients.labels.firstName'}}{{/sortable-column}} + {{#sortable-column sortBy='lastName' sortDesc=sortDesc sortKey=sortKey }}{{t 'patients.labels.lastName'}}{{/sortable-column}} {{#sortable-column sortBy='sex' sortDesc=sortDesc sortKey=sortKey }}{{t 'patients.labels.sex'}}{{/sortable-column}} {{#sortable-column sortBy='dateOfBirth' sortDesc=sortDesc sortKey=sortKey }}{{t 'patients.labels.dob'}}{{/sortable-column}} {{#sortable-column sortBy='status' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.status'}}{{/sortable-column}} @@ -49,7 +49,7 @@
    {{t 'labels.category'}} {{t 'patients.labels.sources'}}{{t 'patients.labels.monthly_cost'}}{{t 'patients.labels.monthlyCost'}} {{t 'labels.actions'}}
    {{t 'patients.labels.total_montly_expense'}}{{t 'patients.labels.totalMontlyExpense'}} {{totalExpenses}}
    {{t 'labels.dateRequested'}} {{t 'labels.imagingType'}} {{t 'labels.status'}}{{t 'patients.labels.date_processed'}}{{t 'patients.labels.dateProcessed'}} {{t 'labels.result'}} {{t 'labels.notes'}} {{t 'labels.requestedBy'}}
    {{else}}
    -

    {{t 'patients.messages.no_patients_found'}}{{#if canAdd}} {{t 'patients.messages.create_new_patient'}}{{/if}}

    +

    {{t 'patients.messages.noPatientsFound'}}{{#if canAdd}} {{t 'patients.messages.createNewPatient'}}{{/if}}

    {{/if}} {{/item-listing}} diff --git a/app/patients/labs/template.hbs b/app/patients/labs/template.hbs index 7d25f81af1..70880200b5 100644 --- a/app/patients/labs/template.hbs +++ b/app/patients/labs/template.hbs @@ -1,9 +1,9 @@ - + - + diff --git a/app/patients/notes/controller.js b/app/patients/notes/controller.js index d6fa13543e..27ff17c022 100644 --- a/app/patients/notes/controller.js +++ b/app/patients/notes/controller.js @@ -16,9 +16,9 @@ export default AbstractEditController.extend(IsUpdateDisabled, UserSession, Pati }], title: function() { if (this.get('model.isNew')) { - return `${this.get('i18n').t('patients.notes.new_note')} ${this.get('model.patient.displayName')}`; + return `${this.get('i18n').t('patients.notes.newNote')} ${this.get('model.patient.displayName')}`; } else { - return `${this.get('i18n').t('patients.notes.new_note')} ${(moment(this.get('model.date')).format('MM/DD/YYYY')) + ' for ' + this.get('model.patient.displayName')}`; + return `${this.get('i18n').t('patients.notes.newNote')} ${(moment(this.get('model.date')).format('MM/DD/YYYY')) + ' for ' + this.get('model.patient.displayName')}`; } }.property('model.patient.displayName'), updateCapability: 'add_note', diff --git a/app/patients/notes/template.hbs b/app/patients/notes/template.hbs index 4eb72e1d96..9cdf421827 100644 --- a/app/patients/notes/template.hbs +++ b/app/patients/notes/template.hbs @@ -10,7 +10,7 @@
    {{t 'labels.dateRequested'}}{{t 'labs.labels.lab_type'}}{{t 'labs.labels.labType'}} {{t 'labels.status'}}{{t 'patients.labels.date_processed'}}{{t 'patients.labels.dateProcessed'}} {{t 'labels.result'}} {{t 'labels.notes'}} {{t 'labels.requestedBy'}}
    @@ -113,7 +113,7 @@
    - + @@ -144,7 +144,7 @@ {{t 'labels.procedures' }} {{#if canAddProcedure}} - + {{/if}} @@ -183,7 +183,7 @@ {{t 'visits.labels.medication' }} {{#if canAddMedication}} - + {{/if}} @@ -201,7 +201,7 @@ {{t 'visits.labels.labs' }} {{#if canAddLab}} {{/if}} @@ -220,7 +220,7 @@ {{t 'visits.labels.imaging' }} {{#if canAddImaging}} {{/if}} @@ -239,7 +239,7 @@ {{t "visits.labels.vitals"}} {{#if canAddVitals}} {{/if}} @@ -255,8 +255,8 @@ - - + + {{#each model.vitals as |vital|}} diff --git a/app/visits/vitals/edit/template.hbs b/app/visits/vitals/edit/template.hbs index 0499633be7..f599584d51 100644 --- a/app/visits/vitals/edit/template.hbs +++ b/app/visits/vitals/edit/template.hbs @@ -6,7 +6,7 @@ updateButtonText=updateButtonText }} {{#em-form model=model submitButton=false }}
    - {{date-picker property="dateRecorded" label=(t "vitals.labels.date_recorded") class="col-sm-6" format="l h:mm A" showTime=true }} + {{date-picker property="dateRecorded" label=(t "vitals.labels.dateRecorded") class="col-sm-6" format="l h:mm A" showTime=true }}
    {{em-input class="col-sm-3 required temperature-text" property="temperature" label=temperatureLabel }} @@ -20,8 +20,8 @@ {{em-input class="col-sm-3 required dbp-text" property="dbp" label=(t "vitals.labels.dbp")}}
    - {{em-input class="col-sm-3 required heart-rate-text" property="heartRate" label=(t "vitals.labels.heart_rate")}} - {{em-input class="col-sm-3 required respiratory-rate-text" property="respiratoryRate" label=(t "vitals.labels.respiratory_rate")}} + {{em-input class="col-sm-3 required heart-rate-text" property="heartRate" label=(t "vitals.labels.heartRate")}} + {{em-input class="col-sm-3 required respiratory-rate-text" property="respiratoryRate" label=(t "vitals.labels.respiratoryRate")}}
    {{/em-form}} {{/modal-dialog}}
    {{t 'labels.date'}}{{t 'visits.labels.authored_by'}}{{t 'visits.labels.authoredBy'}} {{t 'labels.note'}} {{t 'labels.actions'}}
    {{t "vitals.labels.height"}} {{t "vitals.labels.sbp"}} {{t "vitals.labels.dbp"}}{{t "vitals.labels.heart_rate"}}{{t "vitals.labels.respiratory_rate"}}{{t "vitals.labels.heartRate"}}{{t "vitals.labels.respiratoryRate"}} {{t "labels.delete"}}