diff options
Diffstat (limited to 'perllib/FixMyStreet')
| -rw-r--r-- | perllib/FixMyStreet/App.pm | 13 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Default.pm | 16 |
2 files changed, 9 insertions, 20 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 1d584accb..752263d10 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -278,8 +278,10 @@ sub send_email { from => FixMyStreet->config('CONTACT_EMAIL'), %{ $c->stash }, %$extra_stash_values, - additional_template_paths => - [ $c->cobrand->path_to_email_templates->stringify ] + additional_template_paths => [ + FixMyStreet->path_to( 'templates', 'email', $c->cobrand->moniker, $c->stash->{lang_code} )->stringify, + FixMyStreet->path_to( 'templates', 'email', $c->cobrand->moniker )->stringify, + ] }; # render the template @@ -292,12 +294,13 @@ sub send_email { # pass the email into mySociety::Email to construct the on the wire 7bit # format - this should probably happen in the transport instead but hohum. - my $email_text = mySociety::Email::construct_email( + my $email_text = mySociety::Locale::in_gb_locale { mySociety::Email::construct_email( { - _unwrapped_body_ => $email->body, # will get line wrapped + _template_ => $email->body, # will get line wrapped + _parameters_ => {}, $email->header_pairs } - ); + ) }; # send the email $c->model('EmailSend')->send($email_text); diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm index 4c7d7438a..1f1086c21 100644 --- a/perllib/FixMyStreet/Cobrand/Default.pm +++ b/perllib/FixMyStreet/Cobrand/Default.pm @@ -90,20 +90,6 @@ sub path_to_web_templates { return FixMyStreet->path_to( 'templates/web', $self->moniker ); } -=head2 path_to_email_templates - - $path = $cobrand->path_to_email_templates( ); - -Returns the path to the templates for this cobrand - by default -"templates/email/$moniker" - -=cut - -sub path_to_email_templates { - my $self = shift; - return FixMyStreet->path_to( 'templates/email', $self->moniker ); -} - =head1 site_restriction Return a site restriction clause and a site key if the cobrand uses a subset of @@ -625,7 +611,7 @@ sub email_host { my $cobrand_moniker_uc = uc( $self->moniker ); my $email_vhost = - mySociety::Config::get("EMAIL_VHOST_$cobrand_moniker_uc") + mySociety::Config::get("EMAIL_VHOST_$cobrand_moniker_uc", '') || mySociety::Config::get("EMAIL_VHOST") || ''; |