Merge pull request #3673 from alphagov/hannahwhittaker-patch-5

South Africa - updating links to consular appointments site

Author: thomasleese

lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-africa/_opposite_sex.erb

@@ -2,26 +2,25 @@
 
 Contact the local authorities in South Africa to find out about local marriage laws, including what documents you’ll need.
 
-^ You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for South Africa](foreign-travel-advice/south-africa) before making any plans.
- 
+^ You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for South Africa](/foreign-travel-advice/south-africa) before making any plans.
+
 ##Prove you’re free to get married
 
-The UK doesn’t issue certificates of no impediment (CNI) for marriages in Commonwealth countries. 
+The UK doesn’t issue certificates of no impediment (CNI) for marriages in Commonwealth countries.
 
 You can get a letter to explain this if you’re asked to provide a CNI or a similar document to prove you’re allowed to marry.
 
-Book an appointment to collect the letter at the [British Consulate General in Cape Town](/world/organisations/british-consulate-general-cape-town) or the [British High Commission in Pretoria](/world/organisations/british-high-commission-pretoria). The letter is free. If you can’t go to an appointment, you can ask a friend or family member to make an appointment and collect it for you.
+Book an appointment to collect the letter at the [British Consulate General in Cape Town](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-cape-town/providing-an-informative-note/slot_picker) or the [British High Commission in Pretoria](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-pretoria/providing-an-informative-note/slot_picker). The letter is free. If you can’t go to an appointment, you can ask a friend or family member to make an appointment and collect it for you.
 
 ##After you get married
 
 Your marriage will be recognised in the UK if:
 
-- you follow the correct process according to the law in South Africa 
+- you follow the correct process according to the law in South Africa
 - it would be [allowed under UK law](/marriages-civil-partnerships)
 
 You don’t need to register your marriage in the UK.
 
 If your partner isn’t a British citizen, they can apply for [British citizenship](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
 
 *[CNI]: certificates of no impediment
-

lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-africa/_same_sex.erb

@@ -2,26 +2,25 @@
 
 Contact the local authorities in South Africa to find out about local marriage laws, including what documents you’ll need.
 
-^ You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for South Africa](foreign-travel-advice/south-africa) before making any plans.
- 
+^ You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for South Africa](/foreign-travel-advice/south-africa) before making any plans.
+
 ##Prove you’re free to get married
 
-The UK doesn’t issue certificates of no impediment (CNI) for marriages in Commonwealth countries. 
+The UK doesn’t issue certificates of no impediment (CNI) for marriages in Commonwealth countries.
 
 You can get a letter to explain this if you’re asked to provide a CNI or a similar document to prove you’re allowed to marry.
 
-Book an appointment to collect the letter at the [British Consulate General in Cape Town](/world/organisations/british-consulate-general-cape-town) or the [British High Commission in Pretoria](/world/organisations/british-high-commission-pretoria). The letter is free. If you can’t go to an appointment, you can ask a friend or family member to make an appointment and collect it for you.
+Book an appointment to collect the letter at the [British Consulate General in Cape Town](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-cape-town/providing-an-informative-note/slot_picker) or the [British High Commission in Pretoria](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-pretoria/providing-an-informative-note/slot_picker). The letter is free. If you can’t go to an appointment, you can ask a friend or family member to make an appointment and collect it for you.
 
 ##After you get married
 
 Your marriage will be recognised in the UK if:
 
-- you follow the correct process according to the law in South Africa 
+- you follow the correct process according to the law in South Africa
 - it would be [allowed under UK law](/marriages-civil-partnerships)
 
 You don’t need to register your marriage in the UK.
 
 If your partner isn’t a British citizen, they can apply for [British citizenship](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.
 
 *[CNI]: certificates of no impediment
-

test/artefacts/marriage-abroad/south-africa/opposite_sex.txt

@@ -4,21 +4,21 @@ Marriage in South Africa
 
 Contact the local authorities in South Africa to find out about local marriage laws, including what documents you’ll need.
 
-^ You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for South Africa](foreign-travel-advice/south-africa) before making any plans.
+^ You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for South Africa](/foreign-travel-advice/south-africa) before making any plans.
 
 ##Prove you’re free to get married
 
-The UK doesn’t issue certificates of no impediment (CNI) for marriages in Commonwealth countries. 
+The UK doesn’t issue certificates of no impediment (CNI) for marriages in Commonwealth countries.
 
 You can get a letter to explain this if you’re asked to provide a CNI or a similar document to prove you’re allowed to marry.
 
-Book an appointment to collect the letter at the [British Consulate General in Cape Town](/world/organisations/british-consulate-general-cape-town) or the [British High Commission in Pretoria](/world/organisations/british-high-commission-pretoria). The letter is free. If you can’t go to an appointment, you can ask a friend or family member to make an appointment and collect it for you.
+Book an appointment to collect the letter at the [British Consulate General in Cape Town](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-cape-town/providing-an-informative-note/slot_picker) or the [British High Commission in Pretoria](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-pretoria/providing-an-informative-note/slot_picker). The letter is free. If you can’t go to an appointment, you can ask a friend or family member to make an appointment and collect it for you.
 
 ##After you get married
 
 Your marriage will be recognised in the UK if:
 
-- you follow the correct process according to the law in South Africa 
+- you follow the correct process according to the law in South Africa
 - it would be [allowed under UK law](/marriages-civil-partnerships)
 
 You don’t need to register your marriage in the UK.

test/artefacts/marriage-abroad/south-africa/same_sex.txt

@@ -4,21 +4,21 @@ Marriage in South Africa
 
 Contact the local authorities in South Africa to find out about local marriage laws, including what documents you’ll need.
 
-^ You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for South Africa](foreign-travel-advice/south-africa) before making any plans.
+^ You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for South Africa](/foreign-travel-advice/south-africa) before making any plans.
 
 ##Prove you’re free to get married
 
-The UK doesn’t issue certificates of no impediment (CNI) for marriages in Commonwealth countries. 
+The UK doesn’t issue certificates of no impediment (CNI) for marriages in Commonwealth countries.
 
 You can get a letter to explain this if you’re asked to provide a CNI or a similar document to prove you’re allowed to marry.
 
-Book an appointment to collect the letter at the [British Consulate General in Cape Town](/world/organisations/british-consulate-general-cape-town) or the [British High Commission in Pretoria](/world/organisations/british-high-commission-pretoria). The letter is free. If you can’t go to an appointment, you can ask a friend or family member to make an appointment and collect it for you.
+Book an appointment to collect the letter at the [British Consulate General in Cape Town](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-cape-town/providing-an-informative-note/slot_picker) or the [British High Commission in Pretoria](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-pretoria/providing-an-informative-note/slot_picker). The letter is free. If you can’t go to an appointment, you can ask a friend or family member to make an appointment and collect it for you.
 
 ##After you get married
 
 Your marriage will be recognised in the UK if:
 
-- you follow the correct process according to the law in South Africa 
+- you follow the correct process according to the law in South Africa
 - it would be [allowed under UK law](/marriages-civil-partnerships)
 
 You don’t need to register your marriage in the UK.

test/data/marriage-abroad-files.yml

@@ -666,8 +666,8 @@ lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/uk/partner_loca
 lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/uk/partner_local/_same_sex.erb: 2dfa783ca3af3d9010f18c798fa7f406
 lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/uk/partner_other/_opposite_sex.erb: 2d951b98bcb9d47e214f9a7ca2240c01
 lib/smart_answer_flows/marriage-abroad/outcomes/countries/russia/uk/partner_other/_same_sex.erb: 2dfa783ca3af3d9010f18c798fa7f406
-lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-africa/_opposite_sex.erb: d0a069c48f491c8c76e976634b536f32
-lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-africa/_same_sex.erb: d0a069c48f491c8c76e976634b536f32
+lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-africa/_opposite_sex.erb: f25b820c7b45ea307b2245928aeb8416
+lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-africa/_same_sex.erb: f25b820c7b45ea307b2245928aeb8416
 lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-africa/_title.govspeak.erb: c18cfb74728f95e947ab034407a3e94e
 lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-korea/_opposite_sex.erb: 43dd13a3f2122d15f9f66f9509ad4b6c
 lib/smart_answer_flows/marriage-abroad/outcomes/countries/south-korea/_same_sex.erb: 515d4df619bc126383c8d1dfa4a0072e