Merge pull request #110 from DEFRA/RNQP-text-issue

fix 527 hybrid text issue
DEFRA · Sep 30, 2024 · 301af40 · 301af40
2 parents a765686 + 3121dc7
commit 301af40
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/server/common/templates/partials/import-rules.njk b/src/server/common/templates/partials/import-rules.njk
@@ -8,7 +8,11 @@
  {% if data.result.annexSixRule === 'INNS'%}
  {{data.mainContent.prohibitedContentText1}} {{data.searchQuery.value | replace(")", "") | capitalize }} {{data.mainContent.prohibitedContentText4}}.
  {% else %}
- {{data.mainContent.prohibitedContentText1}} {{data.searchQuery.value | replace(")", "") | capitalize }} {{data.mainContent.importRulesHeaderText2}} {{data.countrySearchQuery.value }} {{data.mainContent.prohibitedContentText2}} {{data.format}}.
+ {% if data.result.hybridIndicator.length > 0%}
+ {{data.mainContent.prohibitedContentText1}} {{data.searchQuery.value | replace(")", "") | capitalize }} {{data.mainContent.importRulesHeaderText3}} {{data.mainContent.importRulesHeaderText2}} {{data.countrySearchQuery.value }} {{data.mainContent.prohibitedContentText2}} {{data.format}}.
+ {% else %}
+ {{data.mainContent.prohibitedContentText1}} {{data.searchQuery.value | replace(")", "") | capitalize }} {{data.mainContent.importRulesHeaderText2}} {{data.countrySearchQuery.value }} {{data.mainContent.prohibitedContentText2}} {{data.format}}.
+ {% endif %}
  {% endif %}
  </strong>
  </div> 

diff --git a/src/server/locales/plant-details/en_cy.json b/src/server/locales/plant-details/en_cy.json
@@ -8,6 +8,7 @@
  "noneText": "Dim",
  "importRulesHeaderText1": "Mewnforio",
  "importRulesHeaderText2": "rhag",
+ "importRulesHeaderText3": "(neu ei hybridau)",
  "prohibitedHeader": "Gwybodaeth waharddedig",
  "prohibitedContentText1": "Ni ddylech fewnforio",
  "prohibitedContentText2": "fel",

diff --git a/src/server/locales/plant-details/en_gb.json b/src/server/locales/plant-details/en_gb.json
@@ -8,6 +8,7 @@
  "noneText": "None",
  "importRulesHeaderText1": "Importing",
  "importRulesHeaderText2": "from",
+ "importRulesHeaderText3": "(or its hybrids)",
  "prohibitedHeader": "Prohibition information",
  "prohibitedContentText1": "You must not import",
  "prohibitedContentText2": "as",