diff --git a/app/__init__.py b/app/__init__.py index 5e4e7bd32..f3af80102 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,6 +1,7 @@ import os +import re -from flask import Flask, session +from flask import Flask, session, Markup from flask._compat import string_types from flask.ext import assets from flask.ext.sqlalchemy import SQLAlchemy @@ -44,6 +45,8 @@ def create_app(config_name): application.session_interface = ItsdangerousSessionInterface() admin_api_client.init_app(application) + application.add_template_filter(placeholders) + return application @@ -153,3 +156,13 @@ def convert_to_boolean(value): return False return value + + +def placeholders(value): + if not value: + return value + return Markup(re.sub( + r"\(\(([^\)]+)\)\)", # anything that looks like ((registration number)) + lambda match: "{}".format(match.group(1)), + value + )) diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 5ea8ed739..3a8fdfc4b 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -25,9 +25,9 @@ @import "govuk_elements/elements/panels"; @import "govuk_elements/elements/tables"; -// ////---xxsd----k/ // Extra CSS for this application @import "components/sms-message"; - +@import "components/placeholder"; +// // // sxx // Break this up @import "app"; diff --git a/app/templates/views/send-sms.html b/app/templates/views/send-sms.html index 58c7ac76d..14e2c1894 100644 --- a/app/templates/views/send-sms.html +++ b/app/templates/views/send-sms.html @@ -9,12 +9,16 @@
+

Send text messages

-

This page will be where we construct text messages

- {{ sms_message("hi") }} + {{ sms_message(" + Vehicle tax: Your vehicle tax for ((registration number)) expires on + ((date)). Tax your vehicle at www.gov.uk/vehicle-tax + ") }} +

- Continue + Continue