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

@@ -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'
 });

app/imaging/completed/template.hbs

@@ -16,7 +16,7 @@
     </table>
   {{else}}
     <div class="alert alert-info">
-      <p>{{t 'imaging.messages.no_completed'}}</p>
+      <p>{{t 'imaging.messages.noCompleted'}}</p>
     </div>
   {{/if}}
 {{/item-listing}}

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');

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: {

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
         }}
       </div>

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) {

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')
 });

app/inventory/adjust/template.hbs

@@ -9,24 +9,24 @@
       <p class="form-control-static">{{model.adjustmentItem.name}}</p>
     </div>
     <div class="form-group">
-      <label class="control-label">{{t 'inventory.labels.adjustment_for'}}</label>
+      <label class="control-label">{{t 'inventory.labels.adjustmentFor'}}</label>
       <p class="form-control-static">{{model.locationName}}</p>
     </div>
     <div class="form-group">
-      <label class="control-label">{{t 'inventory.labels.current_quantity'}}</label>
+      <label class="control-label">{{t 'inventory.labels.currentQuantity'}}</label>
       <p class="form-control-static">{{model.quantity}}</p>
     </div>
     <div class="row">
-      {{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"
       }}
       {{em-input property="adjustmentQuantity" label=(t 'labels.quantity') class="col-sm-3 required"}}
     </div>
     {{em-text label=(t 'inventory.labels.reason') property="reason" rows=3}}
     <div class="row">
-      {{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"}}
     </div>
   {{/em-form}}
-{{/modal-dialog}}
+{{/modal-dialog}}

app/inventory/barcode/template.hbs

@@ -7,25 +7,24 @@
 {{#if havePrinters}}
 <div class="panel panel-primary">
     <div class="panel-heading">
-        <h3 class="panel-title">{{t 'inventory.labels.print_barcode'}}</h3>
-    </div>    
+        <h3 class="panel-title">{{t 'inventory.labels.printBarcode'}}</h3>
+    </div>
     <div class="panel-body">
-        <div class="form-group">            
-            {{#unless singlePrinter}}    
+        <div class="form-group">
+            {{#unless singlePrinter}}
                 <label for="printerSelect">{{t 'inventory.labels.printer'}}</label>
-                {{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}}
         </div>
         <button class="btn btn-primary" {{action 'print'}}><span class=" glyphicon glyphicon-print"></span> {{t 'inventory.labels.print'}}</button>
     </div>
 </div>
 {{/if}}
-

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);
     },
 

app/inventory/batch/template.hbs

@@ -1,28 +1,28 @@
 {{#edit-panel editPanelProps=editPanelProps}}
   {{#em-form model=model submitButton=false }}
     <div class="row">
-      {{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"}}
     </div>
     <div class="row">
       {{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"}}
       <div class="form-group col-sm-2">
         <label class="control-label">{{t 'inventory.labels.gift'}}</label>
         {{em-checkbox label=(t 'inventory.labels.gift') property="giftInKind"}}
       </div>
     </div>
     <div class="panel panel-primary">
       <div class="panel-heading">
-        <h3 class="panel-title">{{t 'inventory.labels.invoice_line_item'}}</h3>
+        <h3 class="panel-title">{{t 'inventory.labels.invoiceLineItem'}}</h3>
       </div>
       <div class="panel-body">
         <div class="row">
           {{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 @@
               <p class="form-control-static">{{model.inventoryItem.distributionUnit}}</p>
             {{/if}}
           </div>
-          {{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"}}
         </div>
         <div class="row">
-          {{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"}}
           <div class="form-group col-sm-2">
             <label class="control-label">&nbsp;</label>
             <p class="form-control-static">
@@ -52,15 +52,15 @@
       </div>
     </div>
     {{#if model.invoiceItems}}
-      <h3>{{t 'inventory.labels.invoice_items'}}</h3>
+      <h3>{{t 'inventory.labels.invoiceItems'}}</h3>
       <table class="table">
         <tr class="table-header">
           <th>{{t 'inventory.labels.name'}}</th>
           <th>{{t 'labels.quantity'}}</th>
           <th>{{t 'inventory.labels.cost'}}</th>
-          <th>{{t 'inventory.labels.item_number'}}</th>
-          <th>{{t 'inventory.labels.serial_number'}}</th>
-          <th>{{t 'inventory.labels.expiration_date'}}</th>
+          <th>{{t 'inventory.labels.itemNumber'}}</th>
+          <th>{{t 'inventory.labels.serialNumber'}}</th>
+          <th>{{t 'inventory.labels.expirationDate'}}</th>
           <th>{{t 'inventory.labels.action'}}</th>
         </tr>
         {{#each model.invoiceItems as |invoiceItem|}}
@@ -102,7 +102,7 @@
           </tr>
         {{/each}}
       </table>
-      <h4>{{t 'inventory.labels.total_received' total=totalReceived}}</h4>
+      <h4>{{t 'inventory.labels.totalReceived' total=totalReceived}}</h4>
     {{/if}}
   {{/em-form}}
 {{/edit-panel}}

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')
 });

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) {

app/inventory/edit/template.hbs

@@ -2,7 +2,7 @@
   {{#em-form model=model submitButton=false }}
     {{partial 'inventory-basic'}}
     {{#if model.isNew}}
-      <h3>{{t 'inventory.labels.purchase_info'}}</h3>
+      <h3>{{t 'inventory.labels.purchaseInfo'}}</h3>
       {{partial 'inv-purchase'}}
     {{else}}
       {{#if quantityDiscrepency}}
@@ -18,21 +18,21 @@
       <h3>
         {{t 'inventory.labels.purchases'}}
         {{#if canAddPurchase}}
-          <button class="btn btn-primary align-right" {{action "showAddPurchase" this}}><span class="octicon octicon-plus"></span> {{t 'inventory.titles.add_purchase'}}</button>
+          <button class="btn btn-primary align-right" {{action "showAddPurchase" this}}><span class="octicon octicon-plus"></span> {{t 'inventory.titles.addPurchase'}}</button>
         {{/if}}
       </h3>
       <table class="table">
         <tr class="table-header">
-          <th>{{t 'inventory.labels.date_received'}}</th>
-          <th>{{t 'inventory.labels.purchase_cost'}}</th>
-          <th>{{t 'inventory.labels.cost_per_unit'}}</th>
-          <th>{{t 'inventory.labels.original_quantity'}}</th>
-          <th>{{t 'inventory.labels.current_quantity'}}</th>
+          <th>{{t 'inventory.labels.dateReceived'}}</th>
+          <th>{{t 'inventory.labels.purchaseCost'}}</th>
+          <th>{{t 'inventory.labels.costPerUnit'}}</th>
+          <th>{{t 'inventory.labels.originalQuantity'}}</th>
+          <th>{{t 'inventory.labels.currentQuantity'}}</th>
           <th>{{t 'inventory.labels.gift'}}</th>
-          <th>{{t 'inventory.labels.serial_number'}}</th>
-          <th>{{t 'inventory.labels.expiration_date'}}</th>
+          <th>{{t 'inventory.labels.serialNumber'}}</th>
+          <th>{{t 'inventory.labels.expirationDate'}}</th>
           <th>{{t 'inventory.labels.vendor'}}</th>
-          <th>{{t 'inventory.labels.invoice_number'}}</th>
+          <th>{{t 'inventory.labels.invoiceNumber'}}</th>
         </tr>
         {{#each model.purchases as |purchase|}}
           <tr class={{if purchase.expired "warning"}}>
@@ -43,9 +43,9 @@
             <td>{{purchase.currentQuantity}}</td>
             <td>
               {{#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}}
             </td>
             <td>{{purchase.lotNumber}}</td>
@@ -61,7 +61,7 @@
       <table class="table">
         <tr class="table-header">
           <th>{{t 'inventory.labels.location'}}</th>
-          <th>{{t 'inventory.labels.aisle_location'}}</th>
+          <th>{{t 'inventory.labels.aisleLocation'}}</th>
           <th>{{t 'labels.quantity'}}</th>
           {{#if canAdjustLocation}}
             <th>{{t 'labels.action'}}</th>
@@ -87,7 +87,7 @@
         <h3>{{t 'inventory.labels.transactions'}}</h3>
         <table class="table">
           <tr class="table-header">
-            <th>{{t 'inventory.labels.date_completed'}}</th>
+            <th>{{t 'inventory.labels.dateCompleted'}}</th>
             <th>{{t 'labels.quantity'}}</th>
             <th>{{t 'inventory.labels.transaction'}}</th>
             <th>{{t 'inventory.labels.expense'}}</th>
@@ -125,11 +125,11 @@
                     {{/if}}
                   {{/if}}
                   {{#if transaction.isTransfer}}
-                    <strong>{{t 'inventory.edit.transferred_from'}}</strong>
+                    <strong>{{t 'inventory.edit.transferredFrom'}}</strong>
                     {{#each transaction.locationsAffected as |location|}}
                       {{location.name}}<br/>
                     {{/each}}
-                    <strong>{{t 'inventory.edit.transferred_to'}}</strong> {{transaction.deliveryDetails}}
+                    <strong>{{t 'inventory.edit.transferredTo'}}</strong> {{transaction.deliveryDetails}}
                   {{/if}}
                 </td>
               </tr>

app/inventory/index/template.hbs

@@ -26,7 +26,7 @@
     </table>
   {{else}}
     <div class="alert alert-info">
-      <p>{{t 'inventory.messages.no_requests'}}{{#if canAdd}}<a href="#" {{action 'newRequest'}}> {{t 'inventory.messages.create_request'}}</a>{{/if}}</p>
+      <p>{{t 'inventory.messages.noRequests'}}{{#if canAdd}}<a href="#" {{action 'newRequest'}}> {{t 'inventory.messages.createRequest'}}</a>{{/if}}</p>
     </div>
   {{/if}}
 {{/item-listing}}

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() {

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',
 

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 }}
-  <div class="alert alert-warning" role="alert">{{t 'inventory.messages.item_not_found' item=model.name}}</div>
+  <div class="alert alert-warning" role="alert">{{t 'inventory.messages.itemNotFound' item=model.name}}</div>
   {{#em-form model=model submitButton=false }}
     {{partial 'inventory-basic'}}
   {{/em-form}}