diff --git a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDateTimeFormatOptions.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDateTimeFormatOptions.java index a9c545cc01..5aafbd178b 100644 --- a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDateTimeFormatOptions.java +++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDateTimeFormatOptions.java @@ -41,12 +41,16 @@ public class TbDateTimeFormatOptions { String patternTime = ""; delimiterValidation(); + if ("short".equals(weekday)) { + patternDate = "E, "; + } else if ("long".equals(weekday)) { + patternDate = "EEEE, "; + } if ("numeric".equals(day)) { - patternDate = "d"; + patternDate += "d"; } else if ("2-digit".equals(day)) { - patternDate = "dd"; + patternDate += "dd"; } - if ("numeric".equals(month)) { patternDate = patternDate.isEmpty() ? "M" : patternDate + delimiter + "M"; } else if ("2-digit".equals(month)) {