intorduces a fallback format for relativeDate #17

diff --git a/lang/test/en.js b/lang/test/en.js
index a31938f2dd2202d2fe6e5b2a7f1073f31434093c..4f45ef998e7ff122c5e57f0579d823a8a2391de9 100644 (file)
--- a/lang/test/en.js
+++ b/lang/test/en.js
@@ -144,7 +144,7 @@ test("fromNow", 2, function() {
     equal(moment().add({d:5}).fromNow(), "in 5 days", "in 5 days");
 });
 
-test("relativeDate", 14, function() {
+test("relativeDate", 15, function() {
     var getTodayAtTwo, prefixDay;
 
     getTodayAtTwo = function () {
@@ -217,5 +217,12 @@ test("relativeDate", 14, function() {
         getTodayAtTwo().subtract({ w: 2 }).format('L'),
         "before 2 weeks at the same time"
     );
-
+    
+    moment.relativeDate.else = 'LLL';
+    equal(
+        getTodayAtTwo().subtract({ w: 2 }).relativeDate(),
+        getTodayAtTwo().subtract({ w: 2 }).format('LLL'),
+        "before 2 weeks at the same time with custom format"
+    );
+    delete moment.relativeDate.else;
 })

diff --git a/moment.js b/moment.js
index 1cbdb7b499e1e8ad783e94f3cffd03a99019636d..14b27f8faf31cd1a83d127b347462fa2cbbb34d3 100644 (file)
--- a/moment.js
+++ b/moment.js
@@ -570,7 +570,7 @@
                 return moment.relativeDate[arrayKey].replace('%weekday', this.format('dddd')).replace('%time', this.format('XXXX'));
             }
 
-            return this.format('L');
+            return this.format(moment.relativeDate.else || 'L');
         },
 
         isLeapYear : function () {