Merging translations

.gitignore

@@ -57,4 +57,8 @@ bin/
 public/export/
 # dev conf files 
 application-dev.conf
-logger-dev.xml
+logger-dev.xml
+
+# python cache
+/utils/__pycache__/
+.pytest_cache

app/assets/javascripts/audit/operationLogLot.html

@@ -9,7 +9,7 @@
 							<span  class="icon-atras" title="Volver"></span>
 						</div>
 					</li>
-					<li class="active">Registro de eventos</li>
+					<li class="active">{{'generics.eventLog' | i18next}}</li>
 				</ol>
 			</div>
 		</div>
@@ -23,31 +23,31 @@
 				<div class="row padding-0" >
 					<!-- usuario -->
 					<div class="form-group col-md-4  vertical-align">
-						<label for="search-user" class="col-md-2 padding-left-0">Usuario</label>
+						<label for="search-user" class="col-md-2 padding-left-0">{{'generics.user' | i18next}}</label>
 						<input id="search-user" type="text" data-ng-model="filters.user" class="col-md-10 form-control"/>
 					</div>
 					<div class="form-group col-md-4">
 						<div class="col-md-2 padding-left-0">
-								<label for="hourFrom" class=" " >Fecha </label>
+								<label for="hourFrom" class=" " >{{'generics.date' | i18next}} </label>
 							</div>
 							<div class="col-md-10">
 								<div class="row padding-0">
 									<div class="col-md-6">
 									<!-- fecha desde -->
 								<input type="text" name="hourFrom" id="hourFrom"
-							placeholder="Desde" data-datepicker-popup="dd/MM/yyyy"
+							placeholder="{{'generics.from' | i18next}}" data-datepicker-popup="dd/MM/yyyy"
 							data-ng-model="filters.hourFrom"
 							data-is-open="datepickers.hourFrom"
 							data-datepicker-options="dateOptions" data-close-text="Close" data-ng-click="toggleDatePicker($event,'hourFrom')" class="col-md-5 form-control"/>
 						</div>
 							<div class="col-md-6">
 							<!-- fecha hasta -->
 								<input type="text" name="hourUntil" id="hourUntil"
-								placeholder="Hasta" data-datepicker-popup="dd/MM/yyyy"
+								placeholder="{{'generics.to' | i18next}}" data-datepicker-popup="dd/MM/yyyy"
 								data-ng-model="filters.hourUntil"
 								data-is-open="datepickers.hourUntil"
 								data-datepicker-options="dateOptions" data-close-text="Close"
-									data-ng-click="toggleDatePicker($event,'hourUntil')" class="col-md-5 form-control"/>
+									   data-ng-click="toggleDatePicker($event,'hourUntil')" class="col-md-5 form-control"/>
 								</div>
 </div>
 						</div>
@@ -64,13 +64,13 @@
 				<div class="row padding-0">
 					<!-- operacion -->
 					<div class="form-group col-md-5 vertical-align" >
-						<label class="col-md-2 padding-left-0" for="search-operation">Operación</label>
+						<label class="col-md-2 padding-left-0" for="search-operation">{{'generics.operation' | i18next}}</label>
 						<input id="search-operation" ng-init="getOperations()"
 						ng-model="filters.operation" class="col-md-10 form-control">
 					</div>
 					<div class="form-group col-md-4 vertical-align">
 						<div class="col-md-2">
-							<label for="search-result">Resultado</label>
+							<label for="search-result">{{'generics.result' | i18next}}</label>
 						</div>
 						<div class="item-input col-md-3">
 							<select id="search-result" data-ng-model="filters.result"
@@ -84,10 +84,10 @@
 						</button> -->
 						<div class="col-md-6 padding-right-0" ng-click="clean()">
 								<span id="processingSpan" class="icon-refresh" ng-class="{'spinner': isProcessing}" data-ng-show="isProcessing"></span>
-								<a  title="Limpiar filtros" ng-click="logLotInit()" ng-disabled="isProcessing"  class="cancel-link" >Limpiar</a>
+								<a  title="Limpiar filtros" ng-click="logLotInit()" ng-disabled="isProcessing"  class="cancel-link" >{{'buttons.clean' | i18next}}</a>
 						</div>
 						<div class="col-md-6 padding-right-0" >
-							<button id="search-button" type="submit" class="btn btn-default btn-primary-action">Buscar</button>
+							<button id="search-button" type="submit" class="btn btn-default btn-primary-action">{{'buttons.search' | i18next}}</button>
 						</div>
 					</div>
 				</div>
@@ -108,14 +108,14 @@
 						</a>
 					</th>
 					<th class="text-center">
-						<a href="" ng-click="sortBy('timestamp')">Fecha <span ng-show="sortField == 'timestamp'" class="caret" ng-class="{'caret-reversed': !ascending}"></span></a>
+						<a href="" ng-click="sortBy('timestamp')">{{'generics.date' | i18next}} <span ng-show="sortField == 'timestamp'" class="caret" ng-class="{'caret-reversed': !ascending}"></span></a>
 					</th>
 					<th class="text-center">
-						<a href="" ng-click="sortBy('userId')">Usuario <span ng-show="sortField == 'userId'" class="caret" ng-class="{'caret-reversed': !ascending}"></span></a>
+						<a href="" ng-click="sortBy('userId')">{{'generics.user' | i18next}} <span ng-show="sortField == 'userId'" class="caret" ng-class="{'caret-reversed': !ascending}"></span></a>
 					</th>
-					<th class="text-center">Operación</th>
-					<th class="text-center">Recurso</th>
-					<th class="text-center">Resultado</th>
+					<th class="text-center">{{'generics.operation' | i18next}}</th>
+					<th class="text-center">{{'generics.resource' | i18next}}</th>
+					<th class="text-center">{{'generics.result' | i18next}}</th>
 				</tr>
 			</thead>
 			<tbody>
@@ -138,6 +138,6 @@
 	<div style="width: 100%;">
 		<pagination boundary-links="true" ng-change="changePage()" items-per-page="{{pageSizeLog}}" max-size="10" total-items="totalItemsLog" ng-model="currentPageLog" class="pagination-sm" previous-text="&lsaquo;" next-text="&rsaquo;" first-text="&laquo;" last-text="&raquo;"  rotate="false"></pagination>
 
-		<button style="float:right;" class="btn btn-default" ng-click="doTheBack()" style="float: right;">Atras</button>
+		<button style="float:right;" class="btn btn-default" ng-click="doTheBack()" style="float: right;">{{'buttons.back' | i18next}}</button>
 	</div>
 </footer>

app/assets/javascripts/audit/operationLogLots.html

@@ -8,7 +8,7 @@
 							<span  class="icon-atras" title="Volver"></span> 
 						</div>
 					</li>
-					<li class="active">Historial de operaciones - Grupo de eventos</li>
+					<li class="active">{{ 'lotLog.eventGroupLog' | i18next }}</li>
 				</ol>
 			</div>
 		</div>
@@ -22,9 +22,9 @@
 				<thead>
 					<tr>
 						<th class="col-md-2 text-center">Id</th>
-						<th class="col-md-6 text-center">Fecha Inicio</th>
-						<th class="col-md-2 text-center">Verificar</th>
-						<th class="col-md-2 text-center">Ver</th>
+						<th class="col-md-6 text-center">{{ 'lotLog.startDate' | i18next }}</th>
+						<th class="col-md-2 text-center">{{ 'lotLog.verification' | i18next }}</th>
+						<th class="col-md-2 text-center">{{ 'generics.view' | i18next }}</th>
 					</tr>
 				</thead>
 				<tbody>
@@ -35,7 +35,7 @@
 							<button 
 							id="checkLot_{{$index}}" 
 							data-ng-click="checkLot(lot.id)"
-							popover-title="Verificación de lote" 
+							popover-title="{{ 'lotLog.verification' | i18next }}"
 							popover-placement="left" 
 							popover-template="'template-check-lot'"
 							popover-trigger="focus"
@@ -60,13 +60,13 @@
 				<div ng-show="showSpinner"><i class="icon-refreshspinner"></i></div>
 
 				<div ng-show="!showSpinner && verificationResult == ''">
-					El lote de logs es consisitente y no presenta alteraciones.
+					{{ 'lotLog.consistent' | i18next }}
 				</div>
 				<div ng-show="!showSpinner && verificationResult != ''">
-					<h5>Error al verificar el lote</h5>
-					<p>La entrada #{{verificationResult.signedEntry.index}} computó la firma:</p>
+					<h5>{{ 'lotLog.error.header' | i18next }}</h5>
+					<p>{{ 'lotLog.error.entry1' | i18next }} #{{verificationResult.signedEntry.index}} { 'lotLog.error.entry2' | i18next }}:</p>
 					<p class="well well-sm">{{verificationResult.signedEntry.signature}}</p>
-					<p>Y se esperaba obtener la firma:</p>
+					<p>{ 'lotLog.error.entry3' | i18next }}</p>
 					<p class="well well-sm">{{verificationResult.expectedSignature}}</p>
 				</div>
 

app/assets/javascripts/biomaterialtype/bioMaterialTypeController.js

@@ -84,33 +84,33 @@ define(['angular'], function(angular) {
 		$scope.delete = function(id) {
 			bioMaterialTypeService.deleteBioMaterialType(id).then(
 					function(){
-						alertService.success({message: 'El tipo de material biológico se ha borrado correctamente'});
+						alertService.success({message: $.i18n.t('biomaterial.alert.deleteSuccess')});
 						getBmts();
 					}, 
 					function(){
-						alertService.error({message: 'Ha ocurrido un error al borrar el tipo de material biológico. '});
+						alertService.error({message: $.i18n.t('biomaterial.alert.deleteFail')});
 					});
 			};
 
 		$scope.update = function() {
 			bioMaterialTypeService.updateBioMaterialType($scope.current).then(
 					function(){
-						alertService.success({message: 'El tipo de material biológico se ha actualizado correctamente'});
+						alertService.success({message: $.i18n.t('biomaterial.alert.updateSuccess') });
 						getBmts();
 					}, 
 					function(response){
-						alertService.error({message: 'Ha ocurrido un error al actualizar los cambios: ' + response.data});
+						alertService.error({message: $.i18n.t('biomaterial.alert.updateFail') + response.data});
 					});
 			};
 
 		$scope.save = function() {
 			bioMaterialTypeService.addBioMaterialType($scope.current).then(
 				function(){
-					alertService.success({message: 'El tipo de material biológico se ha guardado correctamente'});
+					alertService.success({message: $.i18n.t('biomaterial.alert.addSuccess')});
 					getBmts();
 				}, 
 				function(response){
-					$scope.status = 'Ha ocurrido un error al guardar los cambios: ' + response.data.error;
+					$scope.status = $.i18n.t('biomaterial.alert.addFail') + response.data.error;
 				});
 		};
 

app/assets/javascripts/biomaterialtype/biomaterialtype.html

@@ -10,7 +10,7 @@
 								<span  class="icon-atras" title="Volver"></span>
 							</div>
 						</li>
-						<li class="active">Tipo de Material Biológico</li>
+						<li class="active">{{ 'biomaterial.type' | i18next }}</li>
 
                 </ol>
             </div>
@@ -33,13 +33,13 @@
             <button style="margin-top: 20px;"
                     type="button"
                     class="btn btn-block btn-primary-action"
-                    ng-click="addBmt()">Agregar material biológico</button>
+                    ng-click="addBmt()">{{ 'biomaterial.add' | i18next }}</button>
 		</div>
 
 		<div class="col-md-9 padding-right-0" ng-if="current">
             <div><label>{{current.name}}</label></div>
             <div><strong>Id: </strong>{{current.id}}</div>
-            <div ng-show="current.description"><strong>Descripcion: </strong>{{current.description}}</div>
+            <div ng-show="current.description"><strong>{{ 'generics.description' | i18next }}: </strong>{{current.description}}</div>
 		</div>
 	</div>
 </div>

app/assets/javascripts/biomaterialtype/views/bmtModal.html

@@ -1,6 +1,6 @@
 <div class="modal-header">
-	<h4 ng-show="mode == 'add'">Nuevo Tipo de Material Biológico</h4>
-	<h4 ng-show="mode == 'edit'">Modificar Tipo de Material Biológico</h4>
+	<h4 ng-show="mode == 'add'">{{ 'biomaterial.add' | i18next }}</h4>
+	<h4 ng-show="mode == 'edit'">{{ 'biomaterial.edit' | i18next }}</h4>
 </div>
 <div class="modal-body">
 
@@ -9,19 +9,19 @@ <h4 ng-show="mode == 'edit'">Modificar Tipo de Material Biológico</h4>
 	    <label for="rolId" class="col-sm-2 control-label">Id</label>
 	    <div class="col-sm-10">
 	      <input ng-model="bmt.id" name="id" type="text" class="form-control form-select" id="rolId" required ng-pattern=rolIdRegex
-	      	placeholder="Ingrese identificador único" ng-disabled="mode==='edit'" />
+	      	placeholder="{{ 'generics.enterUniqueIdentifier' | i18next }}" ng-disabled="mode==='edit'" />
             <form-validation input="roleForm.id" pattern="a-z|A-Z|0-9|_ desde 4 caracteres"></form-validation>
 	    </div>
 	  </div>
 	  <div class="form-group">
-	    <label class="col-sm-2 control-label" for="rolName">Nombre</label>
+	    <label class="col-sm-2 control-label" for="rolName">{{"generics.name"|i18next}}</label>
 	    <div class="col-sm-10">
-	        <input ng-model="bmt.name" name="name" type="text" class="form-control form-select" id="rolName" placeholder="Ingrese nombre único" required/>
+	        <input ng-model="bmt.name" name="name" type="text" class="form-control form-select" id="rolName" placeholder="{{ 'generics.enterUniqueName' | i18next }}" required/>
             <form-validation input="roleForm.name"></form-validation>
 	    </div>
 	  </div>
 	  <div class="form-group">
-	    <label for="descritpion_id" class="col-sm-2 control-label">Descripcion</label>
+	    <label for="descritpion_id" class="col-sm-2 control-label">{{"generics.description"|i18next}}</label>
 	    <div class="col-sm-10">
 	    <textarea ng-model="bmt.description" class="form-control form-select" rows="3" id="descritpion_id"></textarea>
 	    </div>
@@ -30,13 +30,13 @@ <h4 ng-show="mode == 'edit'">Modificar Tipo de Material Biológico</h4>
 
 </div>
 <div class="modal-footer">
-    <button class="btn btn-secondary-action pull-left" ng-click="remove()" ng-show="mode == 'edit'">Eliminar</button>
+    <button class="btn btn-secondary-action pull-left" ng-click="remove()" ng-show="mode == 'edit'">{{"buttons.delete"|i18next}}</button>
 	<div class="btn btn-link-action" ng-click="cancel()">
         <span title="Cerrar">
             <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
         </span>
-		<span class="btn-link-action">Cerrar</span>
+		<span class="btn-link-action">{{"buttons.close"|i18next}}</span>
 	</div>
-    <button class="btn btn-primary-action" ng-disabled="roleForm.$invalid" ng-click="update()" ng-show="mode == 'edit'">Guardar</button>
-    <button class="btn btn-primary-action" ng-disabled="roleForm.$invalid" ng-click="add()" ng-show="mode == 'add'">Agregar</button>
+    <button class="btn btn-primary-action" ng-disabled="roleForm.$invalid" ng-click="update()" ng-show="mode == 'edit'">{{"buttons.save"|i18next}}</button>
+    <button class="btn btn-primary-action" ng-disabled="roleForm.$invalid" ng-click="add()" ng-show="mode == 'add'">{{"buttons.add"|i18next}}</button>
 </div>

app/assets/javascripts/bulkupload/addLote.html

@@ -1,22 +1,22 @@
 <!DOCTYPE html>
 <div class="modal-header">
-    <h4 class="active">Alta de Lote</h4>
+    <h4 class="active">{{'lot.create' | i18next}}</h4>
 </div>
 
 <div class="modal-body">
     <div class="row">
         <div class="col-md-4 text-center ">
 
-            <label class="control-label" style="margin-top: 10px">Elija tipo de análisis:</label>
+            <label class="control-label" style="margin-top: 10px">{{'lot.analysis' | i18next}}</label>
             </br></br>
             <span class="btn btn-link-action btn-block btn-file">
                 <span class="glyphicon glyphicon-upload"></span>
-                 Elija archivo
+                 {{'lot.pickFile' | i18next}}
                 <input id="archivo" type="file" name="file" ngf-select=""
                        ng-model="files" help-tip="format.bulkUpload" help-tip-placement="right">
             </span>
                 </br>
-            <label class="control-label">Nombre del Lote:</label>
+            <label class="control-label">{{'lot.name' | i18next}}:</label>
         </div>
 
         <div class="col-md-4 text-center" style="margin-top: 5px">
@@ -28,7 +28,7 @@ <h4 class="active">Alta de Lote</h4>
         </br>
             <input type="text" ng-disabled='true' placeholder="{{files[0].name| prittyLimitTo : 20: true }}">
         </br></br>
-            <input type="text" ng-model="nombreLote" placeholder="Nombre de lote opcional">
+            <input type="text" ng-model="nombreLote" placeholder="{{'lot.optionalName' | i18next}}">
         </div>
     </div>
 </div>
@@ -37,12 +37,12 @@ <h4 class="active">Alta de Lote</h4>
             <span title="Cerrar">
                 <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
             </span>
-            <span class="btn-link-action">Cerrar</span>
+            <span class="btn-link-action">{{'buttons.close' | i18next}}</span>
         </div>
         <button
           class="btn btn-primary-action"
           ng-click="closeModal(files, nombreLote, tipoAnalisis)"
           ng-disabled="!files.length > 0"
-        >Agregar
+        >{{'buttons.add' | i18next}}
         </button>
 </div>

app/assets/javascripts/bulkupload/batch.html

@@ -10,7 +10,7 @@
 								<span  class="icon-atras" title="Volver"></span>
 							</div>
 						</li>
-						<li class="active">Lote {{batchId}} - Detalles</li>
+						<li class="active">{{'generics.batch' | i18next}} {{batchId}} - {{'generics.details' | i18next}}</li>
 
 					</ol>
 				</div>
@@ -27,10 +27,10 @@
 	<thead>
 		<tr>
 			<th></th>
-			<th class="text-center">Código Laboratorio</th>
-			<th class="text-center">Genetista asignado</th>
-			<th class="text-center">Subcategoría</th>
-			<th class="text-center">Kit</th>
+			<th class="text-center">{{'generics.labCode' | i18next}}</th>
+			<th class="text-center">{{'profileApproval.assignedGeneticist' | i18next}}</th>
+			<th class="text-center">{{'generics.subcategory' | i18next}}</th>
+			<th class="text-center">{{'generics.kit' | i18next}}</th>
 			<th></th>
 		</tr>
 	</thead>
@@ -46,7 +46,7 @@
 			<td class="text-center">{{r.subcategory}}</td>
 			<td class="text-center">{{r.kit}}</td>
 			<td class="text-center" ng-show="r.status === 'Valid'">
-				<button class="btn" title="Editar datos antes de guardar" >
+				<button class="btn" title="{{'bulk.editBeforeSaving' | i18next}}" >
 					<span class="glyphicon glyphicon-edit" aria-hidden="true"></span>
 				</button>
 

app/assets/javascripts/bulkupload/bulkuploadService.js

@@ -4,9 +4,9 @@ define(['lodash'], function(_) {
 	function BulkuploadService(playRoutes) {
 
 		this.getStatusMap = function() {
-			return {'Invalid': 'Inválido', 'Incomplete': 'Incompleto', 
-					'ReadyForApproval': 'Listo para aprobación', 'Approved': 'Aprobado', 
-					'Disapproved': 'Desaprobado', 'Imported': 'Aceptado', 'Rejected': 'Rechazado'};
+			return {'Invalid': $.i18n.t('bulk.batchStatus.invalid'), 'Incomplete': $.i18n.t('bulk.batchStatus.incomplete'),
+					'ReadyForApproval': $.i18n.t('bulk.batchStatus.readyForApproval'), 'Approved': $.i18n.t('bulk.batchStatus.approved'),
+					'Disapproved': $.i18n.t('bulk.batchStatus.disapproved'), 'Imported': $.i18n.t('bulk.batchStatus.accepted'), 'Rejected': $.i18n.t('bulk.batchStatus.rejected')};
 		};
         this.getSubcategories = function() {
             return playRoutes.controllers.Categories.list().get();