Merge branch 'master' of https://github.com/javaBin/cake-redux

Author: marek-fm

deploy.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+export LANG=en_US.UTF-8
 BASEDIR=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
 
 # resolve symlinks

src/main/java/no/javazone/cake/redux/AcceptorSetter.java

@@ -170,12 +170,17 @@ 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:
+        String langRead = jsonTalk.stringValue("lang").orElse("x");
+        switch (langRead) {
+            case "en":
                 language = "English";
                 break;
+            case "no":
+                language = "Norwegian";
+                break;
+            default:
+                language = "Not registered";
+                break;
         }
 
         String message = template;