diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java index 7903a4ddc..8847c8692 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java @@ -13,7 +13,7 @@ import java.util.stream.Collectors; public class Field implements ViewStyleDefinition, Comparable { public enum ValidationType { - NONE((short) 0), REQUIRED((short) 1); + NONE((short) 0), REQUIRED((short) 1), URL((short) 2); private short value; private ValidationType(short value) { @@ -30,6 +30,8 @@ public class Field implements ViewStyleDefinition; validationRequired; -} \ No newline at end of file + validationURL; +} diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.html index 493589d62..1f9e1f78f 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.html @@ -5,11 +5,16 @@
    -
  • +
  • {{'GENERAL.VALIDATION.REQUIRED' | translate}}
    • +
  • + + {{'GENERAL.VALIDATION.URL.LABEL' | translate}} + +
    • diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts index 2486aea7e..53d195c32 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts @@ -1,22 +1,43 @@ - -import { Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; +import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; import {FormArray, FormControl, FormGroup, FormGroupDirective, NgForm,} from '@angular/forms'; -import { DatasetProfileFieldViewStyle } from '@app/core/common/enum/dataset-profile-field-view-style'; -import { ValidationType } from '@app/core/common/enum/validation-type'; -import { DatasetProfileService } from '@app/core/services/dataset-profile/dataset-profile.service'; -import { EnumUtils } from '@app/core/services/utilities/enum-utils.service'; -import { RuleEditorModel } from '@app/ui/admin/dataset-profile/admin/rule-editor-model'; -import { BaseComponent } from '@common/base/base.component'; -import { Subscription } from 'rxjs'; -import { ViewStyleType } from './view-style-enum'; -import { DatasetProfileComboBoxType } from '@app/core/common/enum/dataset-profile-combo-box-type'; -import { ErrorStateMatcher } from '@angular/material/core'; -import { MatDialog } from '@angular/material/dialog'; -import { MatSlideToggleChange } from '@angular/material/slide-toggle'; -import { Field } from '@app/core/model/admin/dataset-profile/dataset-profile'; -import { DatasetProfileInternalDmpEntitiesType } from '@app/core/common/enum/dataset-profile-internal-dmp-entities-type'; -import { FieldEditorModel } from '../../../admin/field-editor-model'; -import { AutoCompleteFieldData, BooleanDecisionFieldData, CheckBoxFieldData, CurrencyFieldData, DataRepositoriesFieldData, DatasetIdentifierFieldData, DatePickerFieldData, DmpsAutoCompleteFieldData, ExternalDatasetsFieldData, FieldDataOption, FreeTextFieldData, OrganizationsFieldData, RadioBoxFieldData, RegistriesFieldData, ResearchersAutoCompleteFieldData, ServicesFieldData, TagsFieldData, TextAreaFieldData, RichTextAreaFieldData, ValidationFieldData, WordListFieldData } from '@app/core/model/dataset-profile-definition/field-data/field-data'; +import {DatasetProfileFieldViewStyle} from '@app/core/common/enum/dataset-profile-field-view-style'; +import {ValidationType} from '@app/core/common/enum/validation-type'; +import {DatasetProfileService} from '@app/core/services/dataset-profile/dataset-profile.service'; +import {EnumUtils} from '@app/core/services/utilities/enum-utils.service'; +import {RuleEditorModel} from '@app/ui/admin/dataset-profile/admin/rule-editor-model'; +import {BaseComponent} from '@common/base/base.component'; +import {Subscription} from 'rxjs'; +import {ViewStyleType} from './view-style-enum'; +import {DatasetProfileComboBoxType} from '@app/core/common/enum/dataset-profile-combo-box-type'; +import {ErrorStateMatcher} from '@angular/material/core'; +import {MatDialog} from '@angular/material/dialog'; +import {MatSlideToggleChange} from '@angular/material/slide-toggle'; +import {Field} from '@app/core/model/admin/dataset-profile/dataset-profile'; +import {DatasetProfileInternalDmpEntitiesType} from '@app/core/common/enum/dataset-profile-internal-dmp-entities-type'; +import {FieldEditorModel} from '../../../admin/field-editor-model'; +import { + AutoCompleteFieldData, + BooleanDecisionFieldData, + CheckBoxFieldData, + CurrencyFieldData, + DataRepositoriesFieldData, + DatasetIdentifierFieldData, + DatePickerFieldData, + DmpsAutoCompleteFieldData, + ExternalDatasetsFieldData, + FieldDataOption, + FreeTextFieldData, + OrganizationsFieldData, + RadioBoxFieldData, + RegistriesFieldData, + ResearchersAutoCompleteFieldData, + RichTextAreaFieldData, + ServicesFieldData, + TagsFieldData, + TextAreaFieldData, + ValidationFieldData, + WordListFieldData +} from '@app/core/model/dataset-profile-definition/field-data/field-data'; @Component({ selector: 'app-dataset-profile-editor-field-component', @@ -147,7 +168,9 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements this.viewType = this.viewTypeEnum.Validation; break; } - + if(this.viewType !== this.viewTypeEnum.FreeText) { + this.setValidator(ValidationType.URL, false); + } } // this.showPreview = true; @@ -793,20 +816,24 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements toggleRequired(event:MatSlideToggleChange){ + this.setValidator(ValidationType.Required, event.checked); + } + toggleURL(event:MatSlideToggleChange){ + this.setValidator(ValidationType.URL, event.checked); + } + + private setValidator(validationType: ValidationType, add: boolean) { let validationsControl = this.form.get('validations') as FormControl; let validations: Array = validationsControl.value; - if(event.checked){ - if(!validations.includes(ValidationType.Required)){//IS ALREADY REQUIRED - // validationsControl.setValue(validations.filter(validator=> validator != ValidationType.Required)); - // validationsControl.updateValueAndValidity(); - validations.push(ValidationType.Required); - // validationsControl.setValue(validations); + if(add){ + if(!validations.includes(validationType)){ + validations.push(validationType); validationsControl.updateValueAndValidity(); } - }else{ - validationsControl.setValue(validations.filter(validator=> validator != ValidationType.Required)); + } else{ + validationsControl.setValue(validations.filter(validator=> validator != validationType)); validationsControl.updateValueAndValidity(); } this.form.markAsDirty();//deactivate guard @@ -818,6 +845,12 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements return validations.includes(ValidationType.Required); } + get isURL(){ + let validationsControl = this.form.get('validations') as FormControl; + let validations: Array = validationsControl.value; + return validations.includes(ValidationType.URL); + } + onDelete(){ this.delete.emit(); diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html index f66811504..977e31f46 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html @@ -11,7 +11,8 @@ - {{'GENERAL.VALIDATION.REQUIRED' | translate}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + {{'GENERAL.VALIDATION.URL.MESSAGE' | translate}}
    @@ -105,7 +106,7 @@ - {{'GENERAL.VALIDATION.REQUIRED' | translate}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} -
    - {{'GENERAL.VALIDATION.REQUIRED' | translate}} +
    + {{'GENERAL.VALIDATION.REQUIRED' | translate}}
    diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-progress-indication/form-progress-indication.component.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-progress-indication/form-progress-indication.component.ts index 6a48092e5..25691b74f 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-progress-indication/form-progress-indication.component.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-progress-indication/form-progress-indication.component.ts @@ -91,10 +91,8 @@ export class FormProgressIndicationComponent extends BaseComponent implements On } private checkIfIsRequired(formControl: FormGroup): boolean { - if (formControl.get('validationRequired') && formControl.get('validationRequired').value) { - return true; - } - return false; + return !!(formControl.get('validationRequired') && formControl.get('validationRequired').value); + } private checkFormsIfIsFieldsAndVisible(formControl: FormGroup): boolean { diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.model.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.model.ts index 0ea6ca7a0..fdd38822c 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.model.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.model.ts @@ -1,18 +1,18 @@ -import { FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms"; -import { Guid } from '@common/types/guid'; -import { ValidationType } from "../../../core/common/enum/validation-type"; -import { BaseFormModel } from "../../../core/model/base-form-model"; -import { CompositeField } from "../../../core/model/dataset-profile-definition/composite-field"; -import { DatasetProfileDefinitionModel } from "../../../core/model/dataset-profile-definition/dataset-profile-definition"; -import { DefaultValue } from "../../../core/model/dataset-profile-definition/default-value"; -import { Field } from "../../../core/model/dataset-profile-definition/field"; -import { Multiplicity } from "../../../core/model/dataset-profile-definition/multiplicity"; -import { Page } from "../../../core/model/dataset-profile-definition/page"; -import { Rule } from "../../../core/model/dataset-profile-definition/rule"; -import { Section } from "../../../core/model/dataset-profile-definition/section"; -import { ViewStyle } from "../../../core/model/dataset-profile-definition/view-style"; -import { BackendErrorValidator } from '@common/forms/validation/custom-validator'; -import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model'; +import {FormBuilder, FormControl, FormGroup, ValidatorFn, Validators} from "@angular/forms"; +import {Guid} from '@common/types/guid'; +import {ValidationType, ValidatorURL} from "../../../core/common/enum/validation-type"; +import {BaseFormModel} from "../../../core/model/base-form-model"; +import {CompositeField} from "../../../core/model/dataset-profile-definition/composite-field"; +import {DatasetProfileDefinitionModel} from "../../../core/model/dataset-profile-definition/dataset-profile-definition"; +import {DefaultValue} from "../../../core/model/dataset-profile-definition/default-value"; +import {Field} from "../../../core/model/dataset-profile-definition/field"; +import {Multiplicity} from "../../../core/model/dataset-profile-definition/multiplicity"; +import {Page} from "../../../core/model/dataset-profile-definition/page"; +import {Rule} from "../../../core/model/dataset-profile-definition/rule"; +import {Section} from "../../../core/model/dataset-profile-definition/section"; +import {ViewStyle} from "../../../core/model/dataset-profile-definition/view-style"; +import {BackendErrorValidator} from '@common/forms/validation/custom-validator'; +import {ValidationErrorModel} from '@common/forms/validation/error-model/validation-error-model'; export class DatasetDescriptionFormEditorModel extends BaseFormModel { @@ -229,6 +229,7 @@ export class DatasetDescriptionFieldEditorModel extends BaseFormModel { public data: any; public validations: Array; public validationRequired = false; + public validationURL = false; fromModel(item: Field): DatasetDescriptionFieldEditorModel { this.id = item.id; @@ -253,16 +254,27 @@ export class DatasetDescriptionFieldEditorModel extends BaseFormModel { buildForm(): FormGroup { if (this.validations) { this.validations.forEach(validation => { - if (validation === ValidationType.Required) { this.validationRequired = true; } + if (validation === ValidationType.Required) { + this.validationRequired = true; + } else if(validation === ValidationType.URL) { + this.validationURL = true; + } }); } - + let validators: any[] = []; + if(this.validationRequired) { + validators.push(Validators.required) + } + if(this.validationURL) { + validators.push(ValidatorURL.validator); + } const formGroup = this.formBuilder.group({ - value: [this.value, this.validationRequired === true ? Validators.required : null], + value: [this.value, validators], id: [{ value: this.id, disabled: false }], viewStyle: [{ value: this.viewStyle, disabled: true }], data: [{ value: this.data, disabled: true }], validationRequired: [{ value: this.validationRequired, disabled: true }], + validationURL: [{ value: this.validationURL, disabled: true }], description: [{ value: this.description, disabled: true }], extendedDescription: [{ value: this.extendedDescription, disabled: true }], additionalInformation: [{ value: this.additionalInformation, disabled: true }], diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json index 0bea1b395..78ba43a61 100644 --- a/dmp-frontend/src/assets/i18n/de.json +++ b/dmp-frontend/src/assets/i18n/de.json @@ -3,7 +3,11 @@ "VALIDATION": { "REQUIRED": "Pflichtfeld", "GRANT-START-AFTER-END": "Anfangsdatum der Förderung kann nicht nach dem Laufzeitende liegen", - "PATTERN-_": "Schriftzeichen \"_\" ist nicht erlaubt" + "PATTERN-_": "Schriftzeichen \"_\" ist nicht erlaubt", + "URL": { + "LABEL": "URL", + "MESSAGE": "Please provide a valid URL" + } }, "DELETE-CONFIRMATION": { "TITLE": "Warnung", @@ -721,7 +725,7 @@ "DATASET-NOT-FOUND": "Datensatzbeschreibung ist nicht vorhanden", "DATASET-NOT-ALLOWED": "Sie haben keinen Zugriff auf diese Datensatzbeschreibung", "SUCCESS-UPDATE-DATASET-PROFILE": "Vorlage der Datensatzbeschreibung erfolgreich aktualisiert", - "MISSING-FIELDS": "There are some required fields left unfilled. Please check the form and make sure that all required fields are filled. (Missing fields are marked in red color)" + "MISSING-FIELDS": "There are some required fields left unfilled. Please check the DMP and make sure that all required questions are answered and URLs are provided with valid input. (Missing fields are marked in red color)" }, "UPLOAD": { "UPLOAD-XML": "Importieren", diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index 723f0cea9..bc17a486b 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -3,7 +3,11 @@ "VALIDATION": { "REQUIRED": "Required", "GRANT-START-AFTER-END": "Grant start date cannot be after the end date", - "PATTERN-_": "Character \"_\" is not allowed" + "PATTERN-_": "Character \"_\" is not allowed", + "URL": { + "LABEL": "URL", + "MESSAGE": "Please provide a valid URL" + } }, "DELETE-CONFIRMATION": { "TITLE": "Warning", @@ -721,7 +725,7 @@ "DATASET-NOT-FOUND": "Dataset does not exist", "DATASET-NOT-ALLOWED": "You have no access to this Dataset", "SUCCESS-UPDATE-DATASET-PROFILE": "Dataset Template updated successfully", - "MISSING-FIELDS": "There are some required fields left unfilled. Please check the form and make sure that all required fields are filled. (Missing fields are marked in red color)" + "MISSING-FIELDS": "There are some required fields left unfilled. Please check the DMP and make sure that all required questions are answered and URLs are provided with valid input. (Missing fields are marked in red color)" }, "UPLOAD": { "UPLOAD-XML": "Import", diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json index dfb9137a7..bb849fb8e 100644 --- a/dmp-frontend/src/assets/i18n/es.json +++ b/dmp-frontend/src/assets/i18n/es.json @@ -3,7 +3,11 @@ "VALIDATION": { "REQUIRED": "Obligatorio", "GRANT-START-AFTER-END": "La fecha de incio de la subvención no puede ser posterior a la fecha de fin", - "PATTERN-_": "Carácter \"_\" no permitido" + "PATTERN-_": "Carácter \"_\" no permitido", + "URL": { + "LABEL": "URL", + "MESSAGE": "Please provide a valid URL" + } }, "DELETE-CONFIRMATION": { "TITLE": "Aviso", @@ -721,8 +725,7 @@ "DATASET-NOT-FOUND": "No existe la descripción del dataset", "DATASET-NOT-ALLOWED": "No tiene acceso a la descricipción de este dataset", "SUCCESS-UPDATE-DATASET-PROFILE": "Plantilla de descripción del dataset actualizada correctamente", - "MISSING-FIELDS": "Hay campos requeridos sin rellenar. Por favor, compruebe el formulario y rellene los campos obligatorios (Los campos sin rellenar se marcan en color rojo)" - }, + "MISSING-FIELDS": "There are some required fields left unfilled. Please check the DMP and make sure that all required questions are answered and URLs are provided with valid input. (Missing fields are marked in red color)" }, "UPLOAD": { "UPLOAD-XML": "Importar", "UPLOAD-XML-FILE-TITLE": "Importar la plantilla de descripción del dataset", diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json index 2abf969f3..eab84d238 100644 --- a/dmp-frontend/src/assets/i18n/gr.json +++ b/dmp-frontend/src/assets/i18n/gr.json @@ -3,7 +3,11 @@ "VALIDATION": { "REQUIRED": "Προαπαιτούμενο", "GRANT-START-AFTER-END": "Η ημερομηνία έναρξης της επιχορήγησης δεν μπορεί να είναι μεταγενέστερη της ημερομηνίας λήξης", - "PATTERN-_": "Ο χαρακτήρας \"_\" δεν υποστηρίζεται" + "PATTERN-_": "Ο χαρακτήρας \"_\" δεν υποστηρίζεται", + "URL": { + "LABEL": "URL", + "MESSAGE": "Παρακαλώ εισάγεται ένα έγκυρο URL" + } }, "DELETE-CONFIRMATION": { "TITLE": "Προσοχή", @@ -721,7 +725,7 @@ "DATASET-NOT-FOUND": "Η Περιγραφή Συνόλου Δεδομένων δεν υπάρχει", "DATASET-NOT-ALLOWED": "Δεν έχετε πρόσβαση σε αυτή την Περιγραφή Συνόλου Δεδομένων", "SUCCESS-UPDATE-DATASET-PROFILE": "Επιτυχία ενημέρωσης της Περιγραφής Συνόλου Δεδομένων", - "MISSING-FIELDS": "Υπάρχουν ορισμένα υποχρεωτικά πεδία που δεν έχουν συμπληρωθεί. Ελέγξτε τη φόρμα και βεβαιωθείτε ότι έχουν συμπληρωθεί όλα τα απαιτούμενα πεδία. (Τα πεδία που λείπουν επισημαίνονται με κόκκινο χρώμα)" + "MISSING-FIELDS": "Υπάρχουν ορισμένα υποχρεωτικά πεδία που δεν έχουν συμπληρωθεί. Ελέγξτε το DMP και βεβαιωθείτε ότι έχουν συμπληρωθεί όλα τα απαιτούμενα πεδία και τα URL είναι έγκυρα. (Τα πεδία που λείπουν επισημαίνονται με κόκκινο χρώμα)" }, "UPLOAD": { "UPLOAD-XML": "Εισαγωγή", diff --git a/dmp-frontend/src/assets/i18n/pt.json b/dmp-frontend/src/assets/i18n/pt.json index 606bb934c..17be1de02 100644 --- a/dmp-frontend/src/assets/i18n/pt.json +++ b/dmp-frontend/src/assets/i18n/pt.json @@ -3,7 +3,11 @@ "VALIDATION": { "REQUIRED": "Obrigatório", "GRANT-START-AFTER-END": "A data de início do financiamento não pode ser posterior à data de término", - "PATTERN-_": "O caracter \"_\" não é permitido" + "PATTERN-_": "O caracter \"_\" não é permitido", + "URL": { + "LABEL": "URL", + "MESSAGE": "Please provide a valid URL" + } }, "DELETE-CONFIRMATION": { "TITLE": "Atenção", @@ -721,8 +725,7 @@ "DATASET-NOT-FOUND": "O Dataset não existe", "DATASET-NOT-ALLOWED": "Não tem acesso a este Dataset", "SUCCESS-UPDATE-DATASET-PROFILE": "O Dataset foi atualizado com sucesso", - "MISSING-FIELDS": "Alguns campos obrigatórios não foram preenchidos. Por favor, verifique o formulário e certifique-se de que todos os campos obrigatórios foram preenchidos. (Os campos ausentes são marcados em vermelho)" - }, + "MISSING-FIELDS": "There are some required fields left unfilled. Please check the DMP and make sure that all required questions are answered and URLs are provided with valid input. (Missing fields are marked in red color)" }, "UPLOAD": { "UPLOAD-XML": "Importar", "UPLOAD-XML-FILE-TITLE": "Importar o Dataset", diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json index 0410d0be4..420f481c0 100644 --- a/dmp-frontend/src/assets/i18n/sk.json +++ b/dmp-frontend/src/assets/i18n/sk.json @@ -3,7 +3,11 @@ "VALIDATION": { "REQUIRED": "Povinné", "GRANT-START-AFTER-END": "Dátum začatia poskytovania grantu nesmie byť po dátume ukončenia", - "PATTERN-_": "Znak \"_\" nie je povolený" + "PATTERN-_": "Znak \"_\" nie je povolený", + "URL": { + "LABEL": "URL", + "MESSAGE": "Please provide a valid URL" + } }, "DELETE-CONFIRMATION": { "TITLE": "Upozornenie", @@ -721,7 +725,7 @@ "DATASET-NOT-FOUND": "Súbor dát neexistuje", "DATASET-NOT-ALLOWED": "K tomuto súboru dát nemáte prístup", "SUCCESS-UPDATE-DATASET-PROFILE": "Šablóna súboru dát bola úspešne aktualizovaná", - "MISSING-FIELDS": "There are some required fields left unfilled. Please check the form and make sure that all required fields are filled. (Missing fields are marked in red color)" + "MISSING-FIELDS": "There are some required fields left unfilled. Please check the DMP and make sure that all required questions are answered and URLs are provided with valid input. (Missing fields are marked in red color.)" }, "UPLOAD": { "UPLOAD-XML": "Importovať", diff --git a/dmp-frontend/src/assets/i18n/sr.json b/dmp-frontend/src/assets/i18n/sr.json index bcaedf458..b37320c19 100644 --- a/dmp-frontend/src/assets/i18n/sr.json +++ b/dmp-frontend/src/assets/i18n/sr.json @@ -3,7 +3,11 @@ "VALIDATION": { "REQUIRED": "Obavezno", "GRANT-START-AFTER-END": "Datum početka ne može biti kasniji od datuma završetka granta.", - "PATTERN-_": "Karakter \"_\" nije dozvoljen" + "PATTERN-_": "Karakter \"_\" nije dozvoljen", + "URL": { + "LABEL": "URL", + "MESSAGE": "Please provide a valid URL" + } }, "DELETE-CONFIRMATION": { "TITLE": "Oprez", @@ -721,7 +725,7 @@ "DATASET-NOT-FOUND": "Skup podataka ne postoji", "DATASET-NOT-ALLOWED": "Nemate pristup ovom skupu podataka", "SUCCESS-UPDATE-DATASET-PROFILE": "Obrazac skupa podataka je ažuriran uspešno", - "MISSING-FIELDS": "There are some required fields left unfilled. Please check the form and make sure that all required fields are filled. (Missing fields are marked in red color)" + "MISSING-FIELDS": "There are some required fields left unfilled. Please check the DMP and make sure that all required questions are answered and URLs are provided with valid input. (Missing fields are marked in red color.)" }, "UPLOAD": { "UPLOAD-XML": "Uvezite", diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json index 27189fd8f..845002e8f 100644 --- a/dmp-frontend/src/assets/i18n/tr.json +++ b/dmp-frontend/src/assets/i18n/tr.json @@ -3,7 +3,11 @@ "VALIDATION": { "REQUIRED": "Gerekli", "GRANT-START-AFTER-END": "Hibe başlangıç tarihi bitiş tarihinden sonra olamaz", - "PATTERN-_": "\"_\" Karakterine izin verilmiyor" + "PATTERN-_": "\"_\" Karakterine izin verilmiyor", + "URL": { + "LABEL": "URL", + "MESSAGE": "Please provide a valid URL" + } }, "DELETE-CONFIRMATION": { "TITLE": "Uyarı", @@ -721,7 +725,7 @@ "DATASET-NOT-FOUND": "Veri Seti mevcut değildir", "DATASET-NOT-ALLOWED": "Bu Veri Setine erişiminiz yok", "SUCCESS-UPDATE-DATASET-PROFILE": "Veri Seti Tanımı başarılı olarak güncellendi", - "MISSING-FIELDS": "There are some required fields left unfilled. Please check the form and make sure that all required fields are filled. (Missing fields are marked in red color)" + "MISSING-FIELDS": "There are some required fields left unfilled. Please check the DMP and make sure that all required questions are answered and URLs are provided with valid input. (Missing fields are marked in red color.)" }, "UPLOAD": { "UPLOAD-XML": "İçeri Aktar",