Move location_offshore warning to standard location_error, so is shown in Ajax pin selection.

4 files changed, 4 insertions, 10 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Council.pm b/perllib/FixMyStreet/App/Controller/Council.pm
index b513ac930..fbdc5261f 100644
--- a/perllib/FixMyStreet/App/Controller/Council.pm
+++ b/perllib/FixMyStreet/App/Controller/Council.pm
@@ -88,7 +88,7 @@ sub load_and_check_councils : Private {
 
     # If we don't have any councils we can't accept the report
     if ( !scalar keys %$all_councils ) {
-        $c->stash->{location_offshore} = 1;
+        $c->stash->{location_error} = _('That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again.');
         return;
     }
 
diff --git a/templates/web/default/alert/index.html b/templates/web/default/alert/index.html
index f178f677f..1f0635ae4 100644
--- a/templates/web/default/alert/index.html
+++ b/templates/web/default/alert/index.html
@@ -14,9 +14,7 @@ within a certain distance of a particular location.') %]
 [% END %]
 </p>
 
-[% IF location_offshore %]
-  <div class="error">[% loc('That location does not appear to be covered by a council, perhaps it is offshore - please try somewhere more specific.') %]</div>
-[% ELSIF location_error %]
+[% IF location_error %]
   <div class="error">[% location_error %]</div>
 [% ELSE %]
   [% INCLUDE 'errors.html' %]
diff --git a/templates/web/default/around/around_index.html b/templates/web/default/around/around_index.html
index 55ed38341..aca7b3f4b 100644
--- a/templates/web/default/around/around_index.html
+++ b/templates/web/default/around/around_index.html
@@ -20,9 +20,7 @@
 
 </form>
 
-[% IF location_offshore %]
-  <p class="error">[% loc('That spot does not appear to be covered by a council. If you have tried to report an issue past the shoreline, for example, please specify the closest point on land.') %]</p>
-[% ELSIF location_error %]
+[% IF location_error %]
     <p class="error">[% location_error %]</p>
 [% END %]
 
diff --git a/templates/web/fixmystreet/around/around_index.html b/templates/web/fixmystreet/around/around_index.html
index 5ffddad4f..74e0d9ac7 100644
--- a/templates/web/fixmystreet/around/around_index.html
+++ b/templates/web/fixmystreet/around/around_index.html
@@ -26,9 +26,7 @@
     # '/report/new' and the partial hidden field is added to the form.
 %]
 
-[% IF location_offshore %]
-  <p class="form-error">[% loc('That spot does not appear to be covered by a council. If you have tried to report an issue past the shoreline, for example, please specify the closest point on land.') %]</p>
-[% ELSIF location_error %]
+[% IF location_error %]
     <p class="form-error">[% location_error %]</p>
 [% END %]