1 files changed, 67 insertions, 64 deletions

diff --git a/templates/web/base/js/translation_strings.html b/templates/web/base/js/translation_strings.html
index 881f6ecb9..2eb652c1f 100644
--- a/templates/web/base/js/translation_strings.html
+++ b/templates/web/base/js/translation_strings.html
@@ -3,105 +3,108 @@ var fixmystreet = fixmystreet || {};
 fixmystreet.password_minimum_length = [% c.cobrand.password_minimum_length %];
 
     translation_strings = {
-        update: '[% loc('Please enter a message') | replace("'", "\\'") %]',
+        update: '[% loc('Please enter a message', "JS") %]',
+        error: '[% loc('Error', "JS") %]',
         title: {
-            required: '[% loc('Please enter a subject') | replace("'", "\\'") %]',
-            maxlength: '[% loc('Summaries are limited to {0} characters in length. Please shorten your summary') | replace("'", "\\'") %]'
+            required: '[% loc('Please enter a subject', "JS") %]',
+            maxlength: '[% loc('Summaries are limited to {0} characters in length. Please shorten your summary', "JS") %]',
+            notEmail: '[% loc('Please make sure you are not including an email address', "JS") %]'
         },
         detail: {
-            required: '[% loc('Please enter some details') | replace("'", "\\'") %]',
-            maxlength: '[% loc('Reports are limited to {0} characters in length. Please shorten your report') | replace("'", "\\'") %]',
+            required: '[% loc('Please enter some details', "JS") %]',
+            maxlength: '[% loc('Reports are limited to {0} characters in length. Please shorten your report', "JS") %]',
         },
         name: {
-            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("'", "\\'") %]'
+            required: '[% loc('Please enter your name', "JS") %]',
+            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', "JS") %]'
         },
-        category: '[% loc('Please choose a category') | replace("'", "\\'") %]',
+        category: '[% loc('Please choose a category', "JS") %]',
         rznvy: {
-            required: '[% loc('Please enter your email') | replace("'", "\\'") %]',
-            email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]'
+            required: '[% loc('Please enter your email', "JS") %]',
+            email: '[% loc('Please enter a valid email', "JS") %]'
         },
         email: {
-            required: '[% loc('Please enter your email') | replace("'", "\\'") %]',
-            email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]'
+            required: '[% loc('Please enter your email', "JS") %]',
+            email: '[% loc('Please enter a valid email', "JS") %]'
         },
         password_sign_in: {
-            required: '[% loc('Please enter a password') | replace("'", "\\'") %]'
+            required: '[% loc('Please enter a password', "JS") %]'
         },
         password_register: {
-            short: '[% tprintf(loc('Please make sure your password is at least %d characters long'), c.cobrand.password_minimum_length) | replace("'", "\\'") %]',
+            short: '[% tprintf(loc('Please make sure your password is at least %d characters long', "JS"), c.cobrand.password_minimum_length) %]',
         },
         phone: {
-            required: '[% loc('Please enter your phone number') | replace("'", "\\'") %]'
+            required: '[% loc('Please enter your phone number', "JS") %]'
         },
-        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("'", "\\'") %]',
-        right_place: '[% loc('Right place?') | replace("'", "\\'") %]',
-        try_again: '[% loc('Try again') | replace("'", "\\'") %]',
-        place_pin_on_map: '[% loc('Place pin on map') | replace("'", "\\'") %]',
-        back: '[% loc('Back') | replace("'", "\\'") %]',
-        how_to_send: '[% loc('How to send successful reports') | replace("'", "\\'") %]',
-        more_details: '[% loc('Details') | replace("'", "\\'") %]',
+        fms_extra_title: '[% loc('Please enter your title', "JS") %]',
+        first_name: '[% loc('Please enter your first name', "JS") %]',
+        last_name: '[% loc('Please enter your second name', "JS") %]',
+        right_place: '[% loc('Reposition if needed, then hit Continue', "JS") %]',
+        try_again: '[% loc('Try again', "JS") %]',
+        place_pin_on_map: '[% loc('Place pin on map', "JS") %]',
+        back: '[% loc('Back', "JS") %]',
+        how_to_send: '[% loc('How to send successful reports', "JS") %]',
+        more_details: '[% loc('Details', "JS") %]',
 
-        this_report: '[% loc('This report') | replace("'", "\\'") %]',
-        this_is_the_problem: '[% loc('This is the problem') | replace("'", "\\'") %]',
+        this_report: '[% loc('This report', "JS") %]',
+        this_is_the_problem: '[% loc('This is the problem', "JS") %]',
 
-        or: '[% loc(' or ') | replace("'", "\\'") %]',
+        or: '[% loc(' or ', "JS") %]',
 
-        geolocation_declined: '[% loc('You declined; please fill in the box above') | replace("'", "\\'") %]',
-        geolocation_no_position: '[% loc('Could not look up location') | replace("'", "\\'") %]',
-        geolocation_no_result: '[% loc('No result returned') | replace("'", "\\'") %]',
-        geolocation_unknown: '[% loc('Unknown error') | replace("'", "\\'") %]',
+        geolocation_declined: '[% loc('You declined; please fill in the box above', "JS") %]',
+        geolocation_no_position: '[% loc('Could not look up location', "JS") %]',
+        geolocation_no_result: '[% loc('No result returned', "JS") %]',
+        geolocation_unknown: '[% loc('Unknown error', "JS") %]',
 
-        correct_position: '[% loc('Right place?') | replace("'", "\\'") %]',
+        correct_position: '[% loc('Right place?', "JS") %]',
 
-        reporting_a_problem: '[% loc('Reporting a problem') | replace("'", "\\'") %]',
-        ok: '[% loc('OK') | replace("'", "\\'") %]',
-        map: '[% loc('MAP') | replace("'", "\\'") %]',
+        reporting_a_problem: '[% loc('Reporting a problem', "JS") %]',
+        ok: '[% loc('Continue', "JS") %]',
+        map: '[% loc('MAP', "JS") %]',
 
-        map_map: '[% loc('Map') | replace("'", "\\'") %]',
-        map_satellite: '[% loc('Satellite') | replace("'", "\\'") %]',
+        map_map: '[% loc('Map', "JS") %]',
+        map_satellite: '[% loc('Satellite', "JS") %]',
 
-        expand_map: '[% loc('Expand map') | replace("'", "\\'") %]',
-        collapse_map: '[% loc('Collapse map') | replace("'", "\\'") %]',
+        expand_map: '[% loc('Expand map', "JS") %]',
+        collapse_map: '[% loc('Collapse map', "JS") %]',
 
-        permalink: '[% loc('Permalink') | replace("'", "\\'") %]',
+        filter: '[% loc('Filter', "JS") %]',
 
-        show_pins: '[% loc('Show pins') | replace("'", "\\'") %]',
-        hide_pins: '[% loc('Hide pins') | replace("'", "\\'") %]',
+        show_pins: '[% loc('Show pins', "JS") %]',
+        hide_pins: '[% loc('Hide pins', "JS") %]',
 
-        upload_max_files_exceeded: '[% loc ('Sorry! You’ve hit the limit of images that can be attached to one report.') | replace("'", "\\'") %]',
-        upload_default_message: '[% loc ('Drag and drop photos here or <u>click to upload</u>') | replace("'", "\\'") %]',
-        upload_cancel_confirmation: '[% loc ('Are you sure you want to cancel this upload?') | replace("'", "\\'") %]',
-        upload_invalid_file_type: '[% loc ('Please upload an image only') | replace("'", "\\'") %]',
+        upload_max_files_exceeded: '[% loc('Sorry! You’ve hit the limit of images that can be attached to one report.', "JS") %]',
+        upload_default_message: '[% loc('Drag photos here or <u>browse photos</u>', "JS") %]',
+        upload_default_message_mobile: '[% loc('<u>Take or choose existing photo</u>', "JS") %]',
+        upload_cancel_confirmation: '[% loc('Are you sure you want to cancel this upload?', "JS") %]',
+        upload_invalid_file_type: '[% loc('Please upload an image only', "JS") %]',
 
         [% IF c.config.SMS_AUTHENTICATION ~%]
-        login_with_email: '[% loc('Log in with email/text') | replace("'", "\\'") %]',
+        login_with_email: '[% loc('Log in with email/text', "JS") %]',
         [% ELSE ~%]
-        login_with_email: '[% loc('Log in with email') | replace("'", "\\'") %]',
+        login_with_email: '[% loc('Log in with email', "JS") %]',
         [% END ~%]
 
         report_a_problem_btn: {
-            default: '[% loc('Report a problem') | replace("'", "\\'") %]',
-            here: '[% loc('Report a problem here') | replace("'", "\\'") %]',
-            another: '[% loc('Report another problem here') | replace("'", "\\'") %]'
+            default: '[% loc('Report a problem', "JS") %]',
+            here: '[% loc('Report a problem here', "JS") %]',
+            another: '[% loc('Report another problem here', "JS") %]'
         },
 
         offline: {
-            your_reports: '[% loc('Your offline reports') | replace("'", "\\'") %]',
-            update_saved: '[% loc('Your update has been saved offline for submission when back online.') | replace("'", "\\'") %]',
-            update_data_saved: '[% loc('Offline update data saved') | replace("'", "\\'") %]',
-            clear_data: '[% loc('Clear offline data') | replace("'", "\\'") %]',
-            are_you_sure: '[% loc('Are you sure?') | replace("'", "\\'") %]',
-            data_cleared: '[% loc('Offline data cleared') | replace("'", "\\'") %]',
-            reports_saved: '[% loc('Reports saved offline.') | replace("'", "\\'") %]',
-            saving_reports: '[% loc('Saving reports offline', "This is followed by a progress count, e.g. 3/5") | replace("'", "\\'") %]',
-            you_are_offline: '[% loc('You are offline') | replace("'", "\\'") %]',
-            N_saved: '[% loc('<span>%s</span> saved.') | replace("'", "\\'") %]',
-            saved_to_submit: '[% loc('You have <a id="oFN" href=""><span>%s</span> saved to submit</a>.') | replace("'", "\\'") %]',
-            update_single: '[% loc('update') | replace("'", "\\'") %]',
-            update_plural: '[% loc('updates') | replace("'", "\\'") %]'
+            your_reports: '[% loc('Your offline reports', "JS") %]',
+            update_saved: '[% loc('Your update has been saved offline for submission when back online.', "JS") %]',
+            update_data_saved: '[% loc('Offline update data saved', "JS") %]',
+            clear_data: '[% loc('Clear offline data', "JS") %]',
+            are_you_sure: '[% loc('Are you sure?', "JS") %]',
+            data_cleared: '[% loc('Offline data cleared', "JS") %]',
+            reports_saved: '[% loc('Reports saved offline.', "JS") %]',
+            saving_reports: '[% loc('Saving reports offline', "This is followed by a progress count, e.g. 3/5", "JS") %]',
+            you_are_offline: '[% loc('You are offline', "JS") %]',
+            N_saved: '[% loc('<span>%s</span> saved.', "JS") %]',
+            saved_to_submit: '[% loc('You have <a id="oFN" href=""><span>%s</span> saved to submit</a>.', "JS") %]',
+            update_single: '[% loc('update', "JS") %]',
+            update_plural: '[% loc('updates', "JS") %]'
         }
     };
 [% END %]