Updates to acceptor template on 2024.

anders88 · anders88 · commit c5324b6bca4a · 2024-06-11T15:46:07.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <kotlin.version>1.3.60</kotlin.version>
+        <kotlin.version>1.8.0</kotlin.version>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
     </properties>
 
diff --git a/src/main/java/no/javazone/cake/redux/AcceptorSetter.java b/src/main/java/no/javazone/cake/redux/AcceptorSetter.java
@@ -29,7 +29,7 @@ public String accept(JsonArray talks,UserWithAccess userWithAccess) {
         String template = loadTemplate();
         String tagToAdd = "accepted";
         String tagExistsErrormessage = "Talk is already accepted";
-        String subjectTemplate = "JavaZone 2023 #talkType# accepted";
+        String subjectTemplate = "JavaZone 2024 #talkType# accepted";
 
         return doUpdates(talks, template, subjectTemplate, tagToAdd, tagExistsErrormessage,userWithAccess,false);
     }
@@ -168,14 +168,25 @@ private String replaceAll(String s, String code,String replacement) {
     }
 
     protected String generateMessage(String template, String title, String talkType, String speakerName, String submitLink, String confirmLocation, JsonObject jsonTalk, String encodedTalkRef) {
+        String length = jsonTalk.stringValue("length").orElse("NA");
+        String language;
+        switch (jsonTalk.stringValue("language").orElse("x")) {
+            case "en": language = "English";
+            case "no": language = "Norwegian";
+            default:
+                language = "English";
+                break;
+        }
+
         String message = template;
         message = replaceAll(message,"#title#", title);
         message = replaceAll(message,"#speakername#", speakerName);
         message = replaceAll(message,"#talkType#", talkType);
         message = replaceAll(message,"#submititLink#", submitLink);
         message = replaceAll(message,"#confirmLink#", confirmLocation);
         message = replaceAll(message,"#talkid#", encodedTalkRef);
-
+        message = replaceAll(message,"#length#", length);
+        message = replaceAll(message,"#language#", language);
 
         for (int pos=message.indexOf("#");pos!=-1;pos=message.indexOf("#",pos+1)) {
             if (pos == message.length()-1) {
diff --git a/src/main/resources/acceptanceTemplate.html b/src/main/resources/acceptanceTemplate.html
@@ -3,7 +3,7 @@
 
 <p><b>Dear #speakername#</b></p>
 
-<p>We are pleased to inform you that your #talkType#, "#title#", has been accepted for JavaZone 2023!</p>
+<p>We are pleased to inform you that your #talkType#, "#title#", has been accepted for JavaZone 2024! (Duration is registered as #length# minutes, and registered language is #language#</p>
 
 
 <h2>CONFIRM YOUR TALK</h2>
diff --git a/src/main/resources/webapp/confirm.html b/src/main/resources/webapp/confirm.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html ng-app="cakeOpen">
 <head>
-    <title>JavaZone 2023 speaker confirmation</title>
+    <title>JavaZone 2024 speaker confirmation</title>
     <script src="scripts/ext/jquery-2.1.0.min.js"></script>
     <script src="scripts/ext/underscore-min.js"></script>
     <!-- Latest compiled and minified CSS -->
@@ -21,8 +21,8 @@
 <body ng-controller="ConfirmCtrl">
 <h1 class="col-xs-offset-1">JavaZone speaker confirmation</h1>
 <div class="col-xs-offset-1 col-md-9 row" ng-show="showMain">
-    <p>By pressing the button below you confirm that you will be speaking at JavaZone 2023.</p>
-    <p>We would also like to know if you are planning on attending the speakers dinner. The speakers dinner will be at 19:00 on September 5th.</p>
+    <p>By pressing the button below you confirm that you will be speaking at JavaZone 2024.</p>
+    <p>We would also like to know if you are planning on attending the speakers dinner. The speakers dinner will be at 19:00 on September 3rd.</p>
     <p>
     <div class="radio">
         <label>
