Merge branch 'zurich'

Conflicts:
	locale/FixMyStreet.po
	locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po
	locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
	locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
	locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po

1 files changed, 14 insertions, 1 deletions

diff --git a/perllib/FixMyStreet/SendReport/Zurich.pm b/perllib/FixMyStreet/SendReport/Zurich.pm
index 4930ff61e..d46561e9e 100644
--- a/perllib/FixMyStreet/SendReport/Zurich.pm
+++ b/perllib/FixMyStreet/SendReport/Zurich.pm
@@ -51,9 +51,22 @@ sub get_template {
     return $template;
 }
 
-# Zurich emails come from the site itself
+# Zurich emails come from the site itself, unless it's to an external body,
+# in which case it's from the category/body
 sub send_from {
     my ( $self, $row ) = @_;
+
+    if ( $row->external_body ) {
+        my $body = @{ $self->bodies }[0];
+        my $body_email = $body->endpoint;
+        my $contact = FixMyStreet::App->model("DB::Contact")->find( {
+            body_id => $body->id,
+            category => $row->category
+        } );
+        $body_email = $contact->email if $contact && $contact->email;
+        return [ $body_email, FixMyStreet->config('CONTACT_NAME') ];
+    }
+
     return [ FixMyStreet->config('CONTACT_EMAIL'), FixMyStreet->config('CONTACT_NAME') ];
 }