From 0b63460fe689b6d77eed71f754e124f2bfcb753f Mon Sep 17 00:00:00 2001
From: Dominik Szopa <dominik@oxd.com>
Date: Mon, 26 Aug 2019 15:55:11 -0700
Subject: [PATCH 1/2] DIV-955: Updated marriage certificate translation
 requirements and messages

---
 .../core/templates/dashboard/print_form.html     |  5 +++++
 .../core/templates/prequalification/step_05.html | 16 ++++++----------
 edivorce/fixtures/Question.json                  |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/edivorce/apps/core/templates/dashboard/print_form.html b/edivorce/apps/core/templates/dashboard/print_form.html
index a63a78bc..a391630b 100644
--- a/edivorce/apps/core/templates/dashboard/print_form.html
+++ b/edivorce/apps/core/templates/dashboard/print_form.html
@@ -470,6 +470,11 @@
           Proof of marriage (original or certified Marriage Certificate or
           Registration of Divorce)
         </li>
+        <ul>
+            <li>
+                If not in English, also provide Affidavit of Translation and English translation
+            </li>
+        </ul>
         <li>Completed
           <a href="http://www.justice.gc.ca/eng/fl-df/divorce/pdf/form.pdf"
               target="_blank">
diff --git a/edivorce/apps/core/templates/prequalification/step_05.html b/edivorce/apps/core/templates/prequalification/step_05.html
index af72fa4b..f500f6da 100644
--- a/edivorce/apps/core/templates/prequalification/step_05.html
+++ b/edivorce/apps/core/templates/prequalification/step_05.html
@@ -134,7 +134,7 @@
 
 {% if married_marriage_like == "Legally married" %}
 <div class="question-well" id="is_certificate_in_english">
-    <h3>Is your marriage certificate or registration of marriage in English?</h3>
+    <h3>Is your marriage certificate or registration of marriage in English OR been translated into English by a certified translator?</h3>
 
     <div class="btn-radio-group" data-toggle="buttons">
         <label class="btn btn-radio">
@@ -142,21 +142,17 @@
         </label>
 
         <label class="btn btn-radio">
-            {% input_field type="radio" name="marriage_certificate_in_english" autocomplete="off" value="NO" data_target_id="certificate_in_english" data_reveal_target="true" data_target_class="not-disqualified" data_reveal_class="false" %} No
+            {% input_field type="radio" name="marriage_certificate_in_english" autocomplete="off" value="NO" data_target_id="certificate_in_english" data_reveal_target="true" data_target_class="not-disqualified" data_reveal_class="true" %} No
         </label>
     </div>
-
-    <div class="information-message bg-danger hard-stop" id="certificate_in_english" hidden>
-        <p>Sorry, but at this point in time you will not be able to complete your application for divorce using this online tool. Currently the tool supports a limited number of scenarios. In the meantime, you can file for divorce using the forms provided on the <a href="http://www2.gov.bc.ca/gov/content/justice/courthouse-services/documents-forms-records/court-forms/sup-family-forms" target="_blank">Supreme Court of B.C. website</a>.</p>
-
-        <p>A <a href="http://www.familylaw.lss.bc.ca/guides/divorce/divJoint_courtForms.php" target="_blank">listing of forms</a> that may be required for a Joint Divorce can also be found on the Family Law in B.C. website.</p>
+    <div class="information-message bg-danger" id="certificate_in_english" hidden>
+        <p>You may proceed with using this service but must have a certified translation before filing your documents. See below:</p>
 
         <p><strong>Proof of Marriage Translation</strong><br />
-        You need to get your proof of marriage translated by a certified translator if it is not t in English. Ask the translator to give you an Affidavit of Translation. You'll then need to file at the court registry both the original Marriage Certificate or Registration of Marriage and the <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Affidavit of Translation</b><br /><br />The Affidavit of Translation is an affidavit sworn by a translator before a notary or commissioner for taking affidavits." >Affidavit of Translation<i class="fa fa-question-circle" aria-hidden="true"></i></span> with the English translation attached as exhibits. A certified translator can help you do this.</p>
+            You need to get your proof of marriage translated by a certified translator if it is not t in English. Ask the translator to give you an Affidavit of Translation. You'll then need to file at the court registry both the original Marriage Certificate or Registration of Marriage and the <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Affidavit of Translation</b><br /><br />The Affidavit of Translation is an affidavit sworn by a translator before a notary or commissioner for taking affidavits." >Affidavit of Translation<i class="fa fa-question-circle" aria-hidden="true"></i></span> with the English translation attached as exhibits. A certified translator can help you do this.</p>
 
         <p><strong>If you were married in Quebec and your marriage certificate is in French</strong><br />
-        If your marriage certificate is in French, the registry may require you to get it translated into English. Contact your <a href="http://www.courts.gov.bc.ca/supreme_court/court_locations_and_contacts.aspx" target="_blank">Supreme Court registry</a> to find out what its rule is about marriage certificates in French.</p>
-
+            If your marriage certificate is in French, the registry may require you to get it translated into English. Contact your <a href="http://www.courts.gov.bc.ca/supreme_court/court_locations_and_contacts.aspx" target="_blank">Supreme Court registry</a> to find out what its rule is about marriage certificates in French.</p>
     </div>
 </div>
 {% endif %}
diff --git a/edivorce/fixtures/Question.json b/edivorce/fixtures/Question.json
index 825ba48f..c39bb15f 100644
--- a/edivorce/fixtures/Question.json
+++ b/edivorce/fixtures/Question.json
@@ -133,7 +133,7 @@
 },
 {
     "fields": {
-        "name": "Is your marriage certificate or registration of marriage in English?",
+        "name": "Is your marriage certificate or registration of marriage in English OR been translated into English by a certified translator?",
         "description": "For pre-qualification step 5",
         "summary_order": 14,
         "required": "Conditional",

From 4c84cde6d37ecec627acf1930eae89c584c6fbc0 Mon Sep 17 00:00:00 2001
From: Dominik Szopa <dominik@oxd.com>
Date: Tue, 27 Aug 2019 13:55:48 -0700
Subject: [PATCH 2/2] Updated with Charles suggestions

---
 .../apps/core/templates/prequalification/step_05.html     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/edivorce/apps/core/templates/prequalification/step_05.html b/edivorce/apps/core/templates/prequalification/step_05.html
index f500f6da..2224c6d9 100644
--- a/edivorce/apps/core/templates/prequalification/step_05.html
+++ b/edivorce/apps/core/templates/prequalification/step_05.html
@@ -134,22 +134,22 @@
 
 {% if married_marriage_like == "Legally married" %}
 <div class="question-well" id="is_certificate_in_english">
-    <h3>Is your marriage certificate or registration of marriage in English OR been translated into English by a certified translator?</h3>
+    <h3>Is your marriage certificate or registration of marriage in English <strong>OR</strong> been translated into English by a certified translator?</h3>
 
     <div class="btn-radio-group" data-toggle="buttons">
         <label class="btn btn-radio">
-            {% input_field type="radio" name="marriage_certificate_in_english" autocomplete="off" value="YES" data_target_id="certificate_in_english" data_reveal_target="false" data_target_class="not-disqualified" data_reveal_class="true" %} Yes
+            {% input_field type="radio" name="marriage_certificate_in_english" autocomplete="off" value="YES" data_target_id="certificate_in_english" data_reveal_target="false" %} Yes
         </label>
 
         <label class="btn btn-radio">
-            {% input_field type="radio" name="marriage_certificate_in_english" autocomplete="off" value="NO" data_target_id="certificate_in_english" data_reveal_target="true" data_target_class="not-disqualified" data_reveal_class="true" %} No
+            {% input_field type="radio" name="marriage_certificate_in_english" autocomplete="off" value="NO" data_target_id="certificate_in_english" data_reveal_target="true" %} No
         </label>
     </div>
     <div class="information-message bg-danger" id="certificate_in_english" hidden>
         <p>You may proceed with using this service but must have a certified translation before filing your documents. See below:</p>
 
         <p><strong>Proof of Marriage Translation</strong><br />
-            You need to get your proof of marriage translated by a certified translator if it is not t in English. Ask the translator to give you an Affidavit of Translation. You'll then need to file at the court registry both the original Marriage Certificate or Registration of Marriage and the <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Affidavit of Translation</b><br /><br />The Affidavit of Translation is an affidavit sworn by a translator before a notary or commissioner for taking affidavits." >Affidavit of Translation<i class="fa fa-question-circle" aria-hidden="true"></i></span> with the English translation attached as exhibits. A certified translator can help you do this.</p>
+            You need to get your proof of marriage translated by a certified translator if it is not in English. Ask the translator to give you an Affidavit of Translation. You'll then need to file at the court registry both the original Marriage Certificate or Registration of Marriage and the <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Affidavit of Translation</b><br /><br />The Affidavit of Translation is an affidavit sworn by a translator before a notary or commissioner for taking affidavits." >Affidavit of Translation<i class="fa fa-question-circle" aria-hidden="true"></i></span> with the English translation attached as exhibits. A certified translator can help you do this.</p>
 
         <p><strong>If you were married in Quebec and your marriage certificate is in French</strong><br />
             If your marriage certificate is in French, the registry may require you to get it translated into English. Contact your <a href="http://www.courts.gov.bc.ca/supreme_court/court_locations_and_contacts.aspx" target="_blank">Supreme Court registry</a> to find out what its rule is about marriage certificates in French.</p>