Merge branch 'issues/forcouncils/6-oxfordshire-photo-guidance'

10 files changed, 40 insertions, 22 deletions

diff --git a/templates/web/base/questionnaire/index.html b/templates/web/base/questionnaire/index.html
index b4595bbcd..52d5ed5b1 100644
--- a/templates/web/base/questionnaire/index.html
+++ b/templates/web/base/questionnaire/index.html
@@ -74,7 +74,9 @@
 
 [% IF c.cobrand.allow_photo_upload %]
     <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
-    <label for="form_photo">[% loc('Photo') %]</label>
+    <label for="form_photo">
+        <span data-singular="[% loc('Photo') %]" data-plural="[% loc('Photos') %]">[% loc('Photo') %]</span>
+    </label>
 
       [% IF field_errors.photo %]
         <p class='form-error'>[% field_errors.photo %]</p>
diff --git a/templates/web/base/report/new/after_photo.html b/templates/web/base/report/new/after_photo.html
new file mode 100644
index 000000000..3fed031a8
--- /dev/null
+++ b/templates/web/base/report/new/after_photo.html
@@ -0,0 +1,10 @@
+<div class="description_tips">
+  <h4>[% loc('Tips for perfect photos') %]</h4>
+    <ul class="do">
+        <li>[% loc('Show what the problem is') %]</li>
+        <li>[% loc('Show where it’s located') %]</li>
+    </ul>
+    <ul class="dont">
+        <li>[% loc('Avoid personal information and vehicle number plates') %]</li>
+    </ul>
+</div>
diff --git a/templates/web/base/report/new/form_report.html b/templates/web/base/report/new/form_report.html
index bbb57ef4e..d9320d166 100644
--- a/templates/web/base/report/new/form_report.html
+++ b/templates/web/base/report/new/form_report.html
@@ -20,8 +20,10 @@
 
 [% IF c.cobrand.allow_photo_upload %]
     <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
-    <label for="form_photo">[% loc('Photo') %]
-        [% INCLUDE 'report/public_label.html' %]</label>
+    <label for="form_photo">
+        <span data-singular="[% loc('Photo') %]" data-plural="[% loc('Photos') %]">[% loc('Photo') %]</span>
+        [% INCLUDE 'report/public_label.html' %]
+    </label>
 
   [% IF field_errors.photo %]
     <p class='form-error'>[% field_errors.photo %]</p>
diff --git a/templates/web/base/report/update/form_update.html b/templates/web/base/report/update/form_update.html
index ef87d9de0..55125ba4b 100644
--- a/templates/web/base/report/update/form_update.html
+++ b/templates/web/base/report/update/form_update.html
@@ -3,7 +3,9 @@
 
 [% IF c.cobrand.allow_photo_upload %]
     <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
-    <label for="form_photo">[% loc('Photo') %]</label>
+    <label for="form_photo">
+        <span data-singular="[% loc('Photo') %]" data-plural="[% loc('Photos') %]">[% loc('Photo') %]</span>
+    </label>
 
       [% IF field_errors.photo %]
         <p class='form-error'>[% field_errors.photo %]</p>
diff --git a/templates/web/bromley/report/display.html b/templates/web/bromley/report/display.html
index 1aa78ad13..e556098bf 100644
--- a/templates/web/bromley/report/display.html
+++ b/templates/web/bromley/report/display.html
@@ -37,7 +37,9 @@
 
         [% IF c.cobrand.allow_photo_upload %]
             <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
-            <label for="form_photo">[% loc('Photo') %]</label>
+            <label for="form_photo">
+                <span data-singular="[% loc('Photo') %]" data-plural="[% loc('Photos') %]">[% loc('Photo') %]</span>
+            </label>
 
               [% IF field_errors.photo %]
                 <p class='form-error'>[% field_errors.photo %]</p>
diff --git a/templates/web/bromley/report/new/fill_in_details_form.html b/templates/web/bromley/report/new/fill_in_details_form.html
index bce8220dd..d89e5d3d5 100644
--- a/templates/web/bromley/report/new/fill_in_details_form.html
+++ b/templates/web/bromley/report/new/fill_in_details_form.html
@@ -50,7 +50,9 @@
 
           [% IF c.cobrand.allow_photo_upload %]
             <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
-            <label for="form_photo">[% loc('Photo') %]</label>
+            <label for="form_photo">
+                <span data-singular="[% loc('Photo') %]" data-plural="[% loc('Photos') %]">[% loc('Photo') %]</span>
+            </label>
 
               [% IF field_errors.photo %]
                 <p class='form-error'>[% field_errors.photo %]</p>
@@ -113,7 +115,7 @@
 
                     <label for="form_phone">[% loc('Phone number (optional)') %]</label>
                     <input class="" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
-            
+
                         <div class="general-notes">
                             <p>[% loc('We never show your email address or phone number.') %]</p>
                         </div>
@@ -159,7 +161,7 @@
 
                         <label class="form-focus-hidden" for="form_phone">[% loc('Phone number (optional)') %]</label>
                         <input class="form-focus-hidden" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
-                
+
                         <div class="general-notes form-focus-hidden">
                             <p>[% loc('We never show your email address or phone number.') %]</p>
                         </div>
@@ -188,7 +190,7 @@
                             <input type="password" name="password_sign_in" id="password_sign_in" placeholder="[% loc('Your password') %]" value="">
                             <input class="green-btn js-submit_sign_in" type="submit" name="submit_sign_in" value="[% loc('Submit') %]">
                         </div>
-                        
+
                         <div class="checkbox-group">
                             <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
                             <label class="n inline" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
diff --git a/templates/web/fixmystreet.com/report/new/after_photo.html b/templates/web/fixmystreet.com/report/new/after_photo.html
deleted file mode 100644
index 3977d80a6..000000000
--- a/templates/web/fixmystreet.com/report/new/after_photo.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="description_tips">
-  <h4>Tips for perfect photos</h4>
-    <ul class="do">
-        <li>Show what the problem is</li>
-        <li>Show where it’s located</li>
-    </ul>
-    <ul class="dont">
-        <li>Avoid personal information and vehicle number plates</li>
-    </ul>
-</div>
diff --git a/templates/web/seesomething/report/new/fill_in_details_form.html b/templates/web/seesomething/report/new/fill_in_details_form.html
index b527e8109..54977f141 100644
--- a/templates/web/seesomething/report/new/fill_in_details_form.html
+++ b/templates/web/seesomething/report/new/fill_in_details_form.html
@@ -50,7 +50,9 @@
 
             [% IF c.cobrand.allow_photo_upload %]
                 <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
-                <label for="form_photo">[% loc('Photo') %]</label>
+                <label for="form_photo">
+                    <span data-singular="[% loc('Photo') %]" data-plural="[% loc('Photos') %]">[% loc('Photo') %]</span>
+                </label>
                 [% IF field_errors.photo %]
                     <p class='form-error'>[% field_errors.photo %]</p>
                 [% END %]
@@ -88,7 +90,7 @@
 
             <label class="" for="form_phone">[% loc('Phone number (optional)') %]</label>
             <input class="" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
-    
+
             <div class="form-txt-submit-box ">
                 <input class="green-btn" type="submit" id="submit_noname" name="submit_noname" value="[% loc('Submit') %]">
             </div>
diff --git a/templates/web/zurich/report/new/fill_in_details_form.html b/templates/web/zurich/report/new/fill_in_details_form.html
index 20641b7a6..9158fa090 100644
--- a/templates/web/zurich/report/new/fill_in_details_form.html
+++ b/templates/web/zurich/report/new/fill_in_details_form.html
@@ -17,7 +17,7 @@
           [% IF c.cobrand.allow_photo_upload %]
             <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
                 <label for="form_photo">
-                    [% loc('Photo') %]
+                    <span data-singular="[% loc('Photo') %]" data-plural="[% loc('Photos') %]">[% loc('Photo') %]</span>
                     [% loc('(Defect &amp; location of defect)') %]
                 </label>
 
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 682813070..b6f92b6d6 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -449,6 +449,9 @@ $.extend(fixmystreet.set_up, {
       var $dropzone = $('<div>').addClass('dropzone');
 
       $originalLabel.removeAttr('for');
+      $('[data-plural]', $originalLabel).text(
+          $('[data-plural]', $originalLabel).attr('data-plural')
+      );
       $originalInput.hide();
 
       $dropzone.insertAfter($originalInput);
@@ -468,6 +471,9 @@ $.extend(fixmystreet.set_up, {
         fallback: function() {
           $dropzone.remove();
           $originalLabel.attr('for', 'form_photo');
+          $('[data-singular]', $originalLabel).text(
+              $('[data-singular]', $originalLabel).attr('data-singular')
+          );
           $originalInput.show();
         },
         init: function() {