Twisty content changes (#27)

* content changes

* content mistakes

* translations

* please work

* found error

* change requested

* more changes

source/jsonnet/england-wales/individual/blocks/employment/armed_forces.jsonnet

@@ -1,7 +1,7 @@
 local placeholders = import '../../../lib/placeholders.libsonnet';
 local rules = import 'rules.libsonnet';
 
-local question(title) = {
+local question(title, guidanceHeader, description) = {
   id: 'armed-forces-question',
   title: title,
   guidance: {
@@ -19,11 +19,14 @@ local question(title) = {
       mandatory: false,
       type: 'Checkbox',
       guidance: {
-        show_guidance: 'Why your answer is important',
-        hide_guidance: 'Why your answer is important',
+        show_guidance: guidanceHeader,
+        hide_guidance: guidanceHeader,
         contents: [
           {
-            description: 'We are measuring the number of people who have served in the UK Armed Forces and have now left. Government and councils need this information to carry out their commitments made under the Armed Forces Covenant. This is a promise by the nation ensuring that those who serve or who have served in the armed forces, and their families, are not disadvantaged.',
+            description: description,
+          },
+          {
+            description: 'Councils and government will use this information to carry out the commitments they made under the Armed Forces Covenant. This is a promise by the nation to ensure that those who serve or who have served in the UK Armed Forces, and their families, are not disadvantaged.',
           },
         ],
       },
@@ -53,23 +56,28 @@ local question(title) = {
 };
 
 local nonProxyTitle = 'Have you previously served in the UK Armed Forces?';
+local nonProxyGuidanceHeader = 'Why your answer is important';
+local nonProxyDescription = 'Your answer will help your local community by providing information needed to support people who used to serve in the UK Armed Forces but have now left.';
+
 local proxyTitle = {
   text: 'Has <em>{person_name}</em> previously served in the UK Armed Forces?',
   placeholders: [
     placeholders.personName,
   ],
 };
+local proxyGuidanceHeader = 'Why their answer is important';
+local proxyDescription = 'Their answer will help their local community by providing information needed to support people who used to serve in the UK Armed Forces but have now left.';
 
 {
   type: 'Question',
   id: 'armed-forces',
   question_variants: [
     {
-      question: question(nonProxyTitle),
+      question: question(nonProxyTitle, nonProxyGuidanceHeader, nonProxyDescription),
       when: [rules.isNotProxy],
     },
     {
-      question: question(proxyTitle),
+      question: question(proxyTitle, proxyGuidanceHeader, proxyDescription),
       when: [rules.isProxy],
     },
   ],

source/jsonnet/england-wales/individual/blocks/employment/employer_address_depot.jsonnet

@@ -1,7 +1,7 @@
 local placeholders = import '../../../lib/placeholders.libsonnet';
 local rules = import 'rules.libsonnet';
 
-local question(title) = {
+local question(title, guidanceHeader, guidanceContent) = {
   id: 'employer-address-depot-question',
   title: title,
   type: 'General',
@@ -36,36 +36,51 @@ local question(title) = {
       mandatory: false,
       type: 'TextField',
       guidance: {
-        show_guidance: 'Why your answer is important',
-        hide_guidance: 'Why your answer is important',
-        contents: [
-          {
-            description: 'The government uses information about workplace address and method of travel to work to form transport policies and plan services. The information helps to work out local transport needs.',
-          },
-        ],
+        show_guidance: guidanceHeader,
+        hide_guidance: guidanceHeader,
+        contents: guidanceContent,
       },
     },
   ],
 };
 
 local nonProxyTitle = 'What is the address of your depot?';
+local nonProxyGuidanceHeader = 'Why your answer is important';
+local nonProxyGuidanceContent = [
+  {
+    description: 'Your answer will help your community by allowing the government and councils to understand commuting patterns.',
+  },
+  {
+    description: 'Information about your workplace address and how you travel to work are used together to work out local public transport needs, develop transport policies and plan services.',
+  },
+];
+
 local proxyTitle = {
   text: 'What is the address of <em>{person_name_possessive}</em> depot?',
   placeholders: [
     placeholders.personNamePossessive,
   ],
 };
+local proxyGuidanceHeader = 'Why their answer is important';
+local proxyGuidanceContent = [
+  {
+    description: 'Their answer will help their community by allowing the government and councils to understand commuting patterns.',
+  },
+  {
+    description: 'Information about their workplace address and how they travel to work are used together to work out local public transport needs, develop transport policies and plan services.',
+  },
+];
 
 {
   type: 'Question',
   id: 'employer-address-depot',
   question_variants: [
     {
-      question: question(nonProxyTitle),
+      question: question(nonProxyTitle, nonProxyGuidanceHeader, nonProxyGuidanceContent),
       when: [rules.isNotProxy],
     },
     {
-      question: question(proxyTitle),
+      question: question(proxyTitle, proxyGuidanceHeader, proxyGuidanceContent),
       when: [rules.isProxy],
     },
   ],

source/jsonnet/england-wales/individual/blocks/employment/employer_address_workplace.jsonnet

@@ -1,7 +1,7 @@
 local placeholders = import '../../../lib/placeholders.libsonnet';
 local rules = import 'rules.libsonnet';
 
-local question(title) = {
+local question(title, guidanceHeader, guidanceContent) = {
   id: 'employer-address-workplace-question',
   title: title,
   type: 'General',
@@ -36,36 +36,51 @@ local question(title) = {
       mandatory: false,
       type: 'TextField',
       guidance: {
-        show_guidance: 'Why your answer is important',
-        hide_guidance: 'Why your answer is important',
-        contents: [
-          {
-            description: 'The government uses information about workplace address and method of travel to work to form transport policies and plan services. The information helps to work out local transport needs.',
-          },
-        ],
+        show_guidance: guidanceHeader,
+        hide_guidance: guidanceHeader,
+        contents: guidanceContent,
       },
     },
   ],
 };
 
 local nonProxyTitle = 'What is the address of your workplace?';
+local nonProxyGuidanceHeader = 'Why your answer is important';
+local nonProxyGuidanceContent = [
+  {
+    description: 'Your answer will help your community by allowing the government and councils to understand commuting patterns.',
+  },
+  {
+    description: 'Information about your workplace address and how you travel to work are used together to work out local public transport needs, develop transport policies and plan services.',
+  },
+];
+
 local proxyTitle = {
   text: 'What is the address of <em>{person_name_possessive}</em> workplace?',
   placeholders: [
     placeholders.personNamePossessive,
   ],
 };
+local proxyGuidanceHeader = 'Why their answer is important';
+local proxyGuidanceContent = [
+  {
+    description: 'Their answer will help their community by allowing the government and councils to understand commuting patterns.',
+  },
+  {
+    description: 'Information about their workplace address and how they travel to work are used together to work out local public transport needs, develop transport policies and plan services.',
+  },
+];
 
 {
   type: 'Question',
   id: 'employer-address-workplace',
   question_variants: [
     {
-      question: question(nonProxyTitle),
+      question: question(nonProxyTitle, nonProxyGuidanceHeader, nonProxyGuidanceContent),
       when: [rules.isNotProxy],
     },
     {
-      question: question(proxyTitle),
+      question: question(proxyTitle, proxyGuidanceHeader, proxyGuidanceContent),
       when: [rules.isProxy],
     },
   ],

source/jsonnet/england-wales/individual/blocks/employment/job_pending.jsonnet

@@ -1,12 +1,27 @@
 local placeholders = import '../../../lib/placeholders.libsonnet';
 local rules = import 'rules.libsonnet';
 
-local question(title) = {
+local question(title, guidanceHeader) = {
   id: 'job-pending-question',
   title: title,
   type: 'General',
   answers: [
     {
+      guidance: {
+        show_guidance: guidanceHeader,
+        hide_guidance: guidanceHeader,
+        contents: [
+          {
+            description: 'To get a true picture of the working population, we ask this question of everyone who is not currently working.',
+          },
+          {
+            description: 'We ask people who are retired because the number of people continuing to work after retirement is increasing.',
+          },
+          {
+            description: 'We ask people who are not working due to long-term illness or disability because some intend to go back to work.',
+          },
+        ],
+      },
       id: 'job-pending-answer',
       mandatory: false,
       options: [
@@ -32,16 +47,19 @@ local proxyTitle = {
   ],
 };
 
+local nonProxyGuidanceHeader = 'Why we ask this question if you are retired or long-term sick or disabled';
+local proxyGuidanceHeader = 'Why we ask this question if they are retired or long-term sick or disabled';
+
 {
   type: 'Question',
   id: 'job-pending',
   question_variants: [
     {
-      question: question(nonProxyTitle),
+      question: question(nonProxyTitle, nonProxyGuidanceHeader),
       when: [rules.isNotProxy],
     },
     {
-      question: question(proxyTitle),
+      question: question(proxyTitle, proxyGuidanceHeader),
       when: [rules.isProxy],
     },
   ],

source/jsonnet/england-wales/individual/blocks/employment/jobseeker.jsonnet

@@ -12,7 +12,13 @@ local question(title, guidanceHeader) = {
         hide_guidance: guidanceHeader,
         contents: [
           {
-            description: 'To get a true picture of the UK working population, we ask this question of everyone who is not currently working. We ask people who are retired because the number of people continuing to work after retirement age is increasing. We ask people who are long-term sick or disabled because some intend to go back to work.',
+            description: 'To get a true picture of the working population, we ask this question of everyone who is not currently working.',
+          },
+          {
+            description: 'We ask people who are retired because the number of people continuing to work after retirement is increasing.',
+          },
+          {
+            description: 'We ask people who are not working due to long-term illness or disability because some intend to go back to work.',
           },
         ],
       },
@@ -40,8 +46,9 @@ local proxyTitle = {
     placeholders.personName,
   ],
 };
-local nonProxyGuidanceHeader = 'Why do I need to answer if I am retired or long-term sick or disabled?';
-local proxyGuidanceHeader = 'Why do I need to answer if they have retired or are long-term sick or disabled?';
+
+local nonProxyGuidanceHeader = 'Why we ask this question if you are retired or long-term sick or disabled';
+local proxyGuidanceHeader = 'Why we ask this question if they are retired or long-term sick or disabled';
 
 {
   type: 'Question',

source/jsonnet/england-wales/individual/blocks/identity-and-health/disability.jsonnet

@@ -6,7 +6,7 @@ local question(title, definitionContent) = {
   title: title,
   definitions: [
     {
-      title: 'What do we mean by “physical and mental health conditions or illnesses”?',
+      title: 'What we mean by “physical and mental health conditions or illnesses”',
       contents: definitionContent,
     },
   ],
@@ -33,7 +33,7 @@ local question(title, definitionContent) = {
 local nonProxyTitle = 'Do you have any physical or mental health conditions or illnesses lasting or expected to last 12 months or more?';
 local nonProxyDefinitionContent = [
   {
-    description: 'This refers to health conditions, illnesses or impairments you may have.',
+    description: 'This is about health conditions, illnesses or impairments you may have.',
   },
   {
     description: 'Consider conditions that always affect you and those that flare up from time to time. These may include, for example, sensory conditions, developmental conditions or learning impairments.',
@@ -47,7 +47,7 @@ local proxyTitle = {
 };
 local proxyDefinitionContent = [
   {
-    description: 'This refers to health conditions, illnesses or impairments they may have.',
+    description: 'This is about health conditions, illnesses or impairments they may have.',
   },
   {
     description: 'Consider conditions that always affect them and those that flare up from time to time. These may include, for example, sensory conditions, developmental conditions or learning impairments.',

source/jsonnet/england-wales/individual/blocks/identity-and-health/disability_limitation.jsonnet

@@ -31,16 +31,13 @@ local question(title, definition) = {
 
 local nonProxyTitle = 'Do any of your conditions or illnesses reduce your ability to carry out day-to-day activities?';
 local nonProxyDefinition = {
-  title: 'What do we mean by “reduce your ability”?',
+  title: 'What we mean by “reduce your ability”',
   contents: [
     {
-      description: 'We mean whether your health condition or illness currently affects your ability to carry out day-to-day activities.',
+      description: 'This is about whether your health condition or illness currently affects your ability to carry out day-to-day activities.',
     },
     {
-      description: 'Consider whether you are still affected while receiving any treatment, medication or using any devices for your condition or illness.',
-    },
-    {
-      description: 'For example, if you need a hearing aid and by using the device you experience no restriction in carrying out your day-to-day activities, then you should select “Not at all”.',
+      description: 'Consider whether you are still affected while receiving any treatment, medication or using any devices for your condition or illness. For example, if you use a hearing aid and are not restricted in carrying out your day-to-day activities when doing so, select “Not at all”.',
     },
     {
       description: 'You should select “Yes, a lot” if you usually need some level of support from family members, friends or personal social services for most normal daily activities.',
@@ -54,16 +51,13 @@ local proxyTitle = {
   ],
 };
 local proxyDefinition = {
-  title: 'What do we mean by “reduce their ability”?',
+  title: 'What we mean by “reduce their ability”',
   contents: [
     {
-      description: 'We mean whether their health condition or illness currently affects their ability to carry out day-to-day activities.',
-    },
-    {
-      description: 'Consider whether they are still affected while receiving any treatment, medication or using any devices for their condition or illness.',
+      description: 'This is about whether their health condition or illness currently affects their ability to carry out day-to-day activities.',
     },
     {
-      description: 'For example, if they need a hearing aid and by using the device they experience no restriction in carrying out their day-to-day activities, then you should select “Not at all”.',
+      description: 'Consider whether they are still affected while receiving any treatment, medication or using any devices for their condition or illness. For example, if they use a hearing aid and are not restricted in carrying out their day-to-day activities when doing so, select “Not at all”.',
     },
     {
       description: 'You should select “Yes, a lot” if they usually need some level of support from family members, friends or personal social services for most normal daily activities.',

source/jsonnet/england-wales/individual/blocks/identity-and-health/ethnic_group.jsonnet

@@ -9,6 +9,9 @@ local proxyTitle = {
   ],
 };
 
+local nonProxyDescription = 'Your answer will provide a better understanding of your community and help to support equality and fairness. For example, councils and government use information on ethnic group to make sure they';
+local proxyDescription = 'Their answer will provide a better understanding of their community and help to support equality and fairness. For example, councils and government use information on ethnic group to make sure they';
+
 local englandDescription = 'Includes British, Northern Irish, Irish, Gypsy, Irish Traveller, Roma or any other White background';
 local walesDescription = 'Includes Welsh, British, Northern Irish, Irish, Gypsy, Irish Traveller, Roma or any other White background';
 
@@ -62,7 +65,7 @@ local walesBlackEthnicityRoutingRule = {
   ],
 };
 
-local question(title, region_code) = (
+local question(title, description, region_code) = (
   local regionDescription = if region_code == 'GB-WLS' then walesDescription else englandDescription;
   local asianEthnicityLabel = if region_code == 'GB-WLS' then walesAsianEthnicityLabel else englandAsianEthnicityLabel;
   local blackEthnicityLabel = if region_code == 'GB-WLS' then walesBlackEthnicityLabel else englandBlackEthnicityLabel;
@@ -77,7 +80,7 @@ local question(title, region_code) = (
           hide_guidance: 'Why your answer is important',
           contents: [
             {
-              description: 'Your answer will help to support equality and fairness in your community. Councils and government use information on ethnic group to make sure they',
+              description: description,
               list: [
                 'provide services and share funding fairly',
                 'understand and represent everyone’s interests',
@@ -128,11 +131,11 @@ function(region_code) (
     id: 'ethnic-group',
     question_variants: [
       {
-        question: question(nonProxyTitle, region_code),
+        question: question(nonProxyTitle, nonProxyDescription, region_code),
         when: [rules.isNotProxy],
       },
       {
-        question: question(proxyTitle, region_code),
+        question: question(proxyTitle, proxyDescription, region_code),
         when: [rules.isProxy],
       },
     ],