Merge remote-tracking branch 'origin/master' into send-report-rewrite

Conflicts:
	bin/send-reports
	perllib/FixMyStreet/Cobrand/Default.pm
	perllib/FixMyStreet/Cobrand/FixMyStreet.pm

1 files changed, 18 insertions, 0 deletions

diff --git a/templates/web/default/js/validation_strings.html b/templates/web/default/js/validation_strings.html
new file mode 100644
index 000000000..70a0ed41c
--- /dev/null
+++ b/templates/web/default/js/validation_strings.html
@@ -0,0 +1,18 @@
+    validation_strings = {
+        update: '[% loc('Please enter a message') %]',
+        title: '[% loc('Please enter a subject') %]',
+        detail: '[% loc('Please enter some details') %]',
+        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') %]'
+        },
+        category: '[% loc('Please choose a category') %]',
+        rznvy: {
+            required: '[% loc('Please enter your email') %]',
+            email: '[% loc('Please enter a valid email') %]'
+        },
+        email: {
+            required: '[% loc('Please enter your email') %]',
+            email: '[% loc('Please enter a valid email') %]'
+        }
+    };