From 5ee4c6b61b6cf57703df6a0c6c92f9d116ac1cb9 Mon Sep 17 00:00:00 2001 From: Toni Prieto Date: Tue, 7 Jun 2022 21:49:56 +0200 Subject: [PATCH] Make label and error messages for license-step accept-checkbox translatable --- .../sections/license/section-license.component.ts | 6 ++++++ .../submission/sections/license/section-license.model.ts | 6 +++--- src/assets/i18n/en.json5 | 6 ++++++ src/assets/i18n/es.json5 | 7 +++++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/app/submission/sections/license/section-license.component.ts b/src/app/submission/sections/license/section-license.component.ts index 8f675dc0cd..e9a0cf1566 100644 --- a/src/app/submission/sections/license/section-license.component.ts +++ b/src/app/submission/sections/license/section-license.component.ts @@ -29,6 +29,7 @@ import { renderSectionFor } from '../sections-decorator'; import { SectionsType } from '../sections-type'; import { SectionsService } from '../sections.service'; import { SECTION_LICENSE_FORM_LAYOUT, SECTION_LICENSE_FORM_MODEL } from './section-license.model'; +import { TranslateService } from '@ngx-translate/core'; /** * This component represents a section that contains the submission license form. @@ -99,6 +100,7 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent { * @param {JsonPatchOperationsBuilder} operationsBuilder * @param {SectionsService} sectionService * @param {SubmissionService} submissionService + * @param {TranslateService} translateService * @param {string} injectedCollectionId * @param {SectionDataObject} injectedSectionData * @param {string} injectedSubmissionId @@ -111,6 +113,7 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent { protected operationsBuilder: JsonPatchOperationsBuilder, protected sectionService: SectionsService, protected submissionService: SubmissionService, + protected translateService: TranslateService, @Inject('collectionIdProvider') public injectedCollectionId: string, @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject, @Inject('submissionIdProvider') public injectedSubmissionId: string) { @@ -126,6 +129,9 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent { this.formModel = this.formBuilderService.fromJSON(SECTION_LICENSE_FORM_MODEL); const model = this.formBuilderService.findById('granted', this.formModel); + // Translate checkbox label + model.label = this.translateService.instant(model.label); + // Retrieve license accepted status (model as DynamicCheckboxModel).value = (this.sectionData.data as WorkspaceitemSectionLicenseObject).granted; diff --git a/src/app/submission/sections/license/section-license.model.ts b/src/app/submission/sections/license/section-license.model.ts index 8107b73674..0f21ef98a4 100644 --- a/src/app/submission/sections/license/section-license.model.ts +++ b/src/app/submission/sections/license/section-license.model.ts @@ -13,15 +13,15 @@ export const SECTION_LICENSE_FORM_LAYOUT = { export const SECTION_LICENSE_FORM_MODEL = [ { id: 'granted', - label: 'I confirm the license above', + label: 'submission.sections.license.granted-label', required: true, value: false, validators: { required: null }, errorMessages: { - required: 'You must accept the license', - notgranted: 'You must accept the license' + required: 'submission.sections.license.required', + notgranted: 'submission.sections.license.notgranted' }, type: 'CHECKBOX', } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 5d7be2a681..24591d6960 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -4234,6 +4234,12 @@ "submission.sections.accesses.form.until-placeholder": "Until", + "submission.sections.license.granted-label": "I confirm the license above", + + "submission.sections.license.required": "You must accept the license", + + "submission.sections.license.notgranted": "You must accept the license", + "submission.sections.sherpa.publication.information": "Publication information", diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5 index 09217494d1..5d40c501f1 100644 --- a/src/assets/i18n/es.json5 +++ b/src/assets/i18n/es.json5 @@ -5314,7 +5314,14 @@ // "submission.sections.upload.upload-successful": "Upload successful", "submission.sections.upload.upload-successful": "Subida exitosa", + // "submission.sections.license.granted-label": "I confirm the license above", + "submission.sections.license.granted-label": "Confirmo la licencia", + // "submission.sections.license.required": "You must accept the license", + "submission.sections.license.required": "Debe aceptar la licencia", + + // "submission.sections.license.notgranted": "You must accept the license", + "submission.sections.license.notgranted": "Debe aceptar la licencia", // "submission.submit.breadcrumbs": "New submission", "submission.submit.breadcrumbs": "Nuevo envĂ­o",