DIV-500: Updated F1 and F52 to populate city and country even without province

edivorce/apps/core/templates/pdf/form1.html

@@ -133,11 +133,12 @@
                 </tr>
                 <tr>
                     <td colspan="1"> Place of marriage: [<em>city or town; province or state; country</em>] </td>
-                    <td colspan="2">{% if responses.where_were_you_married_city and responses.where_were_you_married_prov and responses.where_were_you_married_country %}
-                        {{responses.where_were_you_married_city}}; {{responses.where_were_you_married_prov}};
-                            {% if responses.where_were_you_married_country == 'Other' %} {{ responses.where_were_you_married_other_country }}
-                            {% else %} {{responses.where_were_you_married_country}}{% endif %}
-                        {% else %}<span class="form-entry not-complete">&nbsp;</span>{% endif %}</td>
+                    <td colspan="2">{% if responses.where_were_you_married_city and responses.where_were_you_married_country %}
+                        {{responses.where_were_you_married_city}};
+                        {% if responses.where_were_you_married_prov %} {{responses.where_were_you_married_prov}}; {% endif %}
+                        {% if responses.where_were_you_married_country == 'Other' %} {{ responses.where_were_you_married_other_country }}
+                        {% else %} {{responses.where_were_you_married_country}}{% endif %}
+                    {% else %}<span class="form-entry not-complete">&nbsp;</span>{% endif %}</td>
                 </tr>
             </tbody>
         </table>

edivorce/apps/core/templates/pdf/form52.html

@@ -89,8 +89,9 @@
             <p class="schIndent1">
                 Subject to section 12 of the <em>Divorce Act</em> (Canada), claimant 1, {% if responses.name_you %}{% include "partials/name_with_alias.html" with name=responses.name_you use_other_name=responses.any_other_name_you other_names=responses.other_name_you %}{% else %}<span class="form-entry not-complete"></span>{% endif %},
                 and claimant 2, {% if responses.name_spouse %}{% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse %}{% else %}<span class="form-entry not-complete"></span>{% endif %}, who were married at
-                {% if responses.where_were_you_married_city and responses.where_were_you_married_prov and responses.where_were_you_married_country %}
-                    {{responses.where_were_you_married_city}}; {{responses.where_were_you_married_prov}};
+                {% if responses.where_were_you_married_city and responses.where_were_you_married_country %}
+                    {{responses.where_were_you_married_city}};
+                    {% if responses.where_were_you_married_prov %} {{responses.where_were_you_married_prov}}; {% endif %}
                     {% if responses.where_were_you_married_country == 'Other' %} {{ responses.where_were_you_married_other_country }}
                     {% else %} {{responses.where_were_you_married_country}}{% endif %}
                 {% else %}<span class="form-entry not-complete"></span>{% endif %}