merge master to get schema changes

1 files changed, 10 insertions, 10 deletions

diff --git a/templates/web/default/js/validation_strings.html b/templates/web/default/js/validation_strings.html
index 70a0ed41c..718d10d56 100644
--- a/templates/web/default/js/validation_strings.html
+++ b/templates/web/default/js/validation_strings.html
@@ -1,18 +1,18 @@
     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("'", "\\'") %]'
         }
     };