From 52ab58f56189c93d9210d79526cb3b614af3ed7a Mon Sep 17 00:00:00 2001 From: Rhys Berrow <47635349+berroar@users.noreply.github.com> Date: Mon, 16 Mar 2020 11:31:00 +0000 Subject: [PATCH] Welsh ethnicity update (#24) --- .../england-wales/census_household.jsonnet | 4 +- .../england-wales/census_individual.jsonnet | 4 +- .../identity-and-health/ethnic_group.jsonnet | 196 +++++++++++------- .../ethnic_group_asian.jsonnet | 120 ++++++----- .../ethnic_group_black.jsonnet | 118 ++++++----- translations/ccs_household_gb_eng.pot | 2 +- translations/census_household_gb_nir.pot | 2 +- translations/census_household_gb_wls.pot | 95 +++++---- translations/census_individual_gb_nir.pot | 2 +- translations/census_individual_gb_wls.pot | 95 +++++---- 10 files changed, 353 insertions(+), 285 deletions(-) diff --git a/source/jsonnet/england-wales/census_household.jsonnet b/source/jsonnet/england-wales/census_household.jsonnet index 21ed9732..78b2e864 100644 --- a/source/jsonnet/england-wales/census_household.jsonnet +++ b/source/jsonnet/england-wales/census_household.jsonnet @@ -275,8 +275,8 @@ function(region_code, census_month_year_date) { ethnic_group(region_code), ethnic_group_white(region_code), ethnic_group_mixed, - ethnic_group_asian, - ethnic_group_black, + ethnic_group_asian(region_code), + ethnic_group_black(region_code), ethnic_group_other, religion(region_code), ] + understandWelshBlock(region_code) + [ diff --git a/source/jsonnet/england-wales/census_individual.jsonnet b/source/jsonnet/england-wales/census_individual.jsonnet index 09737e97..a9861401 100644 --- a/source/jsonnet/england-wales/census_individual.jsonnet +++ b/source/jsonnet/england-wales/census_individual.jsonnet @@ -149,8 +149,8 @@ function(region_code, census_month_year_date) { ethnic_group(region_code), ethnic_group_white(region_code), ethnic_group_mixed, - ethnic_group_asian, - ethnic_group_black, + ethnic_group_asian(region_code), + ethnic_group_black(region_code), ethnic_group_other, religion(region_code), ] + understandWelshBlock(region_code) + [ diff --git a/source/jsonnet/england-wales/individual/blocks/identity-and-health/ethnic_group.jsonnet b/source/jsonnet/england-wales/individual/blocks/identity-and-health/ethnic_group.jsonnet index d9584d8a..abfbdae2 100644 --- a/source/jsonnet/england-wales/individual/blocks/identity-and-health/ethnic_group.jsonnet +++ b/source/jsonnet/england-wales/individual/blocks/identity-and-health/ethnic_group.jsonnet @@ -12,8 +12,60 @@ local proxyTitle = { 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'; +local englandAsianEthnicityLabel = 'Asian or Asian British'; +local walesAsianEthnicityLabel = 'Asian, Asian Welsh or Asian British'; + +local englandBlackEthnicityLabel = 'Black, Black British, Caribbean or African'; +local walesBlackEthnicityLabel = 'Black, Black Welsh, Black British, Caribbean or African'; + +local englandAsianEthnicityRoutingRule = { + block: 'asian-ethnic-group', + when: [ + { + id: 'ethnic-group-answer', + condition: 'equals any', + values: [englandAsianEthnicityLabel], + }, + ], +}; + +local walesAsianEthnicityRoutingRule = { + block: 'asian-ethnic-group', + when: [ + { + id: 'ethnic-group-answer', + condition: 'equals any', + values: [walesAsianEthnicityLabel], + }, + ], +}; + +local englandBlackEthnicityRoutingRule = { + block: 'black-ethnic-group', + when: [ + { + id: 'ethnic-group-answer', + condition: 'equals any', + values: [englandBlackEthnicityLabel], + }, + ], +}; + +local walesBlackEthnicityRoutingRule = { + block: 'black-ethnic-group', + when: [ + { + id: 'ethnic-group-answer', + condition: 'equals any', + values: [walesBlackEthnicityLabel], + }, + ], +}; + local question(title, 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; { id: 'ethnic-group-question', title: title, @@ -47,13 +99,13 @@ local question(title, region_code) = ( description: 'Includes White and Black Caribbean, White and Black African, White and Asian or any other Mixed or Multiple background', }, { - label: 'Asian or Asian British', - value: 'Asian or Asian British', + label: asianEthnicityLabel, + value: asianEthnicityLabel, description: 'Includes Indian, Pakistani, Bangladeshi, Chinese or any other Asian background', }, { - label: 'Black, Black British, Caribbean or African', - value: 'Black, Black British, Caribbean or African', + label: blackEthnicityLabel, + value: blackEthnicityLabel, description: 'Includes Black British, Caribbean, African or any other Black background', }, { @@ -68,84 +120,70 @@ local question(title, region_code) = ( } ); -function(region_code) { - type: 'Question', - id: 'ethnic-group', - question_variants: [ - { - question: question(nonProxyTitle, region_code), - when: [rules.isNotProxy], - }, - { - question: question(proxyTitle, region_code), - when: [rules.isProxy], - }, - ], - routing_rules: [ - { - goto: { - block: 'white-ethnic-group', - when: [ - { - id: 'ethnic-group-answer', - condition: 'equals', - value: 'White', - }, - ], +function(region_code) ( + local asianEthnicityRoutingRule = if region_code == 'GB-WLS' then walesAsianEthnicityRoutingRule else englandAsianEthnicityRoutingRule; + local blackEthnicityRoutingRule = if region_code == 'GB-WLS' then walesBlackEthnicityRoutingRule else englandBlackEthnicityRoutingRule; + { + type: 'Question', + id: 'ethnic-group', + question_variants: [ + { + question: question(nonProxyTitle, region_code), + when: [rules.isNotProxy], }, - }, - { - goto: { - block: 'mixed-ethnic-group', - when: [ - { - id: 'ethnic-group-answer', - condition: 'equals', - value: 'Mixed or Multiple ethnic groups', - }, - ], + { + question: question(proxyTitle, region_code), + when: [rules.isProxy], }, - }, - { - goto: { - block: 'asian-ethnic-group', - when: [ - { - id: 'ethnic-group-answer', - condition: 'equals', - value: 'Asian or Asian British', - }, - ], + ], + routing_rules: [ + { + goto: { + block: 'white-ethnic-group', + when: [ + { + id: 'ethnic-group-answer', + condition: 'equals', + value: 'White', + }, + ], + }, }, - }, - { - goto: { - block: 'black-ethnic-group', - when: [ - { - id: 'ethnic-group-answer', - condition: 'equals', - value: 'Black, Black British, Caribbean or African', - }, - ], + { + goto: { + block: 'mixed-ethnic-group', + when: [ + { + id: 'ethnic-group-answer', + condition: 'equals', + value: 'Mixed or Multiple ethnic groups', + }, + ], + }, }, - }, - { - goto: { - block: 'other-ethnic-group', - when: [ - { - id: 'ethnic-group-answer', - condition: 'equals', - value: 'Other ethnic group', - }, - ], + { + goto: asianEthnicityRoutingRule, }, - }, - { - goto: { - block: 'religion', + { + goto: blackEthnicityRoutingRule, }, - }, - ], -} + { + goto: { + block: 'other-ethnic-group', + when: [ + { + id: 'ethnic-group-answer', + condition: 'equals', + value: 'Other ethnic group', + }, + ], + }, + }, + { + goto: { + block: 'religion', + }, + }, + ], + } +) diff --git a/source/jsonnet/england-wales/individual/blocks/identity-and-health/ethnic_group_asian.jsonnet b/source/jsonnet/england-wales/individual/blocks/identity-and-health/ethnic_group_asian.jsonnet index 9bfcf8d2..51b5c496 100644 --- a/source/jsonnet/england-wales/individual/blocks/identity-and-health/ethnic_group_asian.jsonnet +++ b/source/jsonnet/england-wales/individual/blocks/identity-and-health/ethnic_group_asian.jsonnet @@ -1,79 +1,89 @@ local placeholders = import '../../../lib/placeholders.libsonnet'; local rules = import 'rules.libsonnet'; -local question(title) = { - id: 'asian-ethnic-group-question', - title: title, - type: 'General', - answers: [ - { - guidance: { - show_guidance: 'Why your answer is important', - hide_guidance: 'Why your answer is important', - contents: [ +local question(englandTitle, walesTitle, region_code) = ( + local title = if region_code == 'GB-WLS' then walesTitle else englandTitle; + { + id: 'asian-ethnic-group-question', + title: title, + type: 'General', + answers: [ + { + guidance: { + show_guidance: 'Why your answer is important', + 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', + list: [ + 'provide services and share funding fairly', + 'understand and represent everyone’s interests', + ], + }, + ], + }, + id: 'asian-ethnic-group-answer', + mandatory: false, + options: [ + { + label: 'Indian', + value: 'Indian', + }, + { + label: 'Pakistani', + value: 'Pakistani', + }, { - 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', - list: [ - 'provide services and share funding fairly', - 'understand and represent everyone’s interests', - ], + label: 'Bangladeshi', + value: 'Bangladeshi', + }, + { + label: 'Chinese', + value: 'Chinese', + }, + { + label: 'Any other Asian background', + value: 'Any other Asian background', + description: 'Select to enter answer', + detail_answer: { + id: 'asian-ethnic-group-answer-other', + type: 'TextField', + mandatory: false, + label: 'Enter Asian background', + }, }, ], + type: 'Radio', }, - id: 'asian-ethnic-group-answer', - mandatory: false, - options: [ - { - label: 'Indian', - value: 'Indian', - }, - { - label: 'Pakistani', - value: 'Pakistani', - }, - { - label: 'Bangladeshi', - value: 'Bangladeshi', - }, - { - label: 'Chinese', - value: 'Chinese', - }, - { - label: 'Any other Asian background', - value: 'Any other Asian background', - description: 'Select to enter answer', - detail_answer: { - id: 'asian-ethnic-group-answer-other', - type: 'TextField', - mandatory: false, - label: 'Enter Asian background', - }, - }, - ], - type: 'Radio', - }, - ], -}; + ], + } +); -local nonProxyTitle = 'Which one best describes your Asian or Asian British ethnic group or background?'; -local proxyTitle = { +local nonProxyEnglandTitle = 'Which one best describes your Asian or Asian British ethnic group or background?'; +local proxyEnglandTitle = { text: 'Which one best describes {person_name_possessive} Asian or Asian British ethnic group or background?', placeholders: [ placeholders.personNamePossessive, ], }; +local nonProxyWalesTitle = 'Which one best describes your Asian, Asian Welsh or Asian British ethnic group or background?'; +local proxyWalesTitle = { + text: 'Which one best describes {person_name_possessive} Asian, Asian Welsh or Asian British ethnic group or background?', + placeholders: [ + placeholders.personNamePossessive, + ], +}; -{ +function(region_code) { type: 'Question', id: 'asian-ethnic-group', question_variants: [ { - question: question(nonProxyTitle), + question: question(nonProxyEnglandTitle, nonProxyWalesTitle, region_code), when: [rules.isNotProxy], }, { - question: question(proxyTitle), + question: question(proxyEnglandTitle, proxyWalesTitle, region_code), when: [rules.isProxy], }, ], diff --git a/source/jsonnet/england-wales/individual/blocks/identity-and-health/ethnic_group_black.jsonnet b/source/jsonnet/england-wales/individual/blocks/identity-and-health/ethnic_group_black.jsonnet index 3c218776..9a0f5450 100644 --- a/source/jsonnet/england-wales/individual/blocks/identity-and-health/ethnic_group_black.jsonnet +++ b/source/jsonnet/england-wales/individual/blocks/identity-and-health/ethnic_group_black.jsonnet @@ -1,78 +1,88 @@ local placeholders = import '../../../lib/placeholders.libsonnet'; local rules = import 'rules.libsonnet'; -local question(title) = { - id: 'black-ethnic-group-question', - title: title, - type: 'General', - answers: [ - { - guidance: { - show_guidance: 'Why your answer is important', - hide_guidance: 'Why your answer is important', - contents: [ +local question(englandTitle, walesTitle, region_code) = ( + local title = if region_code == 'GB-WLS' then walesTitle else englandTitle; + { + id: 'black-ethnic-group-question', + title: title, + type: 'General', + answers: [ + { + guidance: { + show_guidance: 'Why your answer is important', + 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', + list: [ + 'provide services and share funding fairly', + 'understand and represent everyone’s interests', + ], + }, + ], + }, + id: 'black-ethnic-group-answer', + mandatory: false, + options: [ { - 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', - list: [ - 'provide services and share funding fairly', - 'understand and represent everyone’s interests', - ], + label: 'Caribbean', + value: 'Caribbean', }, - ], - }, - id: 'black-ethnic-group-answer', - mandatory: false, - options: [ - { - label: 'Caribbean', - value: 'Caribbean', - }, - { - label: 'African', - value: 'African', - description: 'Select to enter answer', - detail_answer: { - id: 'african-ethnic-group-answer-other', - type: 'TextField', - mandatory: false, - label: 'Enter African background', + { + label: 'African', + value: 'African', + description: 'Select to enter answer', + detail_answer: { + id: 'african-ethnic-group-answer-other', + type: 'TextField', + mandatory: false, + label: 'Enter African background', + }, }, - }, - { - label: 'Any other Black, Black British or Caribbean background', - value: 'Any other Black, Black British or Caribbean background', - description: 'Select to enter answer', - detail_answer: { - id: 'black-ethnic-group-answer-other', - type: 'TextField', - mandatory: false, - label: 'Enter Black, Black British or Caribbean background', + { + label: 'Any other Black, Black British or Caribbean background', + value: 'Any other Black, Black British or Caribbean background', + description: 'Select to enter answer', + detail_answer: { + id: 'black-ethnic-group-answer-other', + type: 'TextField', + mandatory: false, + label: 'Enter Black, Black British or Caribbean background', + }, }, - }, - ], - type: 'Radio', - }, - ], -}; + ], + type: 'Radio', + }, + ], + } +); -local nonProxyTitle = 'Which one best describes your Black, Black British, Caribbean or African ethnic group or background?'; -local proxyTitle = { +local nonProxyEnglandTitle = 'Which one best describes your Black, Black British, Caribbean or African ethnic group or background?'; +local proxyEnglandTitle = { text: 'Which one best describes {person_name_possessive} Black, Black British, Caribbean or African ethnic group or background?', placeholders: [ placeholders.personNamePossessive, ], }; +local nonProxyWalesTitle = 'Which one best describes your Black, Black Welsh, Black British, Caribbean or African ethnic group or background?'; +local proxyWalesTitle = { + text: 'Which one best describes {person_name_possessive} Black, Black Welsh, Black British, Caribbean or African ethnic group or background?', + placeholders: [ + placeholders.personNamePossessive, + ], +}; -{ +function(region_code) { type: 'Question', id: 'black-ethnic-group', question_variants: [ { - question: question(nonProxyTitle), + question: question(nonProxyEnglandTitle, nonProxyWalesTitle, region_code), when: [rules.isNotProxy], }, { - question: question(proxyTitle), + question: question(proxyEnglandTitle, proxyWalesTitle, region_code), when: [rules.isProxy], }, ], diff --git a/translations/ccs_household_gb_eng.pot b/translations/ccs_household_gb_eng.pot index a738864e..edec3d4f 100644 --- 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-03-05 09:57+0000\n" +"POT-Creation-Date: 2020-03-12 13:26+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/translations/census_household_gb_nir.pot b/translations/census_household_gb_nir.pot index 10a8a553..5cdf1962 100644 --- a/translations/census_household_gb_nir.pot +++ b/translations/census_household_gb_nir.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2020-03-05 09:57+0000\n" +"POT-Creation-Date: 2020-03-12 13:26+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/translations/census_household_gb_wls.pot b/translations/census_household_gb_wls.pot index f3723804..e2575411 100644 --- 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-03-05 09:57+0000\n" +"POT-Creation-Date: 2020-03-12 13:26+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -645,13 +645,13 @@ msgid "" msgstr "" msgid "" -"Which one best describes your Asian or Asian British ethnic group or " -"background?" +"Which one best describes your Asian, Asian Welsh or Asian British ethnic " +"group or background?" msgstr "" msgid "" -"Which one best describes your Black, Black British, Caribbean or African " -"ethnic group or background?" +"Which one best describes your Black, Black Welsh, Black British, " +"Caribbean or African ethnic group or background?" msgstr "" msgid "Which one best describes your other ethnic group or background?" @@ -1124,13 +1124,13 @@ msgid "" msgstr "" msgid "" -"Which one best describes {person_name_possessive} Asian or Asian" -" British ethnic group or background?" +"Which one best describes {person_name_possessive} Asian, Asian " +"Welsh or Asian British ethnic group or background?" msgstr "" msgid "" "Which one best describes {person_name_possessive} Black, Black " -"British, Caribbean or African ethnic group or background?" +"Welsh, Black British, Caribbean or African ethnic group or background?" msgstr "" msgid "" @@ -2910,12 +2910,12 @@ msgstr "" #. answer-id: ethnic-group-answer msgctxt "Answer for: What is your ethnic group?" -msgid "Asian or Asian British" +msgid "Asian, Asian Welsh or Asian British" msgstr "" #. answer-id: ethnic-group-answer msgctxt "Answer for: What is your ethnic group?" -msgid "Black, Black British, Caribbean or African" +msgid "Black, Black Welsh, Black British, Caribbean or African" msgstr "" #. answer-id: ethnic-group-answer @@ -2935,12 +2935,12 @@ msgstr "" #. answer-id: ethnic-group-answer msgctxt "Answer for: What is {person_name_possessive} ethnic group?" -msgid "Asian or Asian British" +msgid "Asian, Asian Welsh or Asian British" msgstr "" #. answer-id: ethnic-group-answer msgctxt "Answer for: What is {person_name_possessive} ethnic group?" -msgid "Black, Black British, Caribbean or African" +msgid "Black, Black Welsh, Black British, Caribbean or African" msgstr "" #. answer-id: ethnic-group-answer @@ -3104,155 +3104,160 @@ msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" -"Answer for: Which one best describes your Asian or Asian British ethnic " -"group or background?" +"Answer for: Which one best describes your Asian, Asian Welsh or Asian " +"British ethnic group or background?" msgid "Indian" msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" -"Answer for: Which one best describes your Asian or Asian British ethnic " -"group or background?" +"Answer for: Which one best describes your Asian, Asian Welsh or Asian " +"British ethnic group or background?" msgid "Pakistani" msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" -"Answer for: Which one best describes your Asian or Asian British ethnic " -"group or background?" +"Answer for: Which one best describes your Asian, Asian Welsh or Asian " +"British ethnic group or background?" msgid "Bangladeshi" msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" -"Answer for: Which one best describes your Asian or Asian British ethnic " -"group or background?" +"Answer for: Which one best describes your Asian, Asian Welsh or Asian " +"British ethnic group or background?" msgid "Chinese" msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" -"Answer for: Which one best describes your Asian or Asian British ethnic " -"group or background?" +"Answer for: Which one best describes your Asian, Asian Welsh or Asian " +"British ethnic group or background?" msgid "Any other Asian background" msgstr "" #. answer-id: asian-ethnic-group-answer-other msgctxt "" -"Answer for: Which one best describes your Asian or Asian British ethnic " -"group or background?" +"Answer for: Which one best describes your Asian, Asian Welsh or Asian " +"British ethnic group or background?" msgid "Enter Asian background" msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Asian or Asian British ethnic group or background?" +"Asian, Asian Welsh or Asian British ethnic group or background?" msgid "Indian" msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Asian or Asian British ethnic group or background?" +"Asian, Asian Welsh or Asian British ethnic group or background?" msgid "Pakistani" msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Asian or Asian British ethnic group or background?" +"Asian, Asian Welsh or Asian British ethnic group or background?" msgid "Bangladeshi" msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Asian or Asian British ethnic group or background?" +"Asian, Asian Welsh or Asian British ethnic group or background?" msgid "Chinese" msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Asian or Asian British ethnic group or background?" +"Asian, Asian Welsh or Asian British ethnic group or background?" msgid "Any other Asian background" msgstr "" #. answer-id: asian-ethnic-group-answer-other msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Asian or Asian British ethnic group or background?" +"Asian, Asian Welsh or Asian British ethnic group or background?" msgid "Enter Asian background" msgstr "" #. answer-id: black-ethnic-group-answer msgctxt "" -"Answer for: Which one best describes your Black, Black British, Caribbean" -" or African ethnic group or background?" +"Answer for: Which one best describes your Black, Black Welsh, Black " +"British, Caribbean or African ethnic group or background?" msgid "Caribbean" msgstr "" #. answer-id: black-ethnic-group-answer msgctxt "" -"Answer for: Which one best describes your Black, Black British, Caribbean" -" or African ethnic group or background?" +"Answer for: Which one best describes your Black, Black Welsh, Black " +"British, Caribbean or African ethnic group or background?" msgid "African" msgstr "" #. answer-id: african-ethnic-group-answer-other msgctxt "" -"Answer for: Which one best describes your Black, Black British, Caribbean" -" or African ethnic group or background?" +"Answer for: Which one best describes your Black, Black Welsh, Black " +"British, Caribbean or African ethnic group or background?" msgid "Enter African background" msgstr "" #. answer-id: black-ethnic-group-answer msgctxt "" -"Answer for: Which one best describes your Black, Black British, Caribbean" -" or African ethnic group or background?" +"Answer for: Which one best describes your Black, Black Welsh, Black " +"British, Caribbean or African ethnic group or background?" msgid "Any other Black, Black British or Caribbean background" msgstr "" #. answer-id: black-ethnic-group-answer-other msgctxt "" -"Answer for: Which one best describes your Black, Black British, Caribbean" -" or African ethnic group or background?" +"Answer for: Which one best describes your Black, Black Welsh, Black " +"British, Caribbean or African ethnic group or background?" msgid "Enter Black, Black British or Caribbean background" msgstr "" #. answer-id: black-ethnic-group-answer msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Black, Black British, Caribbean or African ethnic group or background?" +"Black, Black Welsh, Black British, Caribbean or African ethnic group or " +"background?" msgid "Caribbean" msgstr "" #. answer-id: black-ethnic-group-answer msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Black, Black British, Caribbean or African ethnic group or background?" +"Black, Black Welsh, Black British, Caribbean or African ethnic group or " +"background?" msgid "African" msgstr "" #. answer-id: african-ethnic-group-answer-other msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Black, Black British, Caribbean or African ethnic group or background?" +"Black, Black Welsh, Black British, Caribbean or African ethnic group or " +"background?" msgid "Enter African background" msgstr "" #. answer-id: black-ethnic-group-answer msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Black, Black British, Caribbean or African ethnic group or background?" +"Black, Black Welsh, Black British, Caribbean or African ethnic group or " +"background?" msgid "Any other Black, Black British or Caribbean background" msgstr "" #. answer-id: black-ethnic-group-answer-other msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Black, Black British, Caribbean or African ethnic group or background?" +"Black, Black Welsh, Black British, Caribbean or African ethnic group or " +"background?" msgid "Enter Black, Black British or Caribbean background" msgstr "" diff --git a/translations/census_individual_gb_nir.pot b/translations/census_individual_gb_nir.pot index aab4f354..20cd6ade 100644 --- a/translations/census_individual_gb_nir.pot +++ b/translations/census_individual_gb_nir.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2020-03-05 09:57+0000\n" +"POT-Creation-Date: 2020-03-12 13:26+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/translations/census_individual_gb_wls.pot b/translations/census_individual_gb_wls.pot index b13f02f2..115f64e2 100644 --- 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-03-05 09:57+0000\n" +"POT-Creation-Date: 2020-03-12 13:26+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -488,13 +488,13 @@ msgid "" msgstr "" msgid "" -"Which one best describes your Asian or Asian British ethnic group or " -"background?" +"Which one best describes your Asian, Asian Welsh or Asian British ethnic " +"group or background?" msgstr "" msgid "" -"Which one best describes your Black, Black British, Caribbean or African " -"ethnic group or background?" +"Which one best describes your Black, Black Welsh, Black British, " +"Caribbean or African ethnic group or background?" msgstr "" msgid "Which one best describes your other ethnic group or background?" @@ -809,13 +809,13 @@ msgid "" msgstr "" msgid "" -"Which one best describes {person_name_possessive} Asian or Asian" -" British ethnic group or background?" +"Which one best describes {person_name_possessive} Asian, Asian " +"Welsh or Asian British ethnic group or background?" msgstr "" msgid "" "Which one best describes {person_name_possessive} Black, Black " -"British, Caribbean or African ethnic group or background?" +"Welsh, Black British, Caribbean or African ethnic group or background?" msgstr "" msgid "" @@ -2084,12 +2084,12 @@ msgstr "" #. answer-id: ethnic-group-answer msgctxt "Answer for: What is your ethnic group?" -msgid "Asian or Asian British" +msgid "Asian, Asian Welsh or Asian British" msgstr "" #. answer-id: ethnic-group-answer msgctxt "Answer for: What is your ethnic group?" -msgid "Black, Black British, Caribbean or African" +msgid "Black, Black Welsh, Black British, Caribbean or African" msgstr "" #. answer-id: ethnic-group-answer @@ -2109,12 +2109,12 @@ msgstr "" #. answer-id: ethnic-group-answer msgctxt "Answer for: What is {person_name_possessive} ethnic group?" -msgid "Asian or Asian British" +msgid "Asian, Asian Welsh or Asian British" msgstr "" #. answer-id: ethnic-group-answer msgctxt "Answer for: What is {person_name_possessive} ethnic group?" -msgid "Black, Black British, Caribbean or African" +msgid "Black, Black Welsh, Black British, Caribbean or African" msgstr "" #. answer-id: ethnic-group-answer @@ -2278,155 +2278,160 @@ msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" -"Answer for: Which one best describes your Asian or Asian British ethnic " -"group or background?" +"Answer for: Which one best describes your Asian, Asian Welsh or Asian " +"British ethnic group or background?" msgid "Indian" msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" -"Answer for: Which one best describes your Asian or Asian British ethnic " -"group or background?" +"Answer for: Which one best describes your Asian, Asian Welsh or Asian " +"British ethnic group or background?" msgid "Pakistani" msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" -"Answer for: Which one best describes your Asian or Asian British ethnic " -"group or background?" +"Answer for: Which one best describes your Asian, Asian Welsh or Asian " +"British ethnic group or background?" msgid "Bangladeshi" msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" -"Answer for: Which one best describes your Asian or Asian British ethnic " -"group or background?" +"Answer for: Which one best describes your Asian, Asian Welsh or Asian " +"British ethnic group or background?" msgid "Chinese" msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" -"Answer for: Which one best describes your Asian or Asian British ethnic " -"group or background?" +"Answer for: Which one best describes your Asian, Asian Welsh or Asian " +"British ethnic group or background?" msgid "Any other Asian background" msgstr "" #. answer-id: asian-ethnic-group-answer-other msgctxt "" -"Answer for: Which one best describes your Asian or Asian British ethnic " -"group or background?" +"Answer for: Which one best describes your Asian, Asian Welsh or Asian " +"British ethnic group or background?" msgid "Enter Asian background" msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Asian or Asian British ethnic group or background?" +"Asian, Asian Welsh or Asian British ethnic group or background?" msgid "Indian" msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Asian or Asian British ethnic group or background?" +"Asian, Asian Welsh or Asian British ethnic group or background?" msgid "Pakistani" msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Asian or Asian British ethnic group or background?" +"Asian, Asian Welsh or Asian British ethnic group or background?" msgid "Bangladeshi" msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Asian or Asian British ethnic group or background?" +"Asian, Asian Welsh or Asian British ethnic group or background?" msgid "Chinese" msgstr "" #. answer-id: asian-ethnic-group-answer msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Asian or Asian British ethnic group or background?" +"Asian, Asian Welsh or Asian British ethnic group or background?" msgid "Any other Asian background" msgstr "" #. answer-id: asian-ethnic-group-answer-other msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Asian or Asian British ethnic group or background?" +"Asian, Asian Welsh or Asian British ethnic group or background?" msgid "Enter Asian background" msgstr "" #. answer-id: black-ethnic-group-answer msgctxt "" -"Answer for: Which one best describes your Black, Black British, Caribbean" -" or African ethnic group or background?" +"Answer for: Which one best describes your Black, Black Welsh, Black " +"British, Caribbean or African ethnic group or background?" msgid "Caribbean" msgstr "" #. answer-id: black-ethnic-group-answer msgctxt "" -"Answer for: Which one best describes your Black, Black British, Caribbean" -" or African ethnic group or background?" +"Answer for: Which one best describes your Black, Black Welsh, Black " +"British, Caribbean or African ethnic group or background?" msgid "African" msgstr "" #. answer-id: african-ethnic-group-answer-other msgctxt "" -"Answer for: Which one best describes your Black, Black British, Caribbean" -" or African ethnic group or background?" +"Answer for: Which one best describes your Black, Black Welsh, Black " +"British, Caribbean or African ethnic group or background?" msgid "Enter African background" msgstr "" #. answer-id: black-ethnic-group-answer msgctxt "" -"Answer for: Which one best describes your Black, Black British, Caribbean" -" or African ethnic group or background?" +"Answer for: Which one best describes your Black, Black Welsh, Black " +"British, Caribbean or African ethnic group or background?" msgid "Any other Black, Black British or Caribbean background" msgstr "" #. answer-id: black-ethnic-group-answer-other msgctxt "" -"Answer for: Which one best describes your Black, Black British, Caribbean" -" or African ethnic group or background?" +"Answer for: Which one best describes your Black, Black Welsh, Black " +"British, Caribbean or African ethnic group or background?" msgid "Enter Black, Black British or Caribbean background" msgstr "" #. answer-id: black-ethnic-group-answer msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Black, Black British, Caribbean or African ethnic group or background?" +"Black, Black Welsh, Black British, Caribbean or African ethnic group or " +"background?" msgid "Caribbean" msgstr "" #. answer-id: black-ethnic-group-answer msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Black, Black British, Caribbean or African ethnic group or background?" +"Black, Black Welsh, Black British, Caribbean or African ethnic group or " +"background?" msgid "African" msgstr "" #. answer-id: african-ethnic-group-answer-other msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Black, Black British, Caribbean or African ethnic group or background?" +"Black, Black Welsh, Black British, Caribbean or African ethnic group or " +"background?" msgid "Enter African background" msgstr "" #. answer-id: black-ethnic-group-answer msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Black, Black British, Caribbean or African ethnic group or background?" +"Black, Black Welsh, Black British, Caribbean or African ethnic group or " +"background?" msgid "Any other Black, Black British or Caribbean background" msgstr "" #. answer-id: black-ethnic-group-answer-other msgctxt "" "Answer for: Which one best describes {person_name_possessive} " -"Black, Black British, Caribbean or African ethnic group or background?" +"Black, Black Welsh, Black British, Caribbean or African ethnic group or " +"background?" msgid "Enter Black, Black British or Caribbean background" msgstr ""