Add "all" trOver in mails (Fixes: #1586)

7 years ago · 3cd14656f5
parent dc0e173cf2
commit 3cd14656f5
1 changed files with 5 additions and 2 deletions
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SMTP.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SMTP.pm
@ -100,7 +100,10 @@ sub translate {
    my $langOver = from_json( $self->p->trOver, { allow_nonref => 1 } );

    if ($langOver) {
-        for my $k ( keys %{ $langOver->{$lang_code} } ) {
+        for my $k ( keys %{ $langOver->{all} || {} } ) {
+            $lang->{$k} = $langOver->{$lang_code}->{$k};
+        }
+        for my $k ( keys %{ $langOver->{$lang_code} || {} } ) {
            $lang->{$k} = $langOver->{$lang_code}->{$k};
        }
    }
@ -181,7 +184,7 @@ sub send_mail {
            foreach ( keys %cid ) {
                $message->attach(
                    Type => "image/" . ( $cid{$_} =~ m/\.(\w+)/ )[0],
-                    Id => $_,
+                    Id   => $_,
                    Path => $self->p->{templateDir} . "/" . $cid{$_},
                );
            }