Merge branch 'main' into lang_de

2022-04-22 13:06:41 +02:00
parent 4a543b16f6 b9b3196ae6
commit 05b58cc186
17 changed files with 613 additions and 145 deletions
--- a/src/main/java/de/srsoftware/widerhall/data/User.java
+++ b/src/main/java/de/srsoftware/widerhall/data/User.java
@@ -266,7 +266,7 @@ public class User {
     * @return
     */
    public Map<String,String> safeMap(){
-        return Map.of(NAME,name,EMAIL,email,PERMISSIONS,permissionList(),PASSWORD,hashedPassword() == null ? "no" : "yes");
+        return Map.of(NAME,name,EMAIL,email,PERMISSIONS,permissionList(),PASSWORD,hashedPassword() == null ? "nein" : "ja");
    }

    /**