Added long date format support (issue moment#29)

rachel-carvalho · Oct 21, 2011 · d440e4e · d440e4e
1 parent 1284b49
commit d440e4e
Show file tree

Hide file tree

Showing 15 changed files with 134 additions and 28 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -569,6 +569,26 @@ <h2>Formatted Date</h2>
                     <td>z</td>
                     <td>EST CST ... MST PST</td>
                 </tr>
+                <tr>
+                    <td><b>Long date</b></td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td>L</td>
+                    <td>07/10/1986</td>
+                </tr>
+                <tr>
+                    <td>LL</td>
+                    <td>July 10 1986</td>
+                </tr>
+                <tr>
+                    <td>LLL</td>
+                    <td>July 10 1986 8:30 PM</td>
+                </tr>
+                <tr>
+                    <td>LLLL</td>
+                    <td>Saturday, July 10 1986 8:30 PM</td>
+                </tr>
             </table>
             <a name="/display/from"></a>
             <h2>Time from another moment</h2>
@@ -782,6 +802,12 @@ <h2>Changing languages</h2>
     monthsShort : "Jan_Fev_Mar_Avr_Mai_Juin_Juil_Aou_Sep_Oct_Nov_Dec".split("_"),
     weekdays : "Dimanche_Lundi_Mardi_Mercredi_Jeudi_Vendredi_Samedi".split("_"),
     weekdaysShort : "Dim_Lun_Mar_Mer_Jeu_Ven_Sam".split("_"),
+    longDateFormat : { 
+        L : "DD/MM/YYYY",
+        LL : "D MMMM YYYY",
+        LLL : "D MMMM YYYY HH:mm",
+        LLLL : "dddd, D MMMM YYYY HH:mm"
+    },
     relativeTime : {
         future : "in %s",
         past : "il y a %s",
@@ -885,6 +911,18 @@ <h2>Weekday Abbreviations</h2>
             <p>
 <pre>
 moment.weekdaysShort = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+</pre>
+            <a name="/custom/longDateFormats"></a>
+            <h2>Long Date Formats</h2>
+            <p><code>moment.longDateFormat</code> should be an object containing a key/value pair for each long date format (L, LL, LLL, LLLL).</p>
+            <p>
+<pre>
+moment.longDateFormat = { 
+    L: "MM/DD/YYYY",
+    LL: "MMMM D YYYY",
+    LLL: "MMMM D YYYY h:mm A",
+    LLLL: "dddd, MMMM D YYYY h:mm A"
+};
 </pre>
             </p>
             <a name="/custom/relativeTime"></a>

diff --git a/lang/all.min.js b/lang/all.min.js
diff --git a/lang/fr.js b/lang/fr.js
@@ -4,6 +4,14 @@
             monthsShort : "Jan_Fev_Mar_Avr_Mai_Juin_Juil_Aou_Sep_Oct_Nov_Dec".split("_"),
             weekdays : "Dimanche_Lundi_Mardi_Mercredi_Jeudi_Vendredi_Samedi".split("_"),
             weekdaysShort : "Dim_Lun_Mar_Mer_Jeu_Ven_Sam".split("_"),
+            // based on this article on writing dates in french:
+            // http://www.btb.gc.ca/btb.php?lang=fra&cont=868
+            longDateFormat : { 
+                L : "DD/MM/YYYY",
+                LL : "D MMMM YYYY",
+                LLL : "D MMMM YYYY HH:mm",
+                LLLL : "dddd, D MMMM YYYY HH:mm"
+            },
             relativeTime : {
                 future : "dans %s",
                 past : "il y a %s",
@@ -32,4 +40,4 @@
     if (typeof window !== 'undefined' && this.moment && this.moment.lang) {
         this.moment.lang('fr', lang);
     }
-}());
+}());
diff --git a/lang/fr.min.js b/lang/fr.min.js
diff --git a/lang/it.js b/lang/it.js
@@ -4,6 +4,13 @@
             monthsShort : "Gen_Feb_Mar_Apr_Mag_Giu_Lug_Ago_Set_Ott_Nov_Dic".split("_"),
             weekdays : "Domenica_Lunedi_Martedi_Mercoledi_Giovedi_Venerdi_Sabato".split("_"),
             weekdaysShort : "Dom_Lun_Mar_Mer_Gio_Ven_Sab".split("_"),
+            // copied from french, needs revision from italian speakers
+            longDateFormat : { 
+                L : "DD/MM/YYYY",
+                LL : "D MMMM YYYY",
+                LLL : "D MMMM YYYY HH:mm",
+                LLLL : "dddd, D MMMM YYYY HH:mm"
+            },
             relativeTime : {
                 future : "in %s",
                 past : "%s fa",
@@ -32,4 +39,4 @@
     if (typeof window !== 'undefined' && this.moment && this.moment.lang) {
         this.moment.lang('it', lang);
     }
-}());
+}());
diff --git a/lang/it.min.js b/lang/it.min.js
diff --git a/lang/pt.js b/lang/pt.js
@@ -4,6 +4,12 @@
             monthsShort : "Jan_Feb_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez".split("_"),
             weekdays : "Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado".split("_"),
             weekdaysShort : "Dom_Seg_Ter_Qua_Qui_Sex_Sáb".split("_"),
+            longDateFormat : { 
+                L : "DD/MM/YYYY",
+                LL : "D \\de MMMM \\de YYYY",
+                LLL : "D \\de MMMM \\de YYYY HH:mm",
+                LLLL : "dddd, D \\de MMMM \\de YYYY HH:mm"
+            },
             relativeTime : {
                 future : "em %s",
                 past : "%s atrás",
@@ -32,4 +38,4 @@
     if (typeof window !== 'undefined' && this.moment && this.moment.lang) {
         this.moment.lang('pt', lang);
     }
-}());
+}());
diff --git a/lang/pt.min.js b/lang/pt.min.js
diff --git a/moment.js b/moment.js
@@ -11,7 +11,7 @@
         round = Math.round,
         languages = {},
         hasModule = (typeof module !== 'undefined'),
-        paramsToParse = 'months|monthsShort|weekdays|weekdaysShort|relativeTime|ordinal'.split('|'),
+        paramsToParse = 'months|monthsShort|weekdays|weekdaysShort|longDateFormat|relativeTime|ordinal'.split('|'),
         i,
         VERSION = "1.0.1",
         shortcuts = 'Month|Date|Hours|Minutes|Seconds'.split('|');
@@ -76,7 +76,7 @@
             currentHours = date.getHours(),
             currentMinutes = date.getMinutes(),
             currentSeconds = date.getSeconds(),
-            charactersToReplace = /(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|dddd?|do?|w[o|w]?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|zz?)/g,
+            charactersToReplace = /(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|dddd?|do?|w[o|w]?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|zz?|L?L?L?L?)/g,
             nonuppercaseLetters = /[^A-Z]/g,
             timezoneRegex = /\([A-Za-z ]+\)|:[0-9]{2} [A-Z]{3} /g;
         // check if the character is a format
@@ -171,6 +171,12 @@
                 // depreciating 'zz' fall through to 'z'
             case 'z' :
                 return (date.toString().match(timezoneRegex) || [''])[0].replace(nonuppercaseLetters, '');
+            // LONG DATES
+            case 'L' :
+            case 'LL' :
+            case 'LLL' :
+            case 'LLLL' :
+                return formatDate(date, moment.longDateFormat[input]);
             // DEFAULT
             default :
                 return input.replace("\\", "");
@@ -345,6 +351,12 @@
         monthsShort : "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),
         weekdays : "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),
         weekdaysShort : "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),
+        longDateFormat : { 
+            L : "MM/DD/YYYY",
+            LL : "MMMM D YYYY",
+            LLL : "MMMM D YYYY h:mm A",
+            LLLL : "dddd, MMMM D YYYY h:mm A"
+        },
         relativeTime : {
             future : "in %s",
             past : "%s ago",
@@ -472,4 +484,4 @@
         window.moment = moment;
     }
 
-})(Date);
+})(Date);