Commit f4e7c563 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

0.12.3

Closes #21 and #30

See merge request redmic-project/client/web!23
parents 15bf951f da14975b

package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "REDMIC",

  "version": "0.12.2",

  "version": "0.12.3",

  "author": "Observatorio Ambiental Granadilla",

  "homepage": "https://redmic.es",

  "description": "Integrated marine data repository of Canary Islands - Client",

public/javascript/app/nls/es/translation.js

+7 −5
Original line number Diff line number Diff line
@@ -255,10 +255,10 @@ define({ 
	, "bathymetry": "Batimetría"

	, "identification": "Identificación"



	, "misidentification": "Citas erróneas"

	, "misidentificationAdd": "Añadir nueva cita errónea"

	, "misidentificationPopup": "Citado como"

	, "misidentificationEdit": "Editando cita errónea"

	, "misidentification": "Identificaciones erróneas"

	, "misidentificationAdd": "Añadir nueva identificación errónea"

	, "misidentificationPopup": "Identificado como"

	, "misidentificationEdit": "Editando identificación errónea"

	, "openViewer": "Abrir"



	, "copy": "Copiar"
@@ -423,7 +423,7 @@ define({ 


	, "seaDepth": "Fondo"

	, "legalValidity": "Validez legal"

	, "containsMisidentification": "Contiene citas erróneas"

	, "containsMisidentification": "Contiene identificaciones erróneas"

	, "animalName": "Nombre del animal"

	, "protocols": "Protocolos"

	, "protocolsAssociated": "Protocolos asociados"
@@ -1158,4 +1158,6 @@ define({ 
	, "descript_1": "Descripción"

	, "descriptio": "Descripción"

	, "featurecod": "Feature code"



	, "sexagesimalDegrees": "Grados sexagesimales"

});

public/javascript/app/nls/translation.js

+2 −0
Original line number Diff line number Diff line
@@ -1163,6 +1163,8 @@ define({ 
		, "descript_1": "Description"

		, "descriptio": "Description"

		, "featurecod": "Feature code"



		, "sexagesimalDegrees": "Sexagesimal degrees"

	}



	, "es": true

public/javascript/redmic/modules/form/input/PointImpl.js

+3 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ define([ 
					crs: "32628"

				},{

					id: 1,

					name: "Geographic coordinates",

					name: this.i18n.sexagesimalDegrees,

					crs: "1"

				}],

				_inputsNodes: {},
@@ -263,7 +263,7 @@ define([ 


			var controlGroupNode = put(this.additionalPrevNode, "div.inputContainer.fWidth"),

				key = "spatialReference",

				label = this.i18n[key],

				label = this.i18n[key] + '*',

				placeholder = label + "PlaceHolder";



			this.filteringSelect = new FilteringSelect({
@@ -286,7 +286,7 @@ define([ 


			for (var i = this._coordinateProperties.length - 1; i >= 0; i--) {

				var key = this._coordinateProperties[i],

					label = this.i18n[key],

					label = this.i18n[key] + '*',

					controlGroupNode = put(this.mainNode, "div.inputContainer.fWidth");



				this._inputsInstances[key] = this._createInput(key);