Make default front page form text non-GB specific.

7 files changed, 11 insertions, 16 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 5de8bac37..823278638 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -130,7 +130,7 @@ Parameter is QUERY
 
 =cut
 
-sub enter_postcode_text { '' }
+sub enter_postcode_text { _('Enter a nearby street name and area') }
 
 =head2 set_lang_and_domain
 
diff --git a/perllib/FixMyStreet/Cobrand/UK.pm b/perllib/FixMyStreet/Cobrand/UK.pm
index 093ba152b..7cbd9ecae 100644
--- a/perllib/FixMyStreet/Cobrand/UK.pm
+++ b/perllib/FixMyStreet/Cobrand/UK.pm
@@ -8,6 +8,11 @@ sub area_types          { return qw(DIS LBO MTD UTA CTY COI); }
 sub area_types_children { return @$mySociety::VotingArea::council_child_types }
 sub area_min_generation { 10 }
 
+sub enter_postcode_text {
+    my ( $self ) = @_;
+    return _("Enter a nearby GB postcode, or street name and area");
+}
+
 sub disambiguate_location {
     return {
         country => 'gb',
diff --git a/templates/web/default/around/around_index.html b/templates/web/default/around/around_index.html
index 012354f4a..55ed38341 100644
--- a/templates/web/default/around/around_index.html
+++ b/templates/web/default/around/around_index.html
@@ -8,9 +8,7 @@
 %]
 
 [%
-    question
-        =  c.cobrand.enter_postcode_text()
-        || loc("Enter a nearby GB postcode, or street name and area");
+    question =  c.cobrand.enter_postcode_text();
 %]
 
 <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm">
diff --git a/templates/web/default/index.html b/templates/web/default/index.html
index 4d178d192..8f755d4d5 100644
--- a/templates/web/default/index.html
+++ b/templates/web/default/index.html
@@ -22,9 +22,7 @@
 [% TRY %][% INCLUDE 'front/news.html' %][% CATCH file %][% END %]
 
 [%
-    question
-        =  c.cobrand.enter_postcode_text()
-        || loc("Enter a nearby GB postcode, or street name and area");
+    question =  c.cobrand.enter_postcode_text();
 %]
 
 <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm">
diff --git a/templates/web/emptyhomes/index.html b/templates/web/emptyhomes/index.html
index bd7261f49..60bdee70c 100644
--- a/templates/web/emptyhomes/index.html
+++ b/templates/web/emptyhomes/index.html
@@ -38,9 +38,7 @@ The TV series launched a campaign for action and while this is running, our <a h
 </p>
 
 [%
-    question
-        =  c.cobrand.enter_postcode_text()
-        || loc("Enter a nearby GB postcode, or street name and area");
+    question =  c.cobrand.enter_postcode_text();
 %]
 
 <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm">
diff --git a/templates/web/fixmystreet/around/around_index.html b/templates/web/fixmystreet/around/around_index.html
index d91ba928a..5ffddad4f 100644
--- a/templates/web/fixmystreet/around/around_index.html
+++ b/templates/web/fixmystreet/around/around_index.html
@@ -1,9 +1,7 @@
 [% pre_container_extra = BLOCK %]
 <div id="front-main"><div id="front-main-container">
 [%
-    question
-        =  c.cobrand.enter_postcode_text()
-        || loc("Enter a nearby GB postcode, or street name and area");
+    question =  c.cobrand.enter_postcode_text();
 %]
 <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm">
     <label for="pc">[% question %]:</label>
diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html
index 2acc108d2..ac25a1b9a 100644
--- a/templates/web/fixmystreet/index.html
+++ b/templates/web/fixmystreet/index.html
@@ -27,9 +27,7 @@ Modernizr.load({
         [% END %]
 
         [%
-            question
-                =  c.cobrand.enter_postcode_text()
-                || loc("Enter a nearby GB postcode, or street name and area");
+            question =  c.cobrand.enter_postcode_text();
         %]
 
         <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm">