diff --git a/marlo-web/src/main/resources/custom/aicrra.properties b/marlo-web/src/main/resources/custom/aicrra.properties index 4681537808..f821b38fee 100644 --- a/marlo-web/src/main/resources/custom/aicrra.properties +++ b/marlo-web/src/main/resources/custom/aicrra.properties @@ -941,10 +941,11 @@ deliverable.typeOfActivity.other=Other deliverable.typeOfActivity.other.description= deliverable.missing.activity.alert=There are {0} deliverable(s) in this cluster not mapped to any activity
*Please keep in mind that without full fill this task the green-check mark validator will not be reflected
-deliverable.shfrmContribution.question.reporting=Is this deliverable contributing to contribute to the Soil Health and Fertiliser Road Map (SHFRM) implementation: +deliverable.shfrmContribution.question.reporting=Is this deliverable contributing to the Soil Health and Fertiliser Road Map (SHFRM) implementation: deliverable.shfrmContribution.question.planning=Is this deliverable expected to contribute to the Soil Health and Fertiliser Road Map (SHFRM) implementation: deliverable.shfrmContribution.question.help=If you select yes, please make sure to select the SHFRM indicator in the next question -deliverable.shfrmContribution.narrative=Provide a short narrative on how this deliverable is expecting to contribute to the SHFRM +deliverable.shfrmContribution.narrative.reporting=Provide a short narrative on the contribution of this deliverable to the SHFRM +deliverable.shfrmContribution.narrative.planning=Provide a short narrative on the expected contribution of this deliverable to the SHFRM deliverable.shfrmContribution.priorityAction=To which priority action of the SHFRM is this deliverable contributing to? deliverable.shfrmContribution.priorityAction.help=Select a priority action deliverable.shfrmContribution.subAction=To which specific sub-action of the SHFRM is this deliverable contributing to? diff --git a/marlo-web/src/main/resources/global.properties b/marlo-web/src/main/resources/global.properties index f2e88c5cae..63021e585d 100644 --- a/marlo-web/src/main/resources/global.properties +++ b/marlo-web/src/main/resources/global.properties @@ -942,10 +942,11 @@ deliverable.typeOfActivity.other=Other deliverable.typeOfActivity.other.description= deliverable.missing.activity.alert=There are {0} deliverable(s) in this cluster not mapped to any activity
*Please keep in mind that without full fill this task the green-check mark validator will not be reflected
-deliverable.shfrmContribution.question.reporting=Is this deliverable contributing to contribute to the Soil Health and Fertiliser Road Map (SHFRM) implementation: +deliverable.shfrmContribution.question.reporting=Is this deliverable contributing to the Soil Health and Fertiliser Road Map (SHFRM) implementation: deliverable.shfrmContribution.question.planning=Is this deliverable expected to contribute to the Soil Health and Fertiliser Road Map (SHFRM) implementation: deliverable.shfrmContribution.question.help=If you select yes, please make sure to select the SHFRM indicator in the next question -deliverable.shfrmContribution.narrative=Provide a short narrative on how this deliverable is expecting to contribute to the SHFRM +deliverable.shfrmContribution.narrative.reporting=Provide a short narrative on the contribution of this deliverable the SHFRM +deliverable.shfrmContribution.narrative.planing=Provide a short narrative on the expected contribution of this deliverable the SHFRM deliverable.shfrmContribution.priorityAction=To which priority action of the SHFRM is this deliverable contributing to? deliverable.shfrmContribution.priorityAction.help=Select a priority action deliverable.shfrmContribution.subAction=To which specific sub-action of the SHFRM is this deliverable contributing to? diff --git a/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl b/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl index 57120b40a0..58cf8b8725 100644 --- a/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl +++ b/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl @@ -1528,9 +1528,15 @@
[#-- Shfrm Contribution Narrative --] + [#if reportingActive]
- [@customForm.textArea name="deliverable.deliverableInfo.shfrmContributionNarrative" value="${(deliverable.deliverableInfo.shfrmContributionNarrative)!}" i18nkey="deliverable.shfrmContribution.narrative" placeholder="" className="limitWords-200" required=true editable=editable /] + [@customForm.textArea name="deliverable.deliverableInfo.shfrmContributionNarrative" value="${(deliverable.deliverableInfo.shfrmContributionNarrative)!}" i18nkey="deliverable.shfrmContribution.narrative.reporting" placeholder="" className="limitWords-200" required=true editable=editable /]
+ [#else] +
+ [@customForm.textArea name="deliverable.deliverableInfo.shfrmContributionNarrative" value="${(deliverable.deliverableInfo.shfrmContributionNarrative)!}" i18nkey="deliverable.shfrmContribution.narrative.planning" placeholder="" className="limitWords-200" required=true editable=editable /] +
+ [/#if]
[#-- Shfrm Priority Action --]