Browse Source

Merge branch 'main' into lang_de

lang_de
Stephan Richter 8 months ago
parent
commit
70d32a9048
  1. 2
      pom.xml
  2. 1
      src/main/java/de/srsoftware/widerhall/data/User.java
  3. 2
      src/main/java/de/srsoftware/widerhall/mail/SmtpClient.java
  4. 2
      src/main/java/de/srsoftware/widerhall/web/Web.java
  5. 5
      static/templates/footer.st

2
pom.xml

@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
<groupId>org.example</groupId>
<artifactId>Widerhall</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
<build>
<plugins>
<plugin>

1
src/main/java/de/srsoftware/widerhall/data/User.java

@ -9,6 +9,7 @@ import java.time.LocalDate; @@ -9,6 +9,7 @@ import java.time.LocalDate;
import java.util.*;
import static de.srsoftware.widerhall.Constants.*;
import static de.srsoftware.widerhall.Util.t;
/**
* @author Stephan Richter

2
src/main/java/de/srsoftware/widerhall/mail/SmtpClient.java

@ -11,6 +11,8 @@ import java.util.Date; @@ -11,6 +11,8 @@ import java.util.Date;
import java.util.List;
import java.util.Properties;
import static de.srsoftware.widerhall.Util.t;
public class SmtpClient {
private static final Logger LOG = LoggerFactory.getLogger(SmtpClient.class);
private static final String HOST = "mail.smtp.host";

2
src/main/java/de/srsoftware/widerhall/web/Web.java

@ -463,7 +463,7 @@ public class Web extends TemplateServlet { @@ -463,7 +463,7 @@ public class Web extends TemplateServlet {
if (email == null || email.isBlank() ||
name == null || name.isBlank() ||
pass == null || pass.isBlank() ||
pass_repeat == null || pass_repeat.isBlank()) return loadTemplate(REGISTER,Map.of(ERROR,t"Fill all fields, please!"),NAME,name,EMAIL,email),resp);
pass_repeat == null || pass_repeat.isBlank()) return loadTemplate(REGISTER,Map.of(ERROR,t("Fill all fields, please!"),NAME,name,EMAIL,email),resp);
if (!pass.equals(pass_repeat)) return loadTemplate(REGISTER,Map.of(ERROR,t("Passwords do not match!"),NAME,name,EMAIL,email),resp);
if (Util.simplePassword(pass)) return loadTemplate(REGISTER,Map.of(ERROR,t("Password to short or to simple!"),NAME,name,EMAIL,email),resp);

5
static/templates/footer.st

@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
<div class="footer">
Widerhall Mail-Verteiler. Version 1.0.1. Hol dir den Quellcode auf <a target="_blank" href="https://git.srsoftware.de/StephanRichter/Widerhall/src/branch/lang_de">git.srsoftware.de</a>
Widerhall Mail-Verteiler.
Version 1.0.2.
Hol dir den Quellcode auf <a target="_blank" href="https://git.srsoftware.de/StephanRichter/Widerhall/src/branch/lang_de">git.srsoftware.de</a>
</div>

Loading…
Cancel
Save