Remove empty strings from the Census schemas (#109)

ONSdigital · Jul 3, 2020 · d6a9999 · d6a9999
1 parent 50d8b59
commit d6a9999
Show file tree

Hide file tree

Showing 21 changed files with 34 additions and 26 deletions.
diff --git a/source/jsonnet/england-wales/ccs/blocks/individual/age_last_birthday.jsonnet b/source/jsonnet/england-wales/ccs/blocks/individual/age_last_birthday.jsonnet
@@ -3,7 +3,6 @@ local rules = import 'rules.libsonnet';
 
 local question(title) = {
   id: 'age-last-birthday-question',
-  description: '',
   type: 'General',
   title: title,
   answers: [
@@ -21,7 +20,6 @@ local question(title) = {
     },
     {
       id: 'age-estimate-answer',
-      label: '',
       mandatory: false,
       type: 'Checkbox',
       options: [

diff --git a/source/jsonnet/england-wales/ccs/blocks/individual/date_of_birth.jsonnet b/source/jsonnet/england-wales/ccs/blocks/individual/date_of_birth.jsonnet
@@ -3,7 +3,6 @@ local rules = import 'rules.libsonnet';
 
 local question(title) = {
   id: 'date-of-birth-question',
-  description: '',
   type: 'MutuallyExclusive',
   title: title,
   mandatory: false,

diff --git a/source/jsonnet/england-wales/ccs/blocks/visitor/date_of_birth.jsonnet b/source/jsonnet/england-wales/ccs/blocks/visitor/date_of_birth.jsonnet
@@ -6,7 +6,6 @@ local rules = import 'rules.libsonnet';
   id: 'visitor-date-of-birth',
   question: {
     id: 'visitor-date-of-birth-question',
-    description: '',
     type: 'MutuallyExclusive',
     title: {
       text: 'What is <em>{person_name_possessive}</em> date of birth?',

diff --git a/source/jsonnet/england-wales/ccs/blocks/visitor/visitor_age_last_birthday.jsonnet b/source/jsonnet/england-wales/ccs/blocks/visitor/visitor_age_last_birthday.jsonnet
@@ -6,7 +6,6 @@ local rules = import 'rules.libsonnet';
   id: 'visitor-age-last-birthday',
   question: {
     id: 'visitor-age-last-birthday-question',
-    description: '',
     type: 'General',
     title: {
       text: 'What was <em>{person_name_possessive}</em> age on their last birthday?',
@@ -27,7 +26,6 @@ local rules = import 'rules.libsonnet';
       },
       {
         id: 'visitor-age-estimate-answer',
-        label: '',
         mandatory: false,
         type: 'Checkbox',
         options: [

diff --git a/source/jsonnet/england-wales/ccs_household.jsonnet b/source/jsonnet/england-wales/ccs_household.jsonnet
@@ -169,7 +169,7 @@ function(region_code, census_month_year_date) {
       groups: [
         {
           id: 'accommodation-group',
-          title: '',
+          title: 'Accommodation group',
           blocks: [
             accommodation_introduction,
             interviewer_note,
@@ -272,7 +272,7 @@ function(region_code, census_month_year_date) {
       groups: [
         {
           id: 'visitor-group',
-          title: '',
+          title: 'Visitor Group',
           blocks: [
             visitor_interstitial,
             visitor_dob,

diff --git a/source/jsonnet/england-wales/census_household.jsonnet b/source/jsonnet/england-wales/census_household.jsonnet
@@ -280,7 +280,7 @@ function(region_code, census_month_year_date) {
       groups: [
         {
           id: 'accommodation-group',
-          title: '',
+          title: 'Accommodation group',
           blocks: [
             accommodation_introduction,
             accommodation_type,
@@ -465,7 +465,7 @@ function(region_code, census_month_year_date) {
       groups: [
         {
           id: 'visitor-group',
-          title: '',
+          title: 'Visitor Group',
           blocks: [
             visitor_interstitial,
             visitor_dob,

diff --git a/source/jsonnet/england-wales/individual/blocks/identity-and-health/birth_gender.jsonnet b/source/jsonnet/england-wales/individual/blocks/identity-and-health/birth_gender.jsonnet
@@ -16,7 +16,6 @@ local question(title) = {
     {
       id: 'birth-gender-answer',
       mandatory: false,
-      label: '',
       voluntary: true,
       options: [
         {

diff --git a/source/jsonnet/england-wales/individual/blocks/identity-and-health/passports.jsonnet b/source/jsonnet/england-wales/individual/blocks/identity-and-health/passports.jsonnet
@@ -4,7 +4,6 @@ local rules = import 'rules.libsonnet';
 local question(title, description, otherDescription) = {
   id: 'passports-question',
   title: title,
-  description: '',
   type: 'MutuallyExclusive',
   mandatory: false,
   guidance: {

diff --git a/source/jsonnet/england-wales/individual/blocks/identity-and-health/religion.jsonnet b/source/jsonnet/england-wales/individual/blocks/identity-and-health/religion.jsonnet
@@ -29,7 +29,6 @@ local question(title, region_code, otherReligionDescription) = (
       {
         id: 'religion-answer',
         mandatory: false,
-        label: '',
         voluntary: true,
         options: [
           {

diff --git a/source/jsonnet/england-wales/individual/blocks/identity-and-health/sexual_identity.jsonnet b/source/jsonnet/england-wales/individual/blocks/identity-and-health/sexual_identity.jsonnet
@@ -16,7 +16,6 @@ local question(title, guidanceHeader, description) = {
     {
       id: 'sexual-identity-answer',
       mandatory: false,
-      label: '',
       voluntary: true,
       guidance: {
         show_guidance: guidanceHeader,

diff --git a/source/jsonnet/northern-ireland/census_household.jsonnet b/source/jsonnet/northern-ireland/census_household.jsonnet
@@ -269,7 +269,7 @@ function(region_code) {
       groups: [
         {
           id: 'accommodation-group',
-          title: '',
+          title: 'Accommodation group',
           blocks: [
             accommodation_introduction,
             accommodation_type,
@@ -449,7 +449,7 @@ function(region_code) {
       groups: [
         {
           id: 'visitor-group',
-          title: '',
+          title: 'Visitor group',
           blocks: [
             visitor_interstitial,
             visitor_dob,

diff --git a/source/jsonnet/northern-ireland/individual/blocks/identity-and-health/no_religion.jsonnet b/source/jsonnet/northern-ireland/individual/blocks/identity-and-health/no_religion.jsonnet
@@ -18,7 +18,6 @@ local question(title, otherDescription) = {
     {
       id: 'no-religion-answer',
       mandatory: false,
-      label: '',
       options: [
         {
           label: 'Roman Catholic',

diff --git a/source/jsonnet/northern-ireland/individual/blocks/identity-and-health/passports.jsonnet b/source/jsonnet/northern-ireland/individual/blocks/identity-and-health/passports.jsonnet
@@ -4,7 +4,6 @@ local rules = import 'rules.libsonnet';
 local question(title, definitionContent, otherDescription) = {
   id: 'passports-question',
   title: title,
-  description: '',
   type: 'MutuallyExclusive',
   mandatory: false,
   definitions: [

diff --git a/source/jsonnet/northern-ireland/individual/blocks/identity-and-health/religion.jsonnet b/source/jsonnet/northern-ireland/individual/blocks/identity-and-health/religion.jsonnet
@@ -19,7 +19,6 @@ local question(title, otherReligionDescription) = {
       id: 'religion-answer',
       mandatory: false,
       type: 'Checkbox',
-      label: '',
       options: [
         {
           label: 'Roman Catholic',

diff --git a/...ce/jsonnet/northern-ireland/individual/blocks/identity-and-health/sexual_identity.jsonnet b/...ce/jsonnet/northern-ireland/individual/blocks/identity-and-health/sexual_identity.jsonnet
@@ -11,7 +11,6 @@ local question(title) = {
       id: 'sexual-identity-answer',
       mandatory: false,
       type: 'Checkbox',
-      label: '',
       options: [
         {
           label: 'Straight or Heterosexual',

diff --git a/source/jsonnet/northern-ireland/individual/blocks/personal-details/age_last_birthday.jsonnet b/source/jsonnet/northern-ireland/individual/blocks/personal-details/age_last_birthday.jsonnet
@@ -6,7 +6,6 @@ local rules = import 'rules.libsonnet';
   id: 'age-last-birthday',
   question: {
     id: 'age-last-birthday-question',
-    description: '',
     type: 'General',
     title: {
       text: 'What was <em>{person_name_possessive}</em> age on their last birthday?',
@@ -29,7 +28,6 @@ local rules = import 'rules.libsonnet';
       },
       {
         id: 'age-estimate-answer',
-        label: '',
         mandatory: false,
         type: 'Checkbox',
         options: [

diff --git a/translations/ccs_household_gb_eng.pot b/translations/ccs_household_gb_eng.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-06-26 13:47+0100\n"
+"POT-Creation-Date: 2020-06-30 15:46+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -81,10 +81,18 @@ msgstr ""
 msgid "Who lives here"
 msgstr ""
 
+#. Group title
+msgid "Accommodation group"
+msgstr ""
+
 #. Group title
 msgid "Personal Details"
 msgstr ""
 
+#. Group title
+msgid "Visitor Group"
+msgstr ""
+
 #. Group title
 msgid "Household Check"
 msgstr ""

diff --git a/translations/census_communal_establishment_gb_wls.pot b/translations/census_communal_establishment_gb_wls.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-06-25 13:38+0100\n"
+"POT-Creation-Date: 2020-06-30 15:46+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

diff --git a/translations/census_household_gb_nir.pot b/translations/census_household_gb_nir.pot
@@ -93,6 +93,10 @@ msgstr ""
 msgid "Who lives here"
 msgstr ""
 
+#. Group title
+msgid "Accommodation group"
+msgstr ""
+
 #. Group title
 msgid "Personal Details"
 msgstr ""
@@ -114,6 +118,10 @@ msgstr ""
 msgid "School"
 msgstr ""
 
+#. Group title
+msgid "Visitor group"
+msgstr ""
+
 #. Block title
 #. Content page main heading
 msgid "Household relationships"

diff --git a/translations/census_household_gb_wls.pot b/translations/census_household_gb_wls.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-06-25 13:38+0100\n"
+"POT-Creation-Date: 2020-06-30 15:46+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -92,6 +92,10 @@ msgstr ""
 msgid "Who lives here"
 msgstr ""
 
+#. Group title
+msgid "Accommodation group"
+msgstr ""
+
 #. Group title
 msgid "Personal Details"
 msgstr ""
@@ -109,6 +113,10 @@ msgstr ""
 msgid "Employment"
 msgstr ""
 
+#. Group title
+msgid "Visitor Group"
+msgstr ""
+
 #. Block title
 #. Content page main heading
 msgid "Household relationships"

diff --git a/translations/census_individual_gb_wls.pot b/translations/census_individual_gb_wls.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-06-25 13:38+0100\n"
+"POT-Creation-Date: 2020-06-30 15:46+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"