StephanRichter/Widerhall
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Activity

Merge branch 'main' into lang_de

Browse Source
This commit is contained in:
Stephan Richter
2022-04-23 18:08:51 +02:00
parent 5530f08892 1ad9c7278e
commit 0e7ef745c4
4 changed files with 84 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/srsoftware/widerhall/mail/SmtpClient.java
View File

@@ -37,15 +37,15 @@ public class SmtpClient {
MimeMessage forward = new MimeMessage(session);
var oldSender = message.getFrom()[0].toString();
if (newSender != null){
var pos = subject.indexOf(" (from ");
var pos = subject.indexOf(" (von ");
while (pos > 0){
var end = subject.indexOf(')',pos);
if (end < pos) break;
subject = (subject.substring(0,pos)+subject.substring(end+1)).trim();
pos = subject.indexOf(" (from ");
pos = subject.indexOf(" (von ");
}
forward.setFrom(newSender);
forward.setSubject(subject+" (from "+oldSender+")");
forward.setSubject(subject+" (von "+oldSender+")");
} else {
forward.setFrom(oldSender);
forward.setSubject(subject);
@@ -57,7 +57,7 @@ public class SmtpClient {
MimeMultipart multipart = new MimeMultipart();
if (forwardAsAttachment){
MimeBodyPart bodyPart = new MimeBodyPart();
bodyPart.setText("Find the forwarded message in the attachment(s)!\n");
bodyPart.setText("Die weitergeleitete Nachricht findest du im Anhang dieser E-Mail!\n");
multipart.addBodyPart(bodyPart);
// create another body part to contain the message to be forwarded