fix(i18n): improve translations

This commit improves the translations of several key form elements throughout the application. In particular "Transfer Type" doesn't exist and all translations are now referring to "transaction type"s instead. This feedback was gained from training users at HEV.
Third-Culture-Software · Dec 12, 2017 · 45f9d81 · 45f9d81
1 parent 6ef6276
commit 45f9d81
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 33 deletions.
diff --git a/client/src/i18n/en/form.json b/client/src/i18n/en/form.json
@@ -88,6 +88,7 @@
         "ERRORS": {
             "AT_LEAST_1_COL": "At least one column must be selected",
             "CONNECTION": "Connection error",
+            "NOT_CONFIGURED": "Some lines in the grid are not yet configured.",
             "GENERIC": "The form contains errors.",
             "HAS_ERROR": "Contains an error",
             "HAS_ERRORS": "The form contains errors.  Please correct them and resubmit.",
@@ -494,9 +495,8 @@
             "POSTED_TRANSACTIONS": "Posted transaction(s)",
             "NON_POSTED_TRANSACTIONS": "Non-posted transaction(s)",
             "TRANSACTION_DATE": "Transaction Date",
-            "TRANSACTION_TYPE": "Transaction type",
+            "TRANSACTION_TYPE": "Transaction Type",
             "TRANSFER_ACCOUNT": "Transfer Account",
-            "TRANSFER_TYPE": "Transfer Type",
             "TAKE_SNAPSHOT": "Take snapshot",
             "TAKE_A_PICTURE": "Take a Pucture",
             "TYPE": "Type",
@@ -632,8 +632,7 @@
             "SOURCE": "Select source",
             "STATUS": "Select status",
             "SUPPLIER": "Supplier",
-            "TRANSACTION_TYPE": "Select a transaction type",
-            "TRANSFER_TYPE": "Select a Transfer type",
+            "TRANSACTION_TYPE": "Select a Transaction Type",
             "TYPE": "Select a Type",
             "USER": "Select User",
             "VILLAGE": "Select a Village/Township",

diff --git a/client/src/i18n/en/vouchers.json b/client/src/i18n/en/vouchers.json
@@ -43,8 +43,8 @@
       "CASH_TRANSFER":"Cash Transfer",
       "REPORT":"Voucher Registry",
       "TITLE":"Voucher",
-      "TRANSFER_TYPE_INFO":"Transaction Type in case we have either incomes or expenses",
-      "USE_FINANCIAL_ACCOUNT":"Use of cashes or banks accounts in this transaction",
+      "TRANSACTION_TYPE_INFO":"Transaction type must be set if there is income or expenses.",
+      "USE_FINANCIAL_ACCOUNT": "This transactions uses a cash or bank account.  Be sure to set a transaction type.",
       "RECEIPT":{
         "SUCCESS":"Voucher Payment recorded successfully."
       },
@@ -72,4 +72,4 @@
     },
     "REPORT": "Report"
   }
-}
+}
diff --git a/client/src/i18n/fr/form.json b/client/src/i18n/fr/form.json
@@ -87,6 +87,7 @@
         },
         "ERRORS": {
             "AT_LEAST_1_COL": "Au moins une colonne doit être sélectionnée",
+            "NOT_CONFIGURED": "Il y a des lignes qui ne sont pas configureés",
             "CONNECTION": "Erreur de connexion",
             "GENERIC": "Le formulaire contient des erreurs",
             "HAS_ERROR": "Contiens une erreur",
@@ -496,7 +497,6 @@
             "TRANS_ID": "ID de la transaction",
             "TRANSACTION": "Transaction",
             "TRANSFER_ACCOUNT": "Compte transfert",
-            "TRANSFER_TYPE": "Type de Transfert",
             "TRANSACTION_TYPE": "Type de transaction",
             "TRANSACTION_DATE": "Date de Transaction",
             "TYPE": "Type",
@@ -584,7 +584,7 @@
             "UNIT_WEIGHT": "Entrer le poids",
             "UNIT_VOLUME": "Entrer le volume",
             "USERNAME": "Entrer le nom de l'utilisateur",
-            "VILLAGE": "Entrer village/Commune",
+            "VILLAGE": "Entrer Village/Commune",
             "FILTER_NAME": "Filtrer par Nom...",
             "FILTER_BY": "Filtrer par",
             "SEARCH_NAME": "Chercher Par Nom",
@@ -632,11 +632,10 @@
             "SOURCE": "Sélectionner la source",
             "STATUS": "Sélectionner le status",
             "SUPPLIER": "Selectionner Fournisseur",
-            "TRANSACTION_TYPE": "Selectionner transaction type",
-            "TRANSFER_TYPE": "Sélectionner le type de transfert",
-            "TYPE": "Sélectionner un type",
+            "TRANSACTION_TYPE": "Selectionner Type de la Transaction",
+            "TYPE": "Sélectionner un Type",
             "USER": "Selectionner Utilisateur",
-            "VILLAGE": "Sélectionner village/Commune",
+            "VILLAGE": "Sélectionner Village/Commune",
             "ZS": "Sélectionner zone de sante"
         },
         "VALIDATION": {
@@ -670,4 +669,4 @@
             "NO_CHANGES": "Vous n'avez pas changé les données dans le formulaire.  Rien a été submis au server."
         }
     }
-}
+}
diff --git a/client/src/i18n/fr/periods.json b/client/src/i18n/fr/periods.json
@@ -1,22 +1,22 @@
 {
   "PERIODS" : {
     "TODAY" : "Aujourd'hui",
-    "THIS_WEEK" : "Cette semaine",
-    "THIS_MONTH" : "Ce mois",
-    "THIS_YEAR" : "Cette année",
+    "THIS_WEEK" : "Cette Semaine",
+    "THIS_MONTH" : "Ce Mois",
+    "THIS_YEAR" : "Cette Année",
     "YESTERDAY" : "Hier",
-    "LAST_WEEK" : "Semaine derniere",
-    "LAST_MONTH" : "Mois dernier",
-    "LAST_YEAR" : "Année derniére",
+    "LAST_WEEK" : "Semaine Passé",
+    "LAST_MONTH" : "Mois Passé",
+    "LAST_YEAR" : "Année Passé",
     "ALL_TIME" : "Tout le temps",
     "CUSTOM" : "Personalisé",
     "START" : "Début",
     "END" : "Fin",
-    "PERIOD_LIMIT" : "Limite de période",
+    "PERIOD_LIMIT" : "Limite de Période",
     "CUSTOM_FROM" : "de",
     "CUSTOM_TO" : "à",
-    "SELECT_PERIOD" : "Choisir une période",
-    "SELECT_CUSTOM_PERIOD" : "Période personnalisée",
-	"SUBMIT_CUSTOM_PERIOD" : "Valider la période"
+    "SELECT_PERIOD" : "Choisir une Période",
+    "SELECT_CUSTOM_PERIOD" : "Période Personnalisée",
+    "SUBMIT_CUSTOM_PERIOD" : "Valider la Période"
   }
 }
diff --git a/client/src/i18n/fr/vouchers.json b/client/src/i18n/fr/vouchers.json
@@ -47,7 +47,7 @@
             "REPORT": "Rapport des Quittances",
             "SUPPORT_PAYMENT_DESCRIPTION":"Transfert de la dette du {{patientName}} ({{patientReference}}) pour {{numInvoices}} facture(s) {{invoiceReferences}}.",
             "TITLE": "Quittance",
-            "TRANSFER_TYPE_INFO": "Type de transaction selon qu'on a soit une recette ou une depense",
+            "TRANSACTION_TYPE_INFO": "Type de transaction selon qu'on a soit une recette ou une depense",
             "USE_FINANCIAL_ACCOUNT": "Utilisation de compte de caisses ou banques dans cette transaction"
         },
         "SIMPLE": {

diff --git a/client/src/modules/journal/templates/transaction_type.edit.html b/client/src/modules/journal/templates/transaction_type.edit.html
@@ -13,7 +13,7 @@
       ng-change="grid.appScope.editTransactionType(row.entity)"
       append-to-body="true">
 
-      <ui-select-match placeholder="{{ 'FORM.SELECT.TRANSFER_TYPE' | translate }}">
+      <ui-select-match placeholder="{{ 'FORM.SELECT.TRANSACTION_TYPE' | translate }}">
         <span translate>{{$select.selected.text}}</span>
       </ui-select-match>
 
@@ -29,4 +29,4 @@
   <div ng-hide="grid.appScope.transactions.isEditing()">
     {{ grid.appScope.mapOrigins[row.entity.origin_id] }}
   </div>
-</div>
+</div>
diff --git a/client/src/modules/templates/bhCurrencyInput.tmpl.html b/client/src/modules/templates/bhCurrencyInput.tmpl.html
@@ -2,7 +2,7 @@
   <div class="form-group"
     ng-class="{ 'has-error' : $ctrl.validationTrigger && bhCurrencyInputForm.currencyInputValue.$invalid }"
     data-bh-currency-input>
-    <label class="control-label" translate>FORM.LABELS.PAYMENT</label>
+    <label class="control-label" translate>FORM.LABELS.AMOUNT</label>
 
     <div class="input-group">
       <span class="input-group-addon text-uppercase">{{ $ctrl.currency.symbol || '...' }}</span>

diff --git a/client/src/modules/vouchers/complex-voucher.html b/client/src/modules/vouchers/complex-voucher.html
@@ -95,7 +95,7 @@
                 <div class="form-group" ng-class="{ 'has-error' : ComplexVoucherForm.$submitted && ComplexVoucherForm.type_id.$invalid }">
                   <label class="control-label">
                     <span translate>FORM.LABELS.TRANSACTION_TYPE</span>
-                    <span uib-popover="{{ 'VOUCHERS.GLOBAL.TRANSFER_TYPE_INFO' | translate }}"
+                    <span uib-popover="{{ 'VOUCHERS.GLOBAL.TRANSACTION_TYPE_INFO' | translate }}"
                       popover-trigger="'mouseenter'"
                       popover-placement="bottom"
                       class="text-info fa fa-info-circle">
@@ -109,7 +109,7 @@
                     ng-required="ComplexVoucherCtrl.Voucher.hasCashboxAccount"
                     on-select="ComplexVoucherCtrl.Voucher.validate()">
 
-                    <ui-select-match placeholder="{{ 'FORM.SELECT.TRANSFER_TYPE' | translate }}">
+                    <ui-select-match placeholder="{{ 'FORM.SELECT.TRANSACTION_TYPE' | translate }}">
                       <span translate>{{ $select.selected.text }}</span>
                     </ui-select-match>
 

diff --git a/client/src/modules/vouchers/simple-voucher.html b/client/src/modules/vouchers/simple-voucher.html
@@ -48,7 +48,7 @@
 
                 <label class="control-label">
                   <span translate>FORM.LABELS.TRANSACTION_TYPE</span>
-                  <span uib-popover="{{ ::'VOUCHERS.GLOBAL.TRANSFER_TYPE_INFO' | translate }}"
+                  <span uib-popover="{{ ::'VOUCHERS.GLOBAL.TRANSACTION_TYPE_INFO' | translate }}"
                     popover-trigger="'mouseenter'"
                     popover-placement="top"
                     class="text-info fa fa-info-circle">
@@ -61,7 +61,7 @@
                   ng-required="SimpleVoucherCtrl.Voucher.hasCashboxAccount"
                   append-to-body="true">
 
-                  <ui-select-match placeholder="{{ ::'FORM.SELECT.TRANSFER_TYPE' | translate }}">
+                  <ui-select-match placeholder="{{ 'FORM.SELECT.TRANSACTION_TYPE' | translate }}">
                     <span translate>{{ $select.selected.text }}</span>
                   </ui-select-match>
 

diff --git a/sh/integration-tests.sh b/sh/integration-tests.sh
@@ -32,7 +32,7 @@ sleep $TIMEOUT
 echo "[test] running tests using mocha"
 
 # run the tests
-../node_modules/.bin/mocha --recursive --bail ../test/integration/
+../node_modules/.bin/mocha --recursive ../test/integration/
 
 echo "[test] cleaning up node process $NODE_PID."