Split date format and time format in Psi webkit themes

psi-im · Oct 12, 2024 · 9ddd60f · 9ddd60f
1 parent b29c1f4
commit 9ddd60f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/themes/chatview/psi/LunnaCat_Classic/index.html b/themes/chatview/psi/LunnaCat_Classic/index.html
@@ -190,7 +190,7 @@
                 : "<div class='infmsg'>%icon%<b>*** %usertext%</b></div>",
             trackbar: '<hr class="trackbar" />'
         },
-        dateFormat : "HH:mm:ss",
+        timeFormat : "HH:mm:ss",
         proxy : function() { //optional
             if (shared.cdata.type == "settings") {
                 applyPsiSettings();

diff --git a/themes/chatview/psi/adapter.js b/themes/chatview/psi/adapter.js
@@ -79,7 +79,9 @@ function psiThemeAdapter(chat) {
             session : session,
             isMuc : session.isMuc,
             accountId : window.srvSession.account,
-            dateFormat : "HH:MM:SS",
+            timeFormat : "HH:mm:ss",
+            dateFormat : "LL",
+            dateTimeFormat: "LL HH:mm:ss",
             scroller : null,
             varHandlers : {},
             prevGrouppingData : null,
@@ -94,7 +96,7 @@ function psiThemeAdapter(chat) {
 
             TemplateTimeVar : function(name, format) {
                 this.name = name;
-                this.formatter = new chat.DateTimeFormatter(format || shared.dateFormat);
+                this.formatter = new chat.DateTimeFormatter(format || (name == "date"? shared.dateFormat : shared.timeFormat));
             },
 
             TemplateTemplateVar : function(template_name) {
@@ -155,7 +157,9 @@ function psiThemeAdapter(chat) {
                 }
                 var t = shared.templates;
                 shared.chatElement = config.chatElement;
+                shared.timeFormat = config.timeFormat || shared.timeFormat;
                 shared.dateFormat = config.dateFormat || shared.dateFormat;
+                shared.dateTimeFormat = config.dateTimeFormat || shared.dateTimeFormat;
                 shared.scroller = config.scroller || new chat.WindowScroller(false);
                 shared.groupping = config.groupping || shared.groupping;
                 proxy = config.proxy;
@@ -231,11 +235,8 @@ function psiThemeAdapter(chat) {
                 if (this.name == "sender") { //may not be html
                     d = chat.util.escapeHtml(d);
                 } else if (d instanceof Date) {
-                    if (this.name == "time") {
-                        d = chat.util.dateFormat(d, shared.dateFormat);
-                    } else { // last message date ?
-                        d = chat.util.dateFormat(d, "LL");
-                    }
+                    // "date" and "time" variables use TemplateTimeVar. this is something unknown
+                    d = chat.util.dateFormat(d, shared.dateTimeFormat);
                 } else if (this.name == "avatarurl") {
                     var url;
                     if (shared.cdata.local) {

diff --git a/themes/chatview/psi/bubble/index.html b/themes/chatview/psi/bubble/index.html
@@ -56,12 +56,12 @@
         messageGroupping: messageGroupping,
         sys: `<div class="sysmsg" title="%time{LL}%">%message%</div>`,
         sysMessageUT: `<div class="sysmsg" title="%time{LL}%">%message%<div class="usertext">%usertext%</div></div>`,
-        lastMsgDate: `<div class="sysmsg">%date{LL}%</div>`,
+        lastMsgDate: `<div class="sysmsg">%date%</div>`,
         subject: shared.isMuc?
                 "<div class='sysmsg' title='%time{LL}%'>%message%<div class='usertext'><b>%usertext%</b></div></div>"
                 : "<div class='sysmsg'><b>%usertext%</b></div>",
     },
-    dateFormat : "HH:mm",
+    timeFormat : "HH:mm",
     proxy : function() { //optional
         if (shared.cdata.type == "reactions") {
             renderReactions(shared.cdata);

diff --git a/themes/chatview/psi/classic/index.html b/themes/chatview/psi/classic/index.html
@@ -105,7 +105,6 @@
                 : "<div class='infmsg'>%icon%<b>*** %usertext%</b></div>",
             trackbar: '<hr class="trackbar" />'
         },
-        dateFormat : "HH:mm:ss",
         proxy : function() { //optional
             if (shared.cdata.type == "settings") {
                 applyPsiSettings();

diff --git a/themes/chatview/psi/new_classic/index.html b/themes/chatview/psi/new_classic/index.html
@@ -181,7 +181,7 @@
 
             left_time: '<div class="left_time"><div>%time%</div></div>'
         },
-        dateFormat : "HH:mm",
+        timeFormat : "HH:mm",
         proxy : function() { //optional
             if (shared.cdata.mtype == "message") {
                 return shared.cdata.emote && shared.templates.messageNC || null;

diff --git a/themes/chatview/psi/stylized_classic/index.html b/themes/chatview/psi/stylized_classic/index.html
@@ -211,7 +211,7 @@
                 : "<div class='infmsg'>%icon%<b>*** %usertext%</b></div>",
             trackbar: '<hr style="height:1px; border:1px solid black; border-color:#2d2d2d #5b5b5b #5b5b5b #2d2d2d" />'
         },
-        dateFormat : "HH:mm",
+        timeFormat : "HH:mm",
         proxy : function() { //optional
             if (shared.cdata.mtype == "message") {
                 return shared.cdata.emote && shared.templates.messageNC ||