Release v2.6.21

src/web/public/js/shared/placeholder-utils.js

@@ -245,6 +245,10 @@
     }
   }
 
+  function getTimeZoneLongName(timeZone) {
+    return getTransformTimeZone([], { timeZone: timeZone });
+  }
+
   function getTransformTimeZone(args, options) {
     return resolveTimeZone((args && args[0]) || (options && options.timeZone) || '');
   }
@@ -273,11 +277,11 @@
     }
 
     if (name === 'tz') {
-      return getTransformTimeZone(args, options);
+      return getTimeZoneShortName(value, getTransformTimeZone(args, options));
     }
 
-    if (name === 'tz_short') {
-      return getTimeZoneShortName(value, getTransformTimeZone(args, options));
+    if (name === 'tz_long') {
+      return getTimeZoneLongName(getTransformTimeZone(args, options));
     }
 
     return text;

src/web/public/js/shared/time-date-placeholders.js

@@ -24,8 +24,8 @@
   ];
 
   var HELPER_PLACEHOLDERS = [
-    { token: 'tz', output: 'Europe/London', description: 'The resolved time zone name' },
-    { token: 'tz_short', output: 'BST/GMT', description: 'The time zone abbreviation for the selected date' }
+    { token: 'tz', output: 'BST/GMT', description: 'The time zone abbreviation for the selected date' },
+    { token: 'tz_long', output: 'Europe/London', description: 'The resolved time zone name' }
   ];
 
   var PLACEHOLDERS = FORMAT_PLACEHOLDERS.concat(HELPER_PLACEHOLDERS);