From 6806e0f232f21afda9b9dd463c3be366a2679ac8 Mon Sep 17 00:00:00 2001 From: Chris Roos Date: Thu, 19 Nov 2015 16:11:16 +0000 Subject: [PATCH 1/9] Move data_partials/_button.erb The smart_answer_flows/data_partials directory is a hangover from before the introduction of ERB templates. The smart_answer_flows/shared directory is where shared partials now live. This partial is only used by the register-a-birth and register-a-death Smart Answers so I've placed it in the shared/births_and_deaths_registration directory. I've added the .govspeak extension so that it's name is consistent with the other partials in this shared directory. --- .../register-a-birth/outcomes/oru_result.govspeak.erb | 2 +- .../register-a-death/outcomes/oru_result.govspeak.erb | 2 +- .../births_and_deaths_registration/_button.govspeak.erb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename lib/smart_answer_flows/{data_partials/_button.erb => shared/births_and_deaths_registration/_button.govspeak.erb} (100%) diff --git a/lib/smart_answer_flows/register-a-birth/outcomes/oru_result.govspeak.erb b/lib/smart_answer_flows/register-a-birth/outcomes/oru_result.govspeak.erb index ac32b76aad8..67a2b56e8a3 100644 --- a/lib/smart_answer_flows/register-a-birth/outcomes/oru_result.govspeak.erb +++ b/lib/smart_answer_flows/register-a-birth/outcomes/oru_result.govspeak.erb @@ -208,7 +208,7 @@ Copy of a birth registration certificate | £65 <%= render partial: '../../shared/births_and_deaths_registration/document_return_fees.govspeak.erb', locals: { document_return_fees: document_return_fees } %> - <%= render partial: '../../data_partials/button.erb', locals: { button_data: button_data } %> + <%= render partial: '../../shared/births_and_deaths_registration/button.govspeak.erb', locals: { button_data: button_data } %> <% if country_of_birth == 'venezuela' && same_country %> diff --git a/lib/smart_answer_flows/register-a-death/outcomes/oru_result.govspeak.erb b/lib/smart_answer_flows/register-a-death/outcomes/oru_result.govspeak.erb index a4e24b512c9..c0039ee8c8b 100644 --- a/lib/smart_answer_flows/register-a-death/outcomes/oru_result.govspeak.erb +++ b/lib/smart_answer_flows/register-a-death/outcomes/oru_result.govspeak.erb @@ -60,7 +60,7 @@ Copy of a death registration certificate | £65 <%= render partial: '../../shared/births_and_deaths_registration/document_return_fees.govspeak.erb', locals: { document_return_fees: document_return_fees } %> - <%= render partial: '../../data_partials/button.erb', locals: { button_data: button_data } %> + <%= render partial: '../../shared/births_and_deaths_registration/button.govspeak.erb', locals: { button_data: button_data } %> ###4. Send your registration diff --git a/lib/smart_answer_flows/data_partials/_button.erb b/lib/smart_answer_flows/shared/births_and_deaths_registration/_button.govspeak.erb similarity index 100% rename from lib/smart_answer_flows/data_partials/_button.erb rename to lib/smart_answer_flows/shared/births_and_deaths_registration/_button.govspeak.erb From 93f4c68193cfd28dfec416b9e931ba50f4b4609c Mon Sep 17 00:00:00 2001 From: Chris Roos Date: Thu, 19 Nov 2015 16:16:15 +0000 Subject: [PATCH 2/9] Update checksum data for register-a-birth Updated using: $ rails r script/generate-checksums-for-smart-answer.rb \ register-a-birth \ lib/smart_answer_flows/shared/births_and_deaths_registration/_button.govspeak.erb --- test/data/register-a-birth-files.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/data/register-a-birth-files.yml b/test/data/register-a-birth-files.yml index c13d051ad09..c6e7dab74fa 100644 --- a/test/data/register-a-birth-files.yml +++ b/test/data/register-a-birth-files.yml @@ -8,7 +8,7 @@ lib/smart_answer_flows/register-a-birth/outcomes/no_birth_certificate_result.gov lib/smart_answer_flows/register-a-birth/outcomes/no_embassy_result.govspeak.erb: ed56d500311fbe441649c92193f0e631 lib/smart_answer_flows/register-a-birth/outcomes/no_registration_result.govspeak.erb: 7b60252b078e6aec6f5759e894ce4ffb lib/smart_answer_flows/register-a-birth/outcomes/north_korea_result.govspeak.erb: e8d30537b7850252f3da8aff38524fe4 -lib/smart_answer_flows/register-a-birth/outcomes/oru_result.govspeak.erb: cbec43e5a7d99f4e4c8894dc595b8dea +lib/smart_answer_flows/register-a-birth/outcomes/oru_result.govspeak.erb: e73c19d531e316eae513e4861b32daaf lib/smart_answer_flows/register-a-birth/questions/childs_date_of_birth.govspeak.erb: e911daf1dc69ce85db372dc4ea3bdd50 lib/smart_answer_flows/register-a-birth/questions/country_of_birth.govspeak.erb: 31c306c928e71eee86c60352f51ccf83 lib/smart_answer_flows/register-a-birth/questions/have_you_adopted_the_child.govspeak.erb: 3a9d66656446a508c7232b26778dfa23 @@ -17,9 +17,9 @@ lib/smart_answer_flows/register-a-birth/questions/where_are_you_now.govspeak.erb lib/smart_answer_flows/register-a-birth/questions/which_country.govspeak.erb: 913b5637a2814cbd529affffc55b1f72 lib/smart_answer_flows/register-a-birth/questions/who_has_british_nationality.govspeak.erb: 3e482183d55ccc5f7548d5a5d4034375 lib/smart_answer_flows/register-a-birth/register_a_birth.govspeak.erb: 05cf2d9426fc91f395fc524fdfdac800 +lib/smart_answer_flows/shared/births_and_deaths_registration/_button.govspeak.erb: bdd3818dfd2b9d6396daf6f60fd887a0 lib/data/rates/births_and_deaths_document_return_fees.yml: 4ac203e9fd076c12f62b57f8d1b64ffc lib/data/translators.yml: d86f628f0b85e24ffb0dc0ec77401387 -lib/smart_answer_flows/data_partials/_button.erb: bdd3818dfd2b9d6396daf6f60fd887a0 lib/smart_answer_flows/data_partials/_overseas_passports_embassies.erb: 2f521bae99c2f48b49d07bcb283a8063 lib/data/registrations.yml: 2eb5c61678f21bd9cc06af67c230279f lib/smart_answer/calculators/country_name_formatter.rb: 0cb274748f0daf3965451b6230c183fd From adb33b94a1706bf3f6427579043e68e0da70876a Mon Sep 17 00:00:00 2001 From: Chris Roos Date: Thu, 19 Nov 2015 16:16:31 +0000 Subject: [PATCH 3/9] Update checksum data for register-a-death Updated using: $ rails r script/generate-checksums-for-smart-answer.rb \ register-a-death \ lib/smart_answer_flows/shared/births_and_deaths_registration/_button.govspeak.erb --- test/data/register-a-death-files.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/data/register-a-death-files.yml b/test/data/register-a-death-files.yml index a6b97a09a05..e8b77c57673 100644 --- a/test/data/register-a-death-files.yml +++ b/test/data/register-a-death-files.yml @@ -6,7 +6,7 @@ lib/smart_answer_flows/register-a-death/outcomes/_footnote_oru_variants.govspeak lib/smart_answer_flows/register-a-death/outcomes/commonwealth_result.govspeak.erb: f343aa2ce9258acca94c986109618ca4 lib/smart_answer_flows/register-a-death/outcomes/no_embassy_result.govspeak.erb: fabd0de7b88ffeb54783f87cfd4a3582 lib/smart_answer_flows/register-a-death/outcomes/north_korea_result.govspeak.erb: d21f96d5816ca222f381a2bca6ced918 -lib/smart_answer_flows/register-a-death/outcomes/oru_result.govspeak.erb: 897de72bc4ec3f2570a58d44fa76051f +lib/smart_answer_flows/register-a-death/outcomes/oru_result.govspeak.erb: 31677abfc07a52b58e6dd339df15d09b lib/smart_answer_flows/register-a-death/outcomes/uk_result.govspeak.erb: 662da9367c5992191471f8722b3c2636 lib/smart_answer_flows/register-a-death/questions/did_the_person_die_at_home_hospital.govspeak.erb: 3405db8cb8b24782fc49981c2fce12e7 lib/smart_answer_flows/register-a-death/questions/was_death_expected.govspeak.erb: 132d4a52801b619af05519a69f2767dd @@ -15,9 +15,9 @@ lib/smart_answer_flows/register-a-death/questions/where_did_the_death_happen.gov lib/smart_answer_flows/register-a-death/questions/which_country.govspeak.erb: e816742682e96117df80d67faff13fc8 lib/smart_answer_flows/register-a-death/questions/which_country_are_you_in_now.govspeak.erb: 9c9399d1588c7d5e01ebf1bf5efa31a1 lib/smart_answer_flows/register-a-death/register_a_death.govspeak.erb: 1820ba3a5f3ed47816c7f151217be439 +lib/smart_answer_flows/shared/births_and_deaths_registration/_button.govspeak.erb: bdd3818dfd2b9d6396daf6f60fd887a0 lib/data/rates/births_and_deaths_document_return_fees.yml: 4ac203e9fd076c12f62b57f8d1b64ffc lib/data/translators.yml: d86f628f0b85e24ffb0dc0ec77401387 -lib/smart_answer_flows/data_partials/_button.erb: bdd3818dfd2b9d6396daf6f60fd887a0 lib/smart_answer_flows/data_partials/_overseas_passports_embassies.erb: 2f521bae99c2f48b49d07bcb283a8063 test/fixtures/worldwide/italy_organisations.json: dc5feb424edeeb12835be916605caf46 lib/smart_answer/calculators/registrations_data_query.rb: cbb0fad828d74606eb708d3442cf4ca5 From 261d9c482fcf0b6bf21fc358e0d4e186bde93155 Mon Sep 17 00:00:00 2001 From: Chris Roos Date: Thu, 19 Nov 2015 16:32:39 +0000 Subject: [PATCH 4/9] Move data_partials/_overseas_passports_embassies.erb The smart_answer_flows/data_partials directory is a hangover from before the introduction of ERB templates. The smart_answer_flows/shared directory is where shared partials now live. This partial is used by 5 Smart Answers so I've placed it in the shared/ directory rather than a subdirectory of shared/. I've added the .govspeak extension so that it's name is consistent with the other partials in this shared directory. --- .../outcomes/_contact_method.govspeak.erb | 4 ++-- .../outcomes/outcome_os_other_countries.govspeak.erb | 10 +++++----- .../outcomes/_making_your_application.govspeak.erb | 8 ++++---- .../outcomes/north_korea_result.govspeak.erb | 2 +- .../register-a-birth/outcomes/oru_result.govspeak.erb | 2 +- .../outcomes/north_korea_result.govspeak.erb | 2 +- .../outcomes/contact_the_embassy.govspeak.erb | 2 +- .../outcomes/contact_the_embassy_canada.govspeak.erb | 2 +- .../_overseas_passports_embassies.govspeak.erb} | 0 9 files changed, 16 insertions(+), 16 deletions(-) rename lib/smart_answer_flows/{data_partials/_overseas_passports_embassies.erb => shared/_overseas_passports_embassies.govspeak.erb} (100%) diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_method.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_method.govspeak.erb index a2d5bbd9627..f9ce0ef84b1 100644 --- a/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_method.govspeak.erb +++ b/lib/smart_answer_flows/marriage-abroad/outcomes/_contact_method.govspeak.erb @@ -144,7 +144,7 @@ <% when 'venezuela' %> [Make an appointment at the embassy in Caracas.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-caracas/notice-of-marriage-or-civil-partnership/slot_picker) <% else %> - <%= render partial: '../../data_partials/overseas_passports_embassies.erb', + <%= render partial: '../../shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> @@ -192,7 +192,7 @@ <%= contact_message %> <% end %> - <%= render partial: '../../data_partials/overseas_passports_embassies.erb', + <%= render partial: '../../shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_other_countries.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_other_countries.govspeak.erb index 2888d776849..914495fd546 100644 --- a/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_other_countries.govspeak.erb +++ b/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_other_countries.govspeak.erb @@ -6,7 +6,7 @@ <% case ceremony_country %> <% when 'burma' %> The British Embassy in Rangoon doesn’t register marriages of British citizens in Burma. Contact the embassy if you need further advice. - <%= render partial: '../../data_partials/overseas_passports_embassies.erb', + <%= render partial: '../../shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> @@ -16,7 +16,7 @@ <% end %> <% when 'north-korea' %> It’s very unlikely that foreign nationals would be allowed to marry in North Korea. Contact the British Embassy in Pyongyang if you need further advice. - <%= render partial: '../../data_partials/overseas_passports_embassies.erb', + <%= render partial: '../../shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> @@ -26,13 +26,13 @@ <% end %> <% when *%w(iran somalia syria) %> There are currently no British consular services available in <%= country_name_lowercase_prefix %>. See below if you need further advice. - <%= render partial: '../../data_partials/overseas_passports_embassies.erb', + <%= render partial: '../../shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> <% when 'yemen' %> There are only limited British consular services available in <%= country_name_lowercase_prefix %>. See below if you need further advice. - <%= render partial: '../../data_partials/overseas_passports_embassies.erb', + <%= render partial: '../../shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> @@ -57,7 +57,7 @@ ##Getting married at the British Embassy You can only apply to get married at the British Embassy in Riyadh if you’re resident in Saudi Arabia and neither of you is a Muslim. Contact them to make an appointment. - <%= render partial: '../../data_partials/overseas_passports_embassies.erb', + <%= render partial: '../../shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> diff --git a/lib/smart_answer_flows/overseas-passports/outcomes/_making_your_application.govspeak.erb b/lib/smart_answer_flows/overseas-passports/outcomes/_making_your_application.govspeak.erb index c4d3dfe064b..d59520de97d 100644 --- a/lib/smart_answer_flows/overseas-passports/outcomes/_making_your_application.govspeak.erb +++ b/lib/smart_answer_flows/overseas-passports/outcomes/_making_your_application.govspeak.erb @@ -72,7 +72,7 @@ <%= render partial: 'making_your_application/bring_originals_and_copy.govspeak.erb' %> <%= render partial: 'making_your_application/bring_passport_and_full_photocopy.govspeak.erb' %> <% end %> - <%= render partial: '../../data_partials/overseas_passports_embassies.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> + <%= render partial: '../../shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> <% end %> <% else %> <% if passport_data['application_office'] %> @@ -110,7 +110,7 @@ <%= render partial: 'making_your_application/apply_in_person.govspeak.erb' %> <%= render partial: 'making_your_application/bring_originals_and_copy.govspeak.erb' %> <% end %> - <%= render partial: '../../data_partials/overseas_passports_embassies.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> + <%= render partial: '../../shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> <% end %> <% end %> <% elsif %w(timor-leste).include?(current_location) %> @@ -134,7 +134,7 @@ <%= render partial: 'making_your_application/send_application_ips.govspeak.erb', locals: { ips_number: ips_number } %> <%= render partial: 'making_your_application/renewing_new_renewing_old.govspeak.erb' %> <% end %> - <%= render partial: '../../data_partials/overseas_passports_embassies.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> + <%= render partial: '../../shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> <% end %> <% else %> <% if passport_data['application_office'] %> @@ -156,7 +156,7 @@ <%= render partial: 'making_your_application/send_application_address_st_helena_ascension_and_tristan_da_cunha.govspeak.erb' %> <% else %> <% if ips_number.to_i > 1 %> - <%= render partial: '../../data_partials/overseas_passports_embassies.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> + <%= render partial: '../../shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> <% end %> <% end %> <% end %> diff --git a/lib/smart_answer_flows/register-a-birth/outcomes/north_korea_result.govspeak.erb b/lib/smart_answer_flows/register-a-birth/outcomes/north_korea_result.govspeak.erb index 56628e0f109..4d9a11377a1 100644 --- a/lib/smart_answer_flows/register-a-birth/outcomes/north_korea_result.govspeak.erb +++ b/lib/smart_answer_flows/register-a-birth/outcomes/north_korea_result.govspeak.erb @@ -53,7 +53,7 @@ Either parent can register the birth. <% end %> - <%= render partial: '../../data_partials/overseas_passports_embassies.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> + <%= render partial: '../../shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> ^Registration can take up to 3 months - your application will be sent to the Foreign and Commonwealth Office in London where the birth will be registered.^ diff --git a/lib/smart_answer_flows/register-a-birth/outcomes/oru_result.govspeak.erb b/lib/smart_answer_flows/register-a-birth/outcomes/oru_result.govspeak.erb index 67a2b56e8a3..d67510d0384 100644 --- a/lib/smart_answer_flows/register-a-birth/outcomes/oru_result.govspeak.erb +++ b/lib/smart_answer_flows/register-a-birth/outcomes/oru_result.govspeak.erb @@ -218,7 +218,7 @@ Staff at the embassy will check your application and send it to the Overseas Registration Unit in the UK. - <%= render partial: '../../data_partials/overseas_passports_embassies.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> + <%= render partial: '../../shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> <% else %> ##4. Send your registration diff --git a/lib/smart_answer_flows/register-a-death/outcomes/north_korea_result.govspeak.erb b/lib/smart_answer_flows/register-a-death/outcomes/north_korea_result.govspeak.erb index c86f6e6b085..ec27e415d8e 100644 --- a/lib/smart_answer_flows/register-a-death/outcomes/north_korea_result.govspeak.erb +++ b/lib/smart_answer_flows/register-a-death/outcomes/north_korea_result.govspeak.erb @@ -50,5 +50,5 @@ Your documents will be returned to the British Embassy in Pyongyang after the death has been registered. You’ll also be sent copies of the registration certificate if you’ve paid for them. The embassy will contact you when your documents and certificates are ready for collection. - <%= render partial: '../../data_partials/overseas_passports_embassies.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } -%> + <%= render partial: '../../shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } -%> <% end %> diff --git a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy.govspeak.erb b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy.govspeak.erb index fb46988239d..92130b4e186 100644 --- a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy.govspeak.erb +++ b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy.govspeak.erb @@ -9,7 +9,7 @@ You can use the [online enquiry form](https://eforms.homeoffice.gov.uk/outreach/Passport_Enquiries.ofml) to contact Her Majesty’s Passport Office for general advice. - <%= render partial: '../../data_partials/overseas_passports_embassies.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> + <%= render partial: '../../shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> ##Get a replacement passport diff --git a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy_canada.govspeak.erb b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy_canada.govspeak.erb index f0c25b62079..a605532fc52 100644 --- a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy_canada.govspeak.erb +++ b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy_canada.govspeak.erb @@ -9,7 +9,7 @@ You can use the [online enquiry form](https://eforms.homeoffice.gov.uk/outreach/Passport_Enquiries.ofml) to contact Her Majesty’s Passport Office for general advice. - <%= render partial: '../../data_partials/overseas_passports_embassies.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> + <%= render partial: '../../shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %> ##Get a replacement passport diff --git a/lib/smart_answer_flows/data_partials/_overseas_passports_embassies.erb b/lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb similarity index 100% rename from lib/smart_answer_flows/data_partials/_overseas_passports_embassies.erb rename to lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb From 2b45aa204e5a7445981aaa7cf6f2c4e6dd15983e Mon Sep 17 00:00:00 2001 From: Chris Roos Date: Thu, 19 Nov 2015 16:35:09 +0000 Subject: [PATCH 5/9] Update checksum data for marriage-abroad Now that overseas_passports_embassies has moved. Updated using: $ rails r script/generate-checksums-for-smart-answer.rb \ marriage-abroad \ lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb --- test/data/marriage-abroad-files.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/data/marriage-abroad-files.yml b/test/data/marriage-abroad-files.yml index 10327f71202..fab18b4ff8f 100644 --- a/test/data/marriage-abroad-files.yml +++ b/test/data/marriage-abroad-files.yml @@ -24,7 +24,7 @@ lib/smart_answer_flows/marriage-abroad/outcomes/_contact_local_authorities.govsp lib/smart_answer_flows/marriage-abroad/outcomes/_contact_local_authorities_in_country_cp.govspeak.erb: 1a5916b89288b05d2a50542f0c1ac857 lib/smart_answer_flows/marriage-abroad/outcomes/_contact_local_authorities_in_country_marriage.govspeak.erb: 315f256bd7f50088be7c03443a01bca4 lib/smart_answer_flows/marriage-abroad/outcomes/_contact_local_authorities_in_greece.govspeak.erb: cac1fcbc77323dc53596ca6d3cf7bd84 -lib/smart_answer_flows/marriage-abroad/outcomes/_contact_method.govspeak.erb: d7f530a5cf271f2d7da1397ac214d7af +lib/smart_answer_flows/marriage-abroad/outcomes/_contact_method.govspeak.erb: 227cc924ef89a7fe537ec8cb2cc003db lib/smart_answer_flows/marriage-abroad/outcomes/_contact_nearest_embassy_of_country.govspeak.erb: 196319d3632f94cfa087f191d887e36c lib/smart_answer_flows/marriage-abroad/outcomes/_contact_to_make_appointment.govspeak.erb: a7e4a184e974b3989a697578277b3b7a lib/smart_answer_flows/marriage-abroad/outcomes/_convert_cc_to_ss_marriage.govspeak.erb: 38e1be8bb7bdd80ef0c4c6c3af8f7f04 @@ -107,7 +107,7 @@ lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_laos.govspeak.erb: 14 lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_local_japan.govspeak.erb: 7fb39b28aebabde00612ee06d9f345f5 lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_marriage_impossible_no_laos_locals.govspeak.erb: 3be3a33c8eba1ac4017c13ecd9ed284a lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_no_cni.govspeak.erb: 7f223da1e95e88ee963c6c340b1513bb -lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_other_countries.govspeak.erb: c41da03b8c2aacbba11b011b12900bb0 +lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_other_countries.govspeak.erb: 44a899defefec42ccf3fafae0f67b8d5 lib/smart_answer_flows/marriage-abroad/outcomes/outcome_portugal.govspeak.erb: 695750a9cc381603f800f1c2c6c5e200 lib/smart_answer_flows/marriage-abroad/outcomes/outcome_spain.govspeak.erb: ad2f16297be84a06a096637f209a445b lib/smart_answer_flows/marriage-abroad/outcomes/outcome_ss_affirmation.govspeak.erb: 0784e5066e751503bf9bc2a61aaf4f35 @@ -120,7 +120,7 @@ lib/smart_answer_flows/marriage-abroad/questions/legal_residency.govspeak.erb: d lib/smart_answer_flows/marriage-abroad/questions/marriage_or_pacs.govspeak.erb: a51aecfac697188f90ca9efefcb2e0ea lib/smart_answer_flows/marriage-abroad/questions/partner_opposite_or_same_sex.govspeak.erb: 40d0c99a5be50f0625c6562f06fe4afd lib/smart_answer_flows/marriage-abroad/questions/what_is_your_partners_nationality.govspeak.erb: f8569c0fef74864a92536e8181fa23e6 -lib/smart_answer_flows/data_partials/_overseas_passports_embassies.erb: 2f521bae99c2f48b49d07bcb283a8063 +lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb: 2f521bae99c2f48b49d07bcb283a8063 lib/smart_answer/calculators/marriage_abroad_data_query.rb: b69ed89bee92f2361f86e7509fc27ebf lib/smart_answer/calculators/country_name_formatter.rb: 0cb274748f0daf3965451b6230c183fd lib/smart_answer/calculators/registrations_data_query.rb: cbb0fad828d74606eb708d3442cf4ca5 From 9a04ad29a7c27b5861c719f82e316ee2a6d3e206 Mon Sep 17 00:00:00 2001 From: Chris Roos Date: Thu, 19 Nov 2015 16:35:31 +0000 Subject: [PATCH 6/9] Update checksum data for overseas-passports Now that overseas_passports_embassies has moved. Updated using: $ rails r script/generate-checksums-for-smart-answer.rb \ overseas-passports \ lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb --- test/data/overseas-passports-files.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/data/overseas-passports-files.yml b/test/data/overseas-passports-files.yml index 9551c7074f2..7953caa1789 100644 --- a/test/data/overseas-passports-files.yml +++ b/test/data/overseas-passports-files.yml @@ -6,7 +6,7 @@ lib/smart_answer_flows/overseas-passports/outcomes/_cost.govspeak.erb: 748ca30b4 lib/smart_answer_flows/overseas-passports/outcomes/_getting_your_passport.govspeak.erb: 64f5a79f0445cc546af042f7b52d41b0 lib/smart_answer_flows/overseas-passports/outcomes/_how_long.govspeak.erb: 2c3894ba2e5d37db57fd27ff20407f1a lib/smart_answer_flows/overseas-passports/outcomes/_how_to_apply.govspeak.erb: aa0dbabc3e94b809e94c5d12cde5a590 -lib/smart_answer_flows/overseas-passports/outcomes/_making_your_application.govspeak.erb: 8bc6a8156caa75ef8a6600d50f9404db +lib/smart_answer_flows/overseas-passports/outcomes/_making_your_application.govspeak.erb: 7dbfe8cac6cb7309768c574259d7e7d3 lib/smart_answer_flows/overseas-passports/outcomes/_passport_adviceline_contacts.govspeak.erb: 2e10343ed7a17de7b3a5cd4b64af88b3 lib/smart_answer_flows/overseas-passports/outcomes/apply_in_neighbouring_country.govspeak.erb: 15cd9b890f53c2158637042249abcf1c lib/smart_answer_flows/overseas-passports/outcomes/cannot_apply.govspeak.erb: 7dd7460c2cb988931e7d354ddd122e4d @@ -42,8 +42,8 @@ lib/smart_answer_flows/overseas-passports/questions/which_best_describes_you_adu lib/smart_answer_flows/overseas-passports/questions/which_best_describes_you_child.govspeak.erb: 61c9f0f7d1960caacc77fad1544cfa26 lib/smart_answer_flows/overseas-passports/questions/which_country_are_you_in.govspeak.erb: dc6f1404e792f12c110ce248286c167f lib/smart_answer_flows/overseas-passports/questions/which_opt.govspeak.erb: 0f629592f57a5ec972f23bf170d37714 +lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb: 2f521bae99c2f48b49d07bcb283a8063 lib/smart_answer/overseas_passports_helper.rb: 07df4cd921e62464c2dc9534b4d8cdf8 -lib/smart_answer_flows/data_partials/_overseas_passports_embassies.erb: 2f521bae99c2f48b49d07bcb283a8063 lib/smart_answer/calculators/passport_and_embassy_data_query.rb: b23c4733dacdb05308a843f3a89afac7 test/fixtures/worldwide_locations.yml: 063711faceec3a4081d6d5fb386c8029 test/fixtures/worldwide/france_organisations.json: dec146460928937fba71409755f01ba3 From 11d2e714abdb4d4875838ee76367dcba11270bd1 Mon Sep 17 00:00:00 2001 From: Chris Roos Date: Thu, 19 Nov 2015 16:35:56 +0000 Subject: [PATCH 7/9] Update checksum data for register-a-birth Now that overseas_passports_embassies has moved. Updated using: $ rails r script/generate-checksums-for-smart-answer.rb \ register-a-birth \ lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb --- test/data/register-a-birth-files.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/data/register-a-birth-files.yml b/test/data/register-a-birth-files.yml index c6e7dab74fa..e00e239f855 100644 --- a/test/data/register-a-birth-files.yml +++ b/test/data/register-a-birth-files.yml @@ -7,8 +7,8 @@ lib/smart_answer_flows/register-a-birth/outcomes/homeoffice_result.govspeak.erb: lib/smart_answer_flows/register-a-birth/outcomes/no_birth_certificate_result.govspeak.erb: 174d68aa0d7cf3922a9e6a1867676359 lib/smart_answer_flows/register-a-birth/outcomes/no_embassy_result.govspeak.erb: ed56d500311fbe441649c92193f0e631 lib/smart_answer_flows/register-a-birth/outcomes/no_registration_result.govspeak.erb: 7b60252b078e6aec6f5759e894ce4ffb -lib/smart_answer_flows/register-a-birth/outcomes/north_korea_result.govspeak.erb: e8d30537b7850252f3da8aff38524fe4 -lib/smart_answer_flows/register-a-birth/outcomes/oru_result.govspeak.erb: e73c19d531e316eae513e4861b32daaf +lib/smart_answer_flows/register-a-birth/outcomes/north_korea_result.govspeak.erb: 0d33d1741fb92edac74032ffedfbe7a5 +lib/smart_answer_flows/register-a-birth/outcomes/oru_result.govspeak.erb: 8f5c81b570028c19f0271b8026895b1a lib/smart_answer_flows/register-a-birth/questions/childs_date_of_birth.govspeak.erb: e911daf1dc69ce85db372dc4ea3bdd50 lib/smart_answer_flows/register-a-birth/questions/country_of_birth.govspeak.erb: 31c306c928e71eee86c60352f51ccf83 lib/smart_answer_flows/register-a-birth/questions/have_you_adopted_the_child.govspeak.erb: 3a9d66656446a508c7232b26778dfa23 @@ -17,10 +17,10 @@ lib/smart_answer_flows/register-a-birth/questions/where_are_you_now.govspeak.erb lib/smart_answer_flows/register-a-birth/questions/which_country.govspeak.erb: 913b5637a2814cbd529affffc55b1f72 lib/smart_answer_flows/register-a-birth/questions/who_has_british_nationality.govspeak.erb: 3e482183d55ccc5f7548d5a5d4034375 lib/smart_answer_flows/register-a-birth/register_a_birth.govspeak.erb: 05cf2d9426fc91f395fc524fdfdac800 +lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb: 2f521bae99c2f48b49d07bcb283a8063 lib/smart_answer_flows/shared/births_and_deaths_registration/_button.govspeak.erb: bdd3818dfd2b9d6396daf6f60fd887a0 lib/data/rates/births_and_deaths_document_return_fees.yml: 4ac203e9fd076c12f62b57f8d1b64ffc lib/data/translators.yml: d86f628f0b85e24ffb0dc0ec77401387 -lib/smart_answer_flows/data_partials/_overseas_passports_embassies.erb: 2f521bae99c2f48b49d07bcb283a8063 lib/data/registrations.yml: 2eb5c61678f21bd9cc06af67c230279f lib/smart_answer/calculators/country_name_formatter.rb: 0cb274748f0daf3965451b6230c183fd lib/smart_answer/calculators/registrations_data_query.rb: cbb0fad828d74606eb708d3442cf4ca5 From 8638167c73c9d3dc6ef100e530e46109e441a2f2 Mon Sep 17 00:00:00 2001 From: Chris Roos Date: Thu, 19 Nov 2015 16:36:18 +0000 Subject: [PATCH 8/9] Update checksum data for register-a-death Now that overseas_passports_embassies has moved. Updated using: $ rails r script/generate-checksums-for-smart-answer.rb \ register-a-death \ lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb --- test/data/register-a-death-files.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/data/register-a-death-files.yml b/test/data/register-a-death-files.yml index e8b77c57673..6ffa16a6e7d 100644 --- a/test/data/register-a-death-files.yml +++ b/test/data/register-a-death-files.yml @@ -5,7 +5,7 @@ test/data/register-a-death-responses-and-expected-results.yml: a69c595900ab2d852 lib/smart_answer_flows/register-a-death/outcomes/_footnote_oru_variants.govspeak.erb: 30e012cdde5aa7f4de5856a5db47a54c lib/smart_answer_flows/register-a-death/outcomes/commonwealth_result.govspeak.erb: f343aa2ce9258acca94c986109618ca4 lib/smart_answer_flows/register-a-death/outcomes/no_embassy_result.govspeak.erb: fabd0de7b88ffeb54783f87cfd4a3582 -lib/smart_answer_flows/register-a-death/outcomes/north_korea_result.govspeak.erb: d21f96d5816ca222f381a2bca6ced918 +lib/smart_answer_flows/register-a-death/outcomes/north_korea_result.govspeak.erb: 92d3b20642942bc0bab482616dd659a6 lib/smart_answer_flows/register-a-death/outcomes/oru_result.govspeak.erb: 31677abfc07a52b58e6dd339df15d09b lib/smart_answer_flows/register-a-death/outcomes/uk_result.govspeak.erb: 662da9367c5992191471f8722b3c2636 lib/smart_answer_flows/register-a-death/questions/did_the_person_die_at_home_hospital.govspeak.erb: 3405db8cb8b24782fc49981c2fce12e7 @@ -15,10 +15,10 @@ lib/smart_answer_flows/register-a-death/questions/where_did_the_death_happen.gov lib/smart_answer_flows/register-a-death/questions/which_country.govspeak.erb: e816742682e96117df80d67faff13fc8 lib/smart_answer_flows/register-a-death/questions/which_country_are_you_in_now.govspeak.erb: 9c9399d1588c7d5e01ebf1bf5efa31a1 lib/smart_answer_flows/register-a-death/register_a_death.govspeak.erb: 1820ba3a5f3ed47816c7f151217be439 +lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb: 2f521bae99c2f48b49d07bcb283a8063 lib/smart_answer_flows/shared/births_and_deaths_registration/_button.govspeak.erb: bdd3818dfd2b9d6396daf6f60fd887a0 lib/data/rates/births_and_deaths_document_return_fees.yml: 4ac203e9fd076c12f62b57f8d1b64ffc lib/data/translators.yml: d86f628f0b85e24ffb0dc0ec77401387 -lib/smart_answer_flows/data_partials/_overseas_passports_embassies.erb: 2f521bae99c2f48b49d07bcb283a8063 test/fixtures/worldwide/italy_organisations.json: dc5feb424edeeb12835be916605caf46 lib/smart_answer/calculators/registrations_data_query.rb: cbb0fad828d74606eb708d3442cf4ca5 lib/smart_answer/calculators/country_name_formatter.rb: 0cb274748f0daf3965451b6230c183fd From 61b152ba21f9d3d4a342f7918a8f916e2b6072d1 Mon Sep 17 00:00:00 2001 From: Chris Roos Date: Thu, 19 Nov 2015 16:36:41 +0000 Subject: [PATCH 9/9] Update checksum data for report-a-lost-or-stolen-passport Now that overseas_passports_embassies has moved. Updated using: $ rails r script/generate-checksums-for-smart-answer.rb \ report-a-lost-or-stolen-passport \ lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb --- test/data/report-a-lost-or-stolen-passport-files.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/data/report-a-lost-or-stolen-passport-files.yml b/test/data/report-a-lost-or-stolen-passport-files.yml index c80c4800ed9..33f080313eb 100644 --- a/test/data/report-a-lost-or-stolen-passport-files.yml +++ b/test/data/report-a-lost-or-stolen-passport-files.yml @@ -3,11 +3,11 @@ lib/smart_answer_flows/report-a-lost-or-stolen-passport.rb: d38c7cb5d43147e1218e test/data/report-a-lost-or-stolen-passport-questions-and-responses.yml: 307a097c6429f895390b742dda8c9bc8 test/data/report-a-lost-or-stolen-passport-responses-and-expected-results.yml: 7a5cb860803f433fa2416b7fcaf12f12 lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/complete_LS01_form.govspeak.erb: 558860c7ddf7b7612af2bf793767f7dc -lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy.govspeak.erb: 73de3ff83de23ad8eacb124598987e6a -lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy_canada.govspeak.erb: 111927f4f5fbb62f475702983798e055 +lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy.govspeak.erb: 437a245fff9377009c76ce5223b6fb14 +lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy_canada.govspeak.erb: 443c719f6194d802773de7259ab2f899 lib/smart_answer_flows/report-a-lost-or-stolen-passport/questions/where_was_the_passport_lost_or_stolen.govspeak.erb: cab48644339f9d5a62745fa5cee13e06 lib/smart_answer_flows/report-a-lost-or-stolen-passport/questions/which_country.govspeak.erb: f3e30bca00c97605942e45da2bccd5d0 lib/smart_answer_flows/report-a-lost-or-stolen-passport/report_a_lost_or_stolen_passport.govspeak.erb: 8b6ee3c09cf7e1a48ed562bedf2af14f -lib/smart_answer_flows/data_partials/_overseas_passports_embassies.erb: 2f521bae99c2f48b49d07bcb283a8063 +lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb: 2f521bae99c2f48b49d07bcb283a8063 test/fixtures/worldwide/azerbaijan_organisations.json: fc20a7069e6457f95fc9198ea6c3d2d0 test/fixtures/worldwide/canada_organisations.json: 5995a2f7b236fbb891d74851c9fb5ae4