Merge pull request #594 from companieshouse/lp-1327-second-nationality-capitalisation-fix

LP-1327: Nationality formatting update

Author: jdowie-ch

src/views/includes/macros.njk

@@ -51,6 +51,20 @@
   {{- capitalizedWords.join(' ') -}}
 {%- endmacro -%}
 
+{%- macro formatNationality(str) -%}
+  {%- set prepositions = ['Of', 'The', 'And'] -%}
+  {%- set capitalizedWords = capitalizeEachWord(str).split(' ') -%}
+  {%- set result = [] -%}
+  {%- for word in capitalizedWords -%}
+    {%- if loop.first or loop.last or prepositions.indexOf(word) === -1 -%}
+      {%- set result = result.concat(word) -%}
+    {%- else -%}
+      {%- set result = result.concat(word.toLowerCase()) -%}
+    {%- endif -%}
+  {%- endfor -%}
+  {{- result.join(' ') -}}
+{%- endmacro -%}
+
 {%- macro buildFormattedListFromArray(capitalContributionSubTypesMap, array) -%}
   {%- set returnValue = [] -%}  
     {%- for item in array -%}

src/views/pages/checkYourAnswers/general-partner.njk

@@ -1,7 +1,7 @@
 {% if item.data.forename %}
-  {% set nationalities = item.data.nationality1 %}
+  {% set nationalities = macros.formatNationality(item.data.nationality1) %}
   {% if item.data.nationality2 %}
-    {% set nationalities = item.data.nationality1 + ", " + item.data.nationality2 | capitalize %}
+    {% set nationalities = macros.formatNationality(item.data.nationality1) + ", " + macros.formatNationality(item.data.nationality2) %}
   {% endif %}
 
   {{ govukSummaryList({

src/views/pages/checkYourAnswers/limited-partner.njk

@@ -9,9 +9,9 @@
 
 {% if item.data.forename %}
 
-  {% set nationalities = item.data.nationality1 | capitalize %}
+  {% set nationalities = macros.formatNationality(item.data.nationality1) %}
   {% if item.data.nationality2 %}
-    {% set nationalities = item.data.nationality1 + ", " + item.data.nationality2 | capitalize %}
+    {% set nationalities = macros.formatNationality(item.data.nationality1) + ", " + macros.formatNationality(item.data.nationality2) %}
   {% endif %}
 
   {% if journeyTypes.isRegistration %}