Translate components

HospitalRun · Jul 11, 2016 · 1d5617e · 1d5617e
1 parent b6f3402
commit 1d5617e
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 24 deletions.
diff --git a/app/components/charge-quantity.js b/app/components/charge-quantity.js
@@ -18,7 +18,7 @@ export default Ember.Component.extend({
 
   quantityHelp: function() {
     if (this.get('hasError')) {
-      return this.get('i18n').t('components.invalid_number');
+      return this.get('i18n').t('errors.invalid_number');
     }
   }.property('hasError')
 

diff --git a/app/locales/en/translations.js b/app/locales/en/translations.js
@@ -23,7 +23,8 @@ export default {
     lessThanOrEqualTo: 'must be less than or equal to {{count}}',
     otherThan: 'must be other than {{count}}',
     odd: 'must be odd',
-    even: 'must be even'
+    even: 'must be even',
+    invalid_number: 'not a valid number'
   },
   navigation: {
     imaging: 'Imaging',
@@ -889,15 +890,28 @@ export default {
       add_medication: 'Add Medication'
     }
   },
-  photos: {
-    how: 'How Do You Want To Add A Photo?',
-    take_photo: 'Take photo',
-    upload_photo: 'Upload Photo',
-    upload_file: 'Upload File',
-    camera: 'Camera',
-    photo: 'photo'
-  },
   components: {
-    invalid_number: 'not a valid number'
+    chargesByTypeTab: {
+      charges: 'charges'
+    },
+    takePhoto: {
+      how: 'How Do You Want To Add A Photo?',
+      takePhoto: 'Take photo',
+      uploadPhoto: 'Upload Photo',
+      uploadFile: 'Upload File',
+      camera: 'Camera',
+      photo: 'photo',
+      preview: 'preview'
+    },
+    quantityConv: {
+      unit: 'Unit',
+      conversion: 'What does 1 {{name}} contain?'
+    },
+    quantityCalc: {
+      result: '{{targetUnit}} total: {{calculated}}'
+    },
+    priceList: {
+      charges: '{{pricingType}} charges'
+    }
   }
 };
diff --git a/app/templates/components/charges-by-type-tab.hbs b/app/templates/components/charges-by-type-tab.hbs
@@ -1 +1 @@
-<a href={{tabHref}} role="tab" data-toggle="pill">{{pricingType}} charges</a>
+<a href={{tabHref}} role="tab" data-toggle="pill">{{pricingType}} {{t 'components.chargesByTypeTab.charges'}}</a>
diff --git a/app/templates/components/price-list.hbs b/app/templates/components/price-list.hbs
@@ -1,7 +1,7 @@
 <div class="panel detail-section">
     <div class="panel-heading">
         <h3 class="panel-title">
-            {{pricingType}} charges
+            {{t 'components.priceList.charges' pricingType=pricingType}}
         </h3>
     </div>
     <div class="panel-body detail-section-content">

diff --git a/app/templates/components/quantity-calc.hbs b/app/templates/components/quantity-calc.hbs
@@ -12,7 +12,7 @@
     <div class="row">
         <div class="col-xs-6">
             <div class="form-group">
-                <label>{{targetUnit}} total: {{calculated}} </label>
+                <label>{{t 'components.quantityCalc.result' targetUnit=targetUnit calculated=calculated}}</label>
             </div>
         </div>
     </div>

diff --git a/app/templates/components/quantity-conv.hbs b/app/templates/components/quantity-conv.hbs
@@ -2,7 +2,7 @@
     <div class="row">
         <div class="col-xs-5">
             <div class="form-group required {{quantityClass}}">
-                <label class="control-label">What does 1 {{unitName}} contain?</label>
+                <label class="control-label">{{t 'quantity-conv.conversion' name=unitName}}</label>
             </div>
         </div>
     </div>
@@ -22,7 +22,7 @@
     <div class="col-xs-3">
         <div class="form-group required {{unitClass}}">
             {{#if firstQuantity}}
-                <label class="control-label">Unit</label>
+                <label class="control-label">{{t 'components.quantityConv.unit'}}</label>
             {{/if}}
             {{select-list
                 class='form-control test-inv-unit'

diff --git a/app/templates/components/take-photo.hbs b/app/templates/components/take-photo.hbs
@@ -1,6 +1,6 @@
 {{#if canCaptureVideo}}
   <div class="form-group">
-    <label class="control-label" for="photo-source">{{t 'photos.how'}}</label>
+    <label class="control-label" for="photo-source">{{t 'components.takePhoto.how'}}</label>
     {{select-list
       action=photoSourceChange
       class='form-control'
@@ -11,13 +11,13 @@
   </div>
   {{#if showCameraSelect}}
     <div class="form-group">
-      <label class="control-label" for="camera">{{t 'photos.camera'}}</label>
+      <label class="control-label" for="camera">{{t 'components.takePhoto.camera'}}</label>
       {{select-list
           action=cameraChange
           class='form-control'
           content=videoSources
           id='camera'
-          label=(t 'photos.camera')
+          label=(t 'components.takePhoto.camera')
           optionLabelPath="label"
           optionValuePath="id"
           value=selectedCamera
@@ -27,22 +27,22 @@
   <div class="camera panel panel-success">
     <div class="panel-body">
         <div class="col-sm-4">
-          <h2>Preview</h2>
+          <h2>{{t 'components.takePhoto.preview'}}</h2>
           <video></video>
         </div>
         <div class="col-sm-2">
         </div>
         <div class="col-sm-4">
-          <h2>{{t 'photos.photo'}}</h2>
+          <h2>{{t 'components.takePhoto.photo'}}</h2>
           <canvas id="canvas"></canvas>
         </div>
     </div>
     <div class="panel-footer">
-      <button class="btn btn-default neutral" {{action 'takePhoto'}}>{{t 'photos.take_photo'}}</button>
+      <button class="btn btn-default neutral" {{action 'takePhoto'}}>{{t 'components.takePhoto.takePhoto'}}</button>
     </div>
   </div>
 {{/if}}
 <div class="fileupload row">
-  <h2>{{t 'photos.upload_photo'}}</h2>
-  {{image-upload label=(t 'photos.upload_file') property="fileName" selectedFile=photoFile }}
+  <h2>{{t 'components.takePhoto.uploadPhoto'}}</h2>
+  {{image-upload label=(t 'components.takePhoto.uploadFile') property="fileName" selectedFile=photoFile }}
 </div>