diff --git a/edivorce/apps/core/templates/pdf/form1.html b/edivorce/apps/core/templates/pdf/form1.html index ead434d6..8ca6ed3e 100644 --- a/edivorce/apps/core/templates/pdf/form1.html +++ b/edivorce/apps/core/templates/pdf/form1.html @@ -133,11 +133,12 @@ Place of marriage: [city or town; province or state; country] - {% 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 %} {% endif %} + {% 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 %} {% endif %} diff --git a/edivorce/apps/core/templates/pdf/form52.html b/edivorce/apps/core/templates/pdf/form52.html index 9db08899..b0d86b09 100644 --- a/edivorce/apps/core/templates/pdf/form52.html +++ b/edivorce/apps/core/templates/pdf/form52.html @@ -89,8 +89,9 @@

Subject to section 12 of the Divorce Act (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 %}{% 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 %}{% 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 %}{% endif %}