diff options
8 files changed, 30 insertions, 12 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/form_report.html b/templates/web/base/report/new/form_report.html index 3fbf7c160..007d98b76 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 007bd68d8..0645cad41 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 f30824385..073d0f6d6 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 96f23d1fb..c25d836c6 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" type="submit" id="submit_sign_in" 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/seesomething/report/new/fill_in_details_form.html b/templates/web/seesomething/report/new/fill_in_details_form.html index 728b27e41..fa1c5cbb2 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 21acab609..f7139fccd 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 & location of defect)') %] </label> diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 5ab750679..50cbc53c5 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -484,6 +484,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); @@ -503,6 +506,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() { |