Add back localized time with tag localeTime

Fixes #63
mikehardy · May 28, 2020 · f786420 · f786420
1 parent e800e6b
commit f786420
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/chrome/thunderlink/content/preferences.xul b/chrome/thunderlink/content/preferences.xul
@@ -108,7 +108,7 @@
       <label control="csLabel" value="You can use the following placeholders:"/>
       <spacer size="5"/>
       <label control="csLabel" value="&#60;thunderlink&#62; &#60;messageid&#62; &#60;subject&#62; &#60;filteredSubject&#62;"/>
-      <label control="csLabel" value="&#60;tbexe&#62; &#60;dateTime&#62; &#60;date&#62; &#60;time&#62;"/>
+      <label control="csLabel" value="&#60;tbexe&#62; &#60;dateTime&#62; &#60;date&#62; &#60;time&#62; &#60;localeTime&#62;"/>
       <label control="csLabel" value="&#60;sender&#62; &#60;senderName&#62; &#60;senderEmail&#62;"/>
       <separator class="groove-thin"/>
       <label control="csLabel" value="Some characters need to be escaped with baskslash:"/>

diff --git a/modules/thunderlinkModule.js b/modules/thunderlinkModule.js
@@ -187,6 +187,8 @@ function replaceVariables(template, hdr) {
   const splitDateTime = date.toISOString().split("T");
   const dateString = splitDateTime[0];
   const timeString = splitDateTime[1].substring(0, splitDateTime[1].length-1);
+  const localeDateString = date.toLocaleDateString() + " - " + date.toLocaleTimeString();
+  result = result.replace(/<localeTime>/ig, localeDateString);
   result = result.replace(/<time>/ig, isoDate);
   result = result.replace(/<date>/ig, dateString);
   result = result.replace(/<dateTime>/ig, timeString);