From b4bb854d4ee11546e18ee7e90e5be03cf8d9bc68 Mon Sep 17 00:00:00 2001
From: racheltstevens <racheltstevens@gmail.com>
Date: Fri, 4 Aug 2017 14:36:04 -0400
Subject: [PATCH] Typogrify all the things!

---
 blog/templates/blog/_about_author.html             |  4 ++--
 blog/templates/blog/_about_org.html                |  2 +-
 blog/templates/blog/_blog_details.html             |  2 +-
 common/templates/common/_category_methodology.html |  4 ++--
 common/templates/common/_simple_page_body.html     |  4 ++--
 common/templates/common/category_page.html         |  6 +++---
 common/templates/common/info_footer.html           |  5 ++---
 forms/templates/forms/form_page.html               |  4 ++--
 forms/templates/forms/form_page_landing.html       |  4 ++--
 home/templates/home/_intro.html                    |  4 ++--
 incident/templates/incident/_incident.html         | 13 +++++++------
 11 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/blog/templates/blog/_about_author.html b/blog/templates/blog/_about_author.html
index 292b9c2bb..edff0e78b 100644
--- a/blog/templates/blog/_about_author.html
+++ b/blog/templates/blog/_about_author.html
@@ -1,4 +1,4 @@
-{% load wagtailcore_tags wagtailimages_tags %}
+{% load wagtailcore_tags wagtailimages_tags typogrify_tags %}
 
 {% if author.bio or author.photo %}
 	<div class="blog-about">
@@ -12,7 +12,7 @@ <h2 class="section-heading">
 			</a>
 		</h2>
 		{% if author.bio %}
-			{{ author.bio|richtext }}
+			{{ author.bio|richtext|typogrify }}
 		{% endif %}
 	</div>
 {% endif %}
diff --git a/blog/templates/blog/_about_org.html b/blog/templates/blog/_about_org.html
index 085391cd8..7ceeae457 100644
--- a/blog/templates/blog/_about_org.html
+++ b/blog/templates/blog/_about_org.html
@@ -12,7 +12,7 @@ <h2 class="section-heading">
 			</a>
 		</h2>
 		{% if organization.description %}
-			{{ organization.description|richtext }}
+			{{ organization.description|richtext|typogrify }}
 		{% endif %}
 	</div>
 {% endif %}
diff --git a/blog/templates/blog/_blog_details.html b/blog/templates/blog/_blog_details.html
index 2bc29eeb4..f103c77ea 100644
--- a/blog/templates/blog/_blog_details.html
+++ b/blog/templates/blog/_blog_details.html
@@ -1,4 +1,4 @@
-{% load wagtailcore_tags %}
+{% load wagtailcore_tags typogrify_tags %}
 <aside class="blog-details">
 	{% if page.author or page.organization %}
 		<div class="blog-details__summary">
diff --git a/common/templates/common/_category_methodology.html b/common/templates/common/_category_methodology.html
index d7150de69..9f111322d 100644
--- a/common/templates/common/_category_methodology.html
+++ b/common/templates/common/_category_methodology.html
@@ -1,4 +1,4 @@
-{% load wagtailcore_tags render_as_template %}
+{% load wagtailcore_tags render_as_template typogrify_tags %}
 
 <div class="methodology">
 	{% if category.methodology %}
@@ -12,7 +12,7 @@ <h3 class="methodology__title">
 		</h3>
 		<div class="methodology__text">
 			{% with method=category.methodology %}
-				{% render_as_template method %}
+				{% filter typogrify %}{% render_as_template method %}{% endfilter %}
 			{% endwith %}
 		</div>
 	{% endif %}
diff --git a/common/templates/common/_simple_page_body.html b/common/templates/common/_simple_page_body.html
index 591f89f3d..2f09df87f 100644
--- a/common/templates/common/_simple_page_body.html
+++ b/common/templates/common/_simple_page_body.html
@@ -1,11 +1,11 @@
-{% load wagtailcore_tags render_as_template %}
+{% load wagtailcore_tags render_as_template typogrify_tags %}
 
 <div class="simple-page">
 	<h1 class="heading-block heading-block--1">{{ page.title }}</h1>
 	<section class="stream-sections">
 		{% for block in page.body %}
 			{% if block.block_type == 'text' %}
-				<section>{% render_as_template block.value %}</section>
+				<section>{% filter typogrify %}{% render_as_template block.value %}{% endfilter %}</section>
 			{% else %}
 				<section>{% include_block block %}</section>
 			{% endif %}
diff --git a/common/templates/common/category_page.html b/common/templates/common/category_page.html
index ae8607f8e..4c79ad901 100644
--- a/common/templates/common/category_page.html
+++ b/common/templates/common/category_page.html
@@ -1,6 +1,6 @@
 {% extends layout_template %}
 
-{% load common_tags wagtailcore_tags render_as_template %}
+{% load common_tags wagtailcore_tags render_as_template typogrify_tags %}
 
 {% block flex_class %}
 	flex-container--grow-3
@@ -28,14 +28,14 @@ <h3 class="category__name">
 							{% if fact.link_url %}
 								<li class="quickfacts__item">
 									<a class="quickfacts__link" href="{{ fact.link_url }}">
-										{% filter richtext_inline %}
+										{% filter richtext_inline|typogrify %}
 											{% render_as_template fact.body %}
 										{% endfilter %}
 									</a>
 								</li>
 							{% else %}
 								<li class="quickfacts__item">
-									{% filter richtext_inline %}
+									{% filter richtext_inline|typogrify %}
 										{% render_as_template fact.body %}
 									{% endfilter %}
 								</li>
diff --git a/common/templates/common/info_footer.html b/common/templates/common/info_footer.html
index 5c33edc6c..c8c16bc5b 100644
--- a/common/templates/common/info_footer.html
+++ b/common/templates/common/info_footer.html
@@ -1,11 +1,10 @@
-{% load wagtailcore_tags wagtailimages_tags static %}
-{% load wagtailsettings_tags %}
+{% load wagtailcore_tags wagtailimages_tags wagtailsettings_tags static typogrify_tags %}
 {% get_settings %}
 
 {% with footer=settings.common.FooterSettings %}
 <div class="info-footer">
 	<div class="info-footer__body">
-		{{ footer.body|richtext }}
+		{{ footer.body|richtext|typogrify }}
 	</div>
 
 	<div class="partner-logos">
diff --git a/forms/templates/forms/form_page.html b/forms/templates/forms/form_page.html
index 1e3ba9751..4bf67c373 100644
--- a/forms/templates/forms/form_page.html
+++ b/forms/templates/forms/form_page.html
@@ -1,10 +1,10 @@
 {% extends template_name %}
-{% load wagtailcore_tags %}
+{% load wagtailcore_tags typogrify_tags %}
 
 {% block main %}
 	<div class="form-page">
 		<h2 class="page-title">{{ page.title }}</h2>
-		{{ page.intro|richtext }}
+		{{ page.intro|richtext|typogrify }}
 		<form class="form-page__form" action="{% pageurl page %}" method="POST">
 			{% csrf_token %}
 			{{ form.as_p }}
diff --git a/forms/templates/forms/form_page_landing.html b/forms/templates/forms/form_page_landing.html
index 8c5670be4..1ccc5dc99 100644
--- a/forms/templates/forms/form_page_landing.html
+++ b/forms/templates/forms/form_page_landing.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
-{% load wagtailcore_tags %}
+{% load wagtailcore_tags typogrify_tags %}
 
 {% block main %}
-  {{ page.thank_you_text|richtext }}
+  {{ page.thank_you_text|richtext|typogrify }}
 {% endblock %}
diff --git a/home/templates/home/_intro.html b/home/templates/home/_intro.html
index 77474fa96..429e1c70f 100644
--- a/home/templates/home/_intro.html
+++ b/home/templates/home/_intro.html
@@ -1,6 +1,6 @@
-{% load common_tags wagtailcore_tags %}
+{% load common_tags wagtailcore_tags typogrify_tags %}
 <div class="intro">
-	{{ text|richtext_inline }}
+	{{ text|richtext_inline|typogrify }}
 
 	{% if read_more %}
 		<a
diff --git a/incident/templates/incident/_incident.html b/incident/templates/incident/_incident.html
index f5a2b74cc..b736150ed 100644
--- a/incident/templates/incident/_incident.html
+++ b/incident/templates/incident/_incident.html
@@ -6,8 +6,7 @@
 	teaser -- whether this is a short teaser of an incident (default: False)
 {% endcomment %}
 
-{% load wagtailcore_tags %}
-{% load wagtailimages_tags %}
+{% load wagtailcore_tags wagtailimages_tags typogrify_tags %}
 {% load render_as_template %}
 
 <article class="
@@ -66,15 +65,15 @@ <h2 class="incident__title">
 			{% if teaser %}
 				<section>
 					{% if incident.teaser %}
-					{{ incident.teaser|richtext }}
+						{{ incident.teaser|richtext|typogrify }}
 					{% else %}
-					{% include_block incident.body.0|truncatewords_html:20 %}
+						{% include_block incident.body.0|truncatewords_html:20|typogrify %}
 					{% endif %}
 				</section>
 			{% else %}
 				{% for block in incident.body %}
 					{% if block.block_type == 'rich_text' %}
-						<section>{% render_as_template block.value %}</section>
+						<section>{% filter typogrify %}{% render_as_template block.value %}{% endfilter %}</section>
 					{% else %}
 						<section>{% include_block block %}</section>
 					{% endif %}
@@ -90,7 +89,9 @@ <h2 class="incident__title">
 					<div class="incident__description">
 						{% for block in update.body %}
 							{% if block.block_type == 'rich_text' %}
-								<section>{% render_as_template block.value %}</section>
+								<section>
+									{% filter typogrify %}{% render_as_template block.value %}{% endfilter %}
+								</section>
 							{% else %}
 								<section>{% include_block block %}</section>
 							{% endif %}