11 files changed, 16 insertions, 11 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 854f6da89..abe8796b5 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -187,10 +187,13 @@ sub open311_config {
 
     # make sure we have last_name attribute present in row's extra, so
     # it is passed correctly to Bromley as attribute[]
-    if ( $row->cobrand ne 'bromley' ) {
+    if (!$row->get_extra_field_value('last_name')) {
         my ( $firstname, $lastname ) = ( $row->name =~ /(\S+)\.?\s+(.+)/ );
         push @$extra, { name => 'last_name', value => $lastname };
     }
+    if (!$row->get_extra_field_value('fms_extra_title') && $row->user->title) {
+        push @$extra, { name => 'fms_extra_title', value => $row->user->title };
+    }
 
     $row->set_extra_fields(@$extra);
 
diff --git a/perllib/FixMyStreet/Geocode/OSM.pm b/perllib/FixMyStreet/Geocode/OSM.pm
index 6e6dbfbb1..b979e2a10 100644
--- a/perllib/FixMyStreet/Geocode/OSM.pm
+++ b/perllib/FixMyStreet/Geocode/OSM.pm
@@ -14,8 +14,8 @@ use Memcached;
 use XML::Simple;
 use Utils;
 
-my $osmapibase    = "http://www.openstreetmap.org/api/";
-my $nominatimbase = "http://nominatim.openstreetmap.org/";
+my $osmapibase    = "https://www.openstreetmap.org/api/";
+my $nominatimbase = "https://nominatim.openstreetmap.org/";
 
 # string STRING CONTEXT
 # Looks up on Nominatim, and caches, a user-inputted location.
diff --git a/t/app/sendreport/open311.t b/t/app/sendreport/open311.t
index 54aaa39d0..3e2e7b3cb 100644
--- a/t/app/sendreport/open311.t
+++ b/t/app/sendreport/open311.t
@@ -75,6 +75,7 @@ my $bromley_check =
             { name => 'email_alerts_requested', value => 'FALSE' },
             { name => 'requested_datetime', value => re(qr/^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)/) },
             { name => 'email', value => TEST_USER_EMAIL },
+            { name => 'fms_extra_title', value => 'MR' },
             { name => 'last_name', value => 'Bloggs' },
         ),
     });
@@ -179,6 +180,7 @@ sub test_overrides {
                     name => 'Fred Bloggs',
                     email => TEST_USER_EMAIL,
                     password => 'dummy',
+                    title => 'MR',
             });
 
             my $row = $db->resultset('Problem')->create( {
diff --git a/templates/email/default/alert-update.html b/templates/email/default/alert-update.html
index 1f1591b3d..0f7c30481 100644
--- a/templates/email/default/alert-update.html
+++ b/templates/email/default/alert-update.html
@@ -1,7 +1,7 @@
 [%
 
 title = report.title | html;
-email_summary = "New updates on “" _ title _ "”";
+email_summary = "New updates on “" _ title _ "”";
 email_columns = 2;
 
 PROCESS '_email_settings.html';
diff --git a/templates/email/default/contact.html b/templates/email/default/contact.html
index 6eac4282a..301245f1b 100644
--- a/templates/email/default/contact.html
+++ b/templates/email/default/contact.html
@@ -2,7 +2,7 @@
 
 subject_html = subject | html;
 name = form_name | html;
-email_summary = "“" _ subject_html _ "” – Message from " _ name _ " on " _ host;
+email_summary = "“" _ subject_html _ "” – Message from " _ name _ " on " _ host;
 email_footer = "Sent via " _ host _ ", IP " _ ip;
 email_columns = 1;
 
diff --git a/templates/email/fixamingata/contact.html b/templates/email/fixamingata/contact.html
index 2b71eaea8..b182e48a5 100644
--- a/templates/email/fixamingata/contact.html
+++ b/templates/email/fixamingata/contact.html
@@ -2,7 +2,7 @@
 
 subject_html = subject | html;
 name = form_name | html;
-email_summary = "“" _ subject_html _ "” – Meddelande från " _ name _ " hos " _ host;
+email_summary = "“" _ subject_html _ "” – Meddelande från " _ name _ " hos " _ host;
 email_footer = "Skickat via " _ host _ " och IP-adressen " _ ip;
 email_columns = 1;
 
diff --git a/templates/email/lincolnshire/contact.html b/templates/email/lincolnshire/contact.html
index 23a3c01ff..a1be947de 100644
--- a/templates/email/lincolnshire/contact.html
+++ b/templates/email/lincolnshire/contact.html
@@ -2,7 +2,7 @@
 
 subject_html = subject | html;
 name = form_name | html;
-email_summary = "“" _ subject_html _ "” – Message from " _ name _ " on " _ host;
+email_summary = "“" _ subject_html _ "” – Message from " _ name _ " on " _ host;
 email_footer = "Sent via " _ host _ ", IP " _ ip;
 email_columns = 1;
 
diff --git a/templates/web/base/alert/_index_text.html b/templates/web/base/alert/_index_text.html
index 92e84478e..80ed142d1 100644
--- a/templates/web/base/alert/_index_text.html
+++ b/templates/web/base/alert/_index_text.html
@@ -11,7 +11,7 @@ within a certain distance of a particular location.', "%s is the site name"), si
 </p>
 
 [% IF location_error %]
-  <div class="error">[% location_error %]</div>
+  <div class="error">[% location_error | safe %]</div>
 [% ELSE %]
   [% INCLUDE 'errors.html' %]
 [% END %]
diff --git a/templates/web/base/around/location_error.html b/templates/web/base/around/location_error.html
index fc9b2b8ce..8e1a75008 100644
--- a/templates/web/base/around/location_error.html
+++ b/templates/web/base/around/location_error.html
@@ -1 +1 @@
-<p class="form-error">[% location_error %]</p>
+<p class="form-error">[% location_error | safe %]</p>
diff --git a/templates/web/cheshireeast/alert/_index_text.html b/templates/web/cheshireeast/alert/_index_text.html
index c2eedf7bb..321a0b85c 100644
--- a/templates/web/cheshireeast/alert/_index_text.html
+++ b/templates/web/cheshireeast/alert/_index_text.html
@@ -5,7 +5,7 @@ problems within a certain distance of a particular location.
 </p>
 
 [% IF location_error %]
-  <div class="error">[% location_error %]</div>
+  <div class="error">[% location_error | safe %]</div>
 [% ELSE %]
   [% INCLUDE 'errors.html' %]
 [% END %]
diff --git a/templates/web/peterborough/alert/_index_text.html b/templates/web/peterborough/alert/_index_text.html
index 281c662b1..1c7f025c5 100644
--- a/templates/web/peterborough/alert/_index_text.html
+++ b/templates/web/peterborough/alert/_index_text.html
@@ -5,7 +5,7 @@ problems within a certain distance of a particular location.
 </p>
 
 [% IF location_error %]
-  <div class="error">[% location_error %]</div>
+  <div class="error">[% location_error | safe %]</div>
 [% ELSE %]
   [% INCLUDE 'errors.html' %]
 [% END %]