From 760ebd6e29172d640e87e07a5bd48495b95c2889 Mon Sep 17 00:00:00 2001
From: RunasSudo <runassudo@yingtongli.me>
Date: Mon, 4 Dec 2017 14:38:27 +1100
Subject: [PATCH] Ditto

---
 eosweb/core/static/nunjucks/booth/base.html     | 2 +-
 eosweb/core/static/nunjucks/booth/cast.html     | 4 ++--
 eosweb/core/static/nunjucks/booth/complete.html | 2 +-
 eosweb/core/static/nunjucks/booth/welcome.html  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eosweb/core/static/nunjucks/booth/base.html b/eosweb/core/static/nunjucks/booth/base.html
index 57795cd..6ca84ce 100644
--- a/eosweb/core/static/nunjucks/booth/base.html
+++ b/eosweb/core/static/nunjucks/booth/base.html
@@ -18,7 +18,7 @@
 
 <h1>{{ election.py_name }}</h1>
 
-<p><small><b>Election fingerprint:</b> <span class="hash">{{ eosjs.eos.core.hashing.__all__.SHA256().update_obj(election).hash_as_b64() }}</span></small></p>
+<p><small><b>{{ election.kind|title }} fingerprint:</b> <span class="hash">{{ eosjs.eos.core.hashing.__all__.SHA256().update_obj(election).hash_as_b64() }}</span></small></p>
 
 {# Convert the template name to a numerical index for comparison #}
 {% if template == 'booth/welcome.html' %}
diff --git a/eosweb/core/static/nunjucks/booth/cast.html b/eosweb/core/static/nunjucks/booth/cast.html
index c8dd482..ceb54d2 100644
--- a/eosweb/core/static/nunjucks/booth/cast.html
+++ b/eosweb/core/static/nunjucks/booth/cast.html
@@ -43,13 +43,13 @@
 		<div class="ui hidden error message" id="error_invalid_id">
 			<i class="close icon"></i>
 			<div class="header">Error</div>
-			<p>The log in details you entered are not valid for this election. Please check your username and password and try again. If the issue persists, contact your election administrator.</p>
+			<p>The log in details you entered are not valid for this {{ election.kind }}. Please check your username and password and try again. If the issue persists, contact your {{ election.kind }} administrator.</p>
 		</div>
 		
 		<div class="ui hidden error message" id="error_unknown">
 			<i class="close icon"></i>
 			<div class="header">Error</div>
-			<p>An unknown error occurred while attempting to cast your ballot. You may click the ‘Cast ballot’ button below to try again. If the issue persists, contact your election administrator.</p>
+			<p>An unknown error occurred while attempting to cast your ballot. You may click the ‘Cast ballot’ button below to try again. If the issue persists, contact your {{ election.kind }} administrator.</p>
 			<p id="error_unknown_tech"></p>
 		</div>
 	</div>
diff --git a/eosweb/core/static/nunjucks/booth/complete.html b/eosweb/core/static/nunjucks/booth/complete.html
index 6e9e31e..6450212 100644
--- a/eosweb/core/static/nunjucks/booth/complete.html
+++ b/eosweb/core/static/nunjucks/booth/complete.html
@@ -29,7 +29,7 @@
 	
 	<p>Please check that the ballot fingerprint above matches the ballot fingerprint you recorded earlier.</p>
 	
-	<p>To confirm that your ballot was cast correctly, please go to the <a href="{{ election_base_url }}view/ballots">‘Voters and ballots’ page</a> for the election or click ‘Finish’, and confirm that the above ballot fingerprint appears next to your name.</p>
+	<p>To confirm that your ballot was cast correctly, please go to the <a href="{{ election_base_url }}view/ballots">‘Voters and ballots’ page</a> for the {{ election.kind }} or click ‘Finish’, and confirm that the above ballot fingerprint appears next to your name.</p>
 {% endblock %}
 
 {% block buttons %}
diff --git a/eosweb/core/static/nunjucks/booth/welcome.html b/eosweb/core/static/nunjucks/booth/welcome.html
index 439c3f3..88cf184 100644
--- a/eosweb/core/static/nunjucks/booth/welcome.html
+++ b/eosweb/core/static/nunjucks/booth/welcome.html
@@ -20,7 +20,7 @@
 
 {% block content %}
 	<p>Welcome to the {{ election.py_name }} voting booth.</p>
-	<p>Follow the on-screen directions to prepare and cast your ballot in this election. The bar above will show your progress. Please note that your ballot will <b>not be cast until</b> you complete the final ‘Cast ballot’ stage and receive a <b>‘smart ballot tracker’</b>.</p>
+	<p>Follow the on-screen directions to prepare and cast your ballot in this {{ election.kind }}. The bar above will show your progress. Please note that your ballot will <b>not be cast until</b> you complete the final ‘Cast ballot’ stage and receive a <b>‘smart ballot tracker’</b>.</p>
 	<p>If at any point you wish to return to a previous screen, click the ‘Back’ button below.</p>
 	<p>If you wish, you may disconnect your internet connection now while preparing your ballot, however you must re-connect your internet connection before logging in to cast your ballot.</p>
 	<p>Please click the blue ‘Continue’ button below to continue.</p>