Merge branch 'master' into bromley

Conflicts:
	bin/send-reports
	conf/crontab.ugly
	conf/general.yml-example
	db/schema.sql
	perllib/FixMyStreet/App/Controller/Admin.pm
	perllib/FixMyStreet/App/Controller/Report/New.pm
	perllib/FixMyStreet/DB/Result/Comment.pm
	perllib/FixMyStreet/DB/Result/Open311conf.pm
	perllib/FixMyStreet/DB/Result/Problem.pm
	perllib/FixMyStreet/DB/Result/User.pm
	templates/web/default/js/validation_strings.html
	templates/web/fixmystreet/auth/sign_out.html
	templates/web/fixmystreet/report/new/councils_text_all.html
	web/cobrands/fixmystreet/_base.scss

1 files changed, 13 insertions, 13 deletions

diff --git a/templates/web/default/js/validation_strings.html b/templates/web/default/js/validation_strings.html
index 71637877a..3148d1993 100644
--- a/templates/web/default/js/validation_strings.html
+++ b/templates/web/default/js/validation_strings.html
@@ -1,21 +1,21 @@
     validation_strings = {
-        update: '[% loc('Please enter a message') %]',
-        title: '[% loc('Please enter a subject') %]',
-        detail: '[% loc('Please enter some details') %]',
+        update: '[% loc('Please enter a message') | replace("'", "\\'") %]',
+        title: '[% loc('Please enter a subject') | replace("'", "\\'") %]',
+        detail: '[% loc('Please enter some details') | replace("'", "\\'") %]',
         name: {
-            required: '[% loc('Please enter your name') %]',
-            validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') %]'
+            required: '[% loc('Please enter your name') | replace("'", "\\'") %]',
+            validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') | replace("'", "\\'") %]'
         },
-        category: '[% loc('Please choose a category') %]',
+        category: '[% loc('Please choose a category') | replace("'", "\\'") %]',
         rznvy: {
-            required: '[% loc('Please enter your email') %]',
-            email: '[% loc('Please enter a valid email') %]'
+            required: '[% loc('Please enter your email') | replace("'", "\\'") %]',
+            email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]'
         },
         email: {
-            required: '[% loc('Please enter your email') %]',
-            email: '[% loc('Please enter a valid email') %]'
+            required: '[% loc('Please enter your email') | replace("'", "\\'") %]',
+            email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]'
         },
-        fms_extra_title: '[% loc('Please enter your title') %]',
-        first_name: '[% loc('Please enter your first name') %]',
-        last_name: '[% loc('Please enter your second name') %]'
+        fms_extra_title: '[% loc('Please enter your title') | replace("'", "\\'") %]',
+        first_name: '[% loc('Please enter your first name') | replace("'", "\\'") %]',
+        last_name: '[% loc('Please enter your second name') | replace("'", "\\'") %]'
     };