Resolved Conflicts

This commit is contained in:
harish
2024-10-30 11:08:04 +05:30
21 changed files with 152 additions and 112 deletions

View File

@@ -30,9 +30,9 @@ aws.secret.access.key=FtnkzF8E3vtqPrVnloqMyNSUSqg0f9Z9L0R7qQOu
aws.s3.region=eu-west-1
aws.s3.bucket.name=mementoresources
aws.s3.url = https://mementoresources.s3.eu-west-1.amazonaws.com/
aws.s3.url.folder=gepafin
aws.s3.url.folder.delegation=gepafin/delegation
aws.s3.url.folder.signed.document=gepafin/signed-document
#aws.s3.url.folder=gepafin
#aws.s3.url.folder.delegation=gepafin/delegation
#aws.s3.url.folder.signed.document=gepafin/signed-document
# JWT configuration
# Ensure these values match your expectations
security.authentication.jwt.secret=my-secret-token-to-change-in-prod-environment-your-super-secure-randomly-generated-key

View File

@@ -253,6 +253,7 @@ get_login_attempt_se_msg=Login attempts fetched successfully.
application.in.submit.status.cannot.delete.company=The company cannot be deleted because there are active applications in the SUBMITTED status.
get.users.success.msg = Successfully fetched users.
cannot.create.beneficiary.user = Creation of a Beneficiary user is not allowed. Please assign the appropriate role.
application.evaluation.not.found=Application Evaluation not found with ID: {0}
evaluation.created.successfully = Application evaluation created successfully.
evaluation.updated.successfully = Application evaluation updated successfully.
@@ -293,6 +294,7 @@ application.amendment.not.found = Application Amendment Request not found with t
application.amendment.get.success = Application Amendment details fetched successfully with given ID.
application.amendment.update.successfully = Application Amendment Updated Successfully.
application.amendment.closed.successfully = Application Amendment Closed Successfully.
response.days.extended.success=Response days extended successfully.
added.comment.to.amendment.request.success = Application Amendment Comment Added Successfully.
comment.not.found = Comment Not Found.

View File

@@ -260,8 +260,8 @@ evaluation.deleted.successfully = Valutazione dell'applicazione eliminata con su
evaluations.fetched.successfully = Tutte le valutazioni delle applicazioni recuperate con successo.
application.evaluation.status.updated.successfully=Stato della valutazione dell'applicazione aggiornato con successo.
assigned.application.not.found.with.id=Applicazione assegnata con questo ID dell'applicazione non trovata
either.application.or.assigned.application.id.required=È richiesto almeno uno tra applicationId o assignedApplicationId.
evaluation.already.exists=Una valutazione dell'applicazione esiste già per questo ID applicazione.
either.application.or.assigned.application.id.required=<EFBFBD> richiesto almeno uno tra applicationId o assignedApplicationId.
evaluation.already.exists=Una valutazione dell'applicazione esiste gi<EFBFBD> per questo ID applicazione.
application.assigned.success.msg =Domanda assegnata con successo
application.already.assigned.msg =La domanda <20> gi<67> assegnata
@@ -288,6 +288,7 @@ application.amendment.not.found = Richiesta di modifica dell'applicazione non tr
application.amendment.get.success = Dettagli della modifica dell'applicazione recuperati correttamente con l'ID fornito.
application.amendment.update.successfully = Emendamento all'applicazione aggiornato con successo.
application.amendment.closed.successfully = Emendamento alla domanda chiuso con successo.
response.days.extended.success=Giorni di risposta estesi con successo.
added.comment.to.amendment.request.success = Commento aggiunto con successo alla richiesta di emendamento.
comment.not.found = Commento non trovato.