diff --git a/js/osticket.js b/js/osticket.js
index bd2f937e61af3b5f7cabd3b53e1d635cbb324486..3d82e2ba1152960450a75e0f2c3ccdd428af7edb 100644
--- a/js/osticket.js
+++ b/js/osticket.js
@@ -173,13 +173,21 @@ getConfig = (function() {
 
 $.translate_format = function(str) {
     var translation = {
-        'd':'dd',
-        'j':'d',
-        'z':'o',
-        'm':'mm',
-        'F':'MM',
-        'n':'m',
-        'Y':'yy'
+        'DD':   'oo',
+        'D':    'o',
+        'EEEE': 'DD',
+        'EEE':  'D',
+        'MMMM': '||',   // Double replace necessary
+        'MMM':  '|',
+        'MM':   'mm',
+        'M':    'm',
+        '||':   'MM',
+        '|':    'M',
+        'yyyy': '`',
+        'yyy':  '`',
+        'yy':   'y',
+        'y':    'yy',
+        '`':    'yy'
     };
     // Change PHP formats to datepicker ones
     $.each(translation, function(php, jqdp) {