adding l ll lll llll tokens #533

diff --git a/lang/cv.js b/lang/cv.js
index 802aa2b4dd7a84558287dcbee58d9e0c7b4c610a..6e4b1789b25311b2385e9ff3332e7b731f5dcf3b 100644 (file)
--- a/lang/cv.js
+++ b/lang/cv.js
@@ -12,9 +12,9 @@ require('../moment').lang('cv', {
     longDateFormat : {
         LT : "HH:mm",
         L : "DD-MM-YYYY",
-        LL : "YYYY çулхи MMMM уйăхĕн D-мĕшĕ",
-        LLL : "YYYY çулхи MMMM уйăхĕн D-мĕшĕ, LT",
-        LLLL : "dddd, YYYY çулхи MMMM уйăхĕн D-мĕшĕ, LT"
+        LL : "YYYY [çулхи] MMMM [уйăхĕн] D[-мĕшĕ]",
+        LLL : "YYYY [çулхи] MMMM [уйăхĕн] D[-мĕшĕ], LT",
+        LLLL : "dddd, YYYY [çулхи] MMMM [уйăхĕн] D[-мĕшĕ], LT"
     },
     calendar : {
         sameDay: '[Паян] LT [сехетре]',

diff --git a/lang/eu.js b/lang/eu.js
index 414a3417365c5d1d566ade953403427069f5921a..6f0e4cb72a8d8b5821354a6da41d3b3bac6cbc18 100644 (file)
--- a/lang/eu.js
+++ b/lang/eu.js
@@ -13,7 +13,11 @@ require('../moment').lang('eu', {
         L : "YYYY-MM-DD",
         LL : "YYYYko MMMMren D[a]",
         LLL : "YYYYko MMMMren D[a] LT",
-        LLLL : "dddd, YYYYko MMMMren D[a] LT"
+        LLLL : "dddd, YYYYko MMMMren D[a] LT",
+        l : "YYYY-M-D",
+        ll : "YYYYko MMM D[a]",
+        lll : "YYYYko MMM D[a] LT",
+        llll : "ddd, YYYYko MMM D[a] LT"
     },
     calendar : {
         sameDay : '[gaur] LT[etan]',

diff --git a/lang/fi.js b/lang/fi.js
index ee61c8915c3cf6381dd87448083a2d2c284aeea6..d1892294e0724fa12fb4274a89e6e5bc0c3cd440 100644 (file)
--- a/lang/fi.js
+++ b/lang/fi.js
@@ -54,9 +54,13 @@ require('../moment').lang('fi', {
     longDateFormat : {
         LT : "HH.mm",
         L : "DD.MM.YYYY",
-        LL : "Do MMMMt\\a YYYY",
-        LLL : "Do MMMMt\\a YYYY, klo LT",
-        LLLL : "dddd, Do MMMMt\\a YYYY, klo LT"
+        LL : "Do MMMM[ta] YYYY",
+        LLL : "Do MMMM[ta] YYYY, [klo] LT",
+        LLLL : "dddd, Do MMMM[ta] YYYY, [klo] LT",
+        l : "D.M.YYYY",
+        ll : "Do MMM YYYY",
+        lll : "Do MMM YYYY, [klo] LT",
+        llll : "ddd, Do MMM YYYY, [klo] LT"
     },
     calendar : {
         sameDay : '[tänään] [klo] LT',

diff --git a/lang/he.js b/lang/he.js
index e9655972989541f336b707f78eb1c80b9eaf92f5..5495f40956ce021f75ba3e24c3afe30b38baff45 100644 (file)
--- a/lang/he.js
+++ b/lang/he.js
@@ -14,7 +14,11 @@ require('../moment').lang('he', {
         L : "DD/MM/YYYY",
         LL : "D [ב]MMMM YYYY",
         LLL : "D [ב]MMMM YYYY LT",
-        LLLL : "dddd, D [ב]MMMM YYYY LT"
+        LLLL : "dddd, D [ב]MMMM YYYY LT",
+        l : "D/M/YYYY",
+        ll : "D MMM YYYY",
+        lll : "D MMM YYYY LT",
+        llll : "ddd, D MMM YYYY LT"
     },
     calendar : {
         sameDay : '[היום ב־]LT',

diff --git a/lang/is.js b/lang/is.js
index 8455e419f90d3d9f1799f18d6a017411b4ae4913..ec594e3d77e3d725ad2665899b44e51d532a99e8 100644 (file)
--- a/lang/is.js
+++ b/lang/is.js
@@ -80,8 +80,8 @@ require('../moment').lang('is', {
         LT : "H:mm",
         L : "DD/MM/YYYY",
         LL : "D. MMMM YYYY",
-        LLL : "D. MMMM YYYY kl. LT",
-        LLLL : "dddd, D. MMMM YYYY kl. LT"
+        LLL : "D. MMMM YYYY [kl.] LT",
+        LLLL : "dddd, D. MMMM YYYY [kl.] LT"
     },
     calendar : {
         sameDay : '[í dag kl.] LT',

diff --git a/lang/zh-cn.js b/lang/zh-cn.js
index b322e096970d454de5095b1bd88dad7deee7596c..7d3447b3a2145463fcf613a8a81972fc5967c8c1 100644 (file)
--- a/lang/zh-cn.js
+++ b/lang/zh-cn.js
@@ -13,7 +13,11 @@ require('../moment').lang('zh-cn', {
         L : "YYYY年MMMD日",
         LL : "YYYY年MMMD日",
         LLL : "YYYY年MMMD日LT",
-        LLLL : "YYYY年MMMD日ddddLT"
+        LLLL : "YYYY年MMMD日ddddLT",
+        l : "YYYY年MMMD日",
+        ll : "YYYY年MMMD日",
+        lll : "YYYY年MMMD日LT",
+        llll : "YYYY年MMMD日ddddLT"
     },
     meridiem : function (hour, minute, isLower) {
         if (hour < 9) {

diff --git a/lang/zh-tw.js b/lang/zh-tw.js
index e29bd2fdebb7c4a5b793702bea5d43a3a309c7d4..30dbefc008e6f20361ef59bb95c70a9f2dece644 100644 (file)
--- a/lang/zh-tw.js
+++ b/lang/zh-tw.js
@@ -13,7 +13,11 @@ require('../moment').lang('zh-tw', {
         L : "YYYY年MMMD日",
         LL : "YYYY年MMMD日",
         LLL : "YYYY年MMMD日LT",
-        LLLL : "YYYY年MMMD日ddddLT"
+        LLLL : "YYYY年MMMD日ddddLT",
+        l : "YYYY年MMMD日",
+        ll : "YYYY年MMMD日",
+        lll : "YYYY年MMMD日LT",
+        llll : "YYYY年MMMD日ddddLT"
     },
     meridiem : function (hour, minute, isLower) {
         if (hour < 9) {

diff --git a/moment.js b/moment.js
index 733decc123b645cd0f0112378e91406fe0eeacee..6f727ba9a0258b3108370c790c20a38dd5fcb0e2 100644 (file)
--- a/moment.js
+++ b/moment.js
@@ -24,7 +24,7 @@
 
         // format tokens
         formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|a|A|hh?|HH?|mm?|ss?|SS?S?|zz?|ZZ?|.)/g,
-        localFormattingTokens = /(\[[^\[]*\])|(\\)?(LT|LL?L?L?)/g,
+        localFormattingTokens = /(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g,
 
         // parsing tokens
         parseMultipleFormatChunker = /([0-9a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)/gi,
@@ -396,6 +396,12 @@
         },
         longDateFormat : function (key) {
             var output = this._longDateFormat[key];
+            if (!output && this._longDateFormat[key.toUpperCase()]) {
+                output = this._longDateFormat[key.toUpperCase()].replace(/MMMM|MM|DD|dddd/g, function (val) {
+                    return val.slice(1);
+                });
+                this._longDateFormat[key] = output;
+            }
             return output;
         },
 

diff --git a/test/lang/ar-ma.js b/test/lang/ar-ma.js
index 913749c2e30a813a2c8b03634ec54a354aa4f713..7d958201d5d0af8dadf35203269710bcbaf482f9 100644 (file)
--- a/test/lang/ar-ma.js
+++ b/test/lang/ar-ma.js
@@ -26,7 +26,7 @@ exports["lang:ar-ma"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
         moment.lang('ar-ma');
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'الأحد, فبراير 14 2010, 3:25:50 pm'],
@@ -46,7 +46,11 @@ exports["lang:ar-ma"] = {
                 ['L',                                  '14/02/2010'],
                 ['LL',                                 '14 فبراير 2010'],
                 ['LLL',                                '14 فبراير 2010 15:25'],
-                ['LLLL',                               'الأحد 14 فبراير 2010 15:25']
+                ['LLLL',                               'الأحد 14 فبراير 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 فبراير 2010'],
+                ['lll',                                '14 فبراير 2010 15:25'],
+                ['llll',                               'احد 14 فبراير 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/ar.js b/test/lang/ar.js
index 890472dc35ccd7f727b4c0d9ddc186353c487c5d..ce42a9af0660b3927e14212cb7dd17e325d7a632 100644 (file)
--- a/test/lang/ar.js
+++ b/test/lang/ar.js
@@ -26,7 +26,7 @@ exports["lang:ar"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
         moment.lang('ar');
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'الأحد, ﺶﺑﺎﻃ 14 2010, 3:25:50 pm'],
@@ -46,7 +46,11 @@ exports["lang:ar"] = {
                 ['L',                                  '14/02/2010'],
                 ['LL',                                 '14 ﺶﺑﺎﻃ 2010'],
                 ['LLL',                                '14 ﺶﺑﺎﻃ 2010 15:25'],
-                ['LLLL',                               'الأحد 14 ﺶﺑﺎﻃ 2010 15:25']
+                ['LLLL',                               'الأحد 14 ﺶﺑﺎﻃ 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 ﺶﺑﺎﻃ 2010'],
+                ['lll',                                '14 ﺶﺑﺎﻃ 2010 15:25'],
+                ['llll',                               'احد 14 ﺶﺑﺎﻃ 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/bg.js b/test/lang/bg.js
index 018dd90c5b221d3345cacebf23aaf4c135e63468..97aababe0ff0d50acfecb9d12e2dc4d57e8af2a1 100644 (file)
--- a/test/lang/bg.js
+++ b/test/lang/bg.js
@@ -38,7 +38,7 @@ exports["lang:bg"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'неделя, февруари 14-ти 2010, 3:25:50 pm'],
                 ['ddd, hA',                            'нед, 3PM'],
@@ -57,7 +57,11 @@ exports["lang:bg"] = {
                 ['L',                                  '14.02.2010'],
                 ['LL',                                 '14 февруари 2010'],
                 ['LLL',                                '14 февруари 2010 3:25'],
-                ['LLLL',                               'неделя, 14 февруари 2010 3:25']
+                ['LLLL',                               'неделя, 14 февруари 2010 3:25'],
+                ['l',                                  '14.2.2010'],
+                ['ll',                                 '14 фев 2010'],
+                ['lll',                                '14 фев 2010 3:25'],
+                ['llll',                               'нед, 14 фев 2010 3:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/cs.js b/test/lang/cs.js
index 21637f13031d259b12cb85b2b722d9651ca3038b..35cb43ee17960b3dc89fcd628569bb22f313533e 100644 (file)
--- a/test/lang/cs.js
+++ b/test/lang/cs.js
@@ -37,7 +37,7 @@ exports["lang:cs"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss',  'neděle, únor 14. 2010, 3:25:50'],
                 ['ddd, h',                       'ne, 3'],
@@ -56,7 +56,11 @@ exports["lang:cs"] = {
                 ['L',                            '14.02.2010'],
                 ['LL',                           '14. únor 2010'],
                 ['LLL',                          '14. únor 2010 15:25'],
-                ['LLLL',                         'neděle 14. únor 2010 15:25']
+                ['LLLL',                         'neděle 14. únor 2010 15:25'],
+                ['l',                            '14.2.2010'],
+                ['ll',                           '14. úno 2010'],
+                ['lll',                          '14. úno 2010 15:25'],
+                ['llll',                         'ne 14. úno 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/cv.js b/test/lang/cv.js
index b0a20a817280e927603bcfc7be0162c4386ada71..9497b712737139343d572a93b2008644f6810f6b 100644 (file)
--- a/test/lang/cv.js
+++ b/test/lang/cv.js
@@ -39,7 +39,7 @@ exports["lang:cv"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'вырсарникун, нарăс 14-мĕш 2010, 3:25:50 pm'],
@@ -59,7 +59,11 @@ exports["lang:cv"] = {
                 ['L',                                  '14-02-2010'],
                 ['LL',                                 '2010 çулхи нарăс уйăхĕн 14-мĕшĕ'],
                 ['LLL',                                '2010 çулхи нарăс уйăхĕн 14-мĕшĕ, 15:25'],
-                ['LLLL',                               'вырсарникун, 2010 çулхи нарăс уйăхĕн 14-мĕшĕ, 15:25']
+                ['LLLL',                               'вырсарникун, 2010 çулхи нарăс уйăхĕн 14-мĕшĕ, 15:25'],
+                ['l',                                  '14-2-2010'],
+                ['ll',                                 '2010 çулхи нар уйăхĕн 14-мĕшĕ'],
+                ['lll',                                '2010 çулхи нар уйăхĕн 14-мĕшĕ, 15:25'],
+                ['llll',                               'выр, 2010 çулхи нар уйăхĕн 14-мĕшĕ, 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/da.js b/test/lang/da.js
index 841ec6e85d49339cc1843dd22f3c6136aedaa69b..deed24c8da2e7fe77046991438ef3796a6f169c4 100644 (file)
--- a/test/lang/da.js
+++ b/test/lang/da.js
@@ -38,7 +38,7 @@ exports["lang:da"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
         var a = [
                 ['dddd \\den MMMM Do YYYY, h:mm:ss a', 'Søndag den Februar 14. 2010, 3:25:50 pm'],
                 ['ddd hA',                             'Søn 3PM'],
@@ -53,11 +53,15 @@ exports["lang:da"] = {
                 ['m mm',                               '25 25'],
                 ['s ss',                               '50 50'],
                 ['a A',                                'pm PM'],
-                ['[den] DDDo \\d\\ag på året',           'den 45. dag på året'],
+                ['[den] DDDo \\d\\ag på året',         'den 45. dag på året'],
                 ['L',                                  '14/02/2010'],
                 ['LL',                                 '14 Februar 2010'],
                 ['LLL',                                '14 Februar 2010 3:25 PM'],
-                ['LLLL',                               'Søndag 14. Februar, 2010 3:25 PM']
+                ['LLLL',                               'Søndag 14. Februar, 2010 3:25 PM'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 Feb 2010'],
+                ['lll',                                '14 Feb 2010 3:25 PM'],
+                ['llll',                               'Søn 14. Feb, 2010 3:25 PM']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/de.js b/test/lang/de.js
index 704fecb11777d433b5480419620a0b59e14dfd42..da7b2a4580e809ad8f50c49e888e6c0715b31e62 100644 (file)
--- a/test/lang/de.js
+++ b/test/lang/de.js
@@ -39,7 +39,7 @@ exports["lang:de"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, Do MMMM YYYY, h:mm:ss a',      'Sonntag, 14. Februar 2010, 3:25:50 pm'],
@@ -59,7 +59,11 @@ exports["lang:de"] = {
                 ['L',                                  '14.02.2010'],
                 ['LL',                                 '14. Februar 2010'],
                 ['LLL',                                '14. Februar 2010 15:25 Uhr'],
-                ['LLLL',                               'Sonntag, 14. Februar 2010 15:25 Uhr']
+                ['LLLL',                               'Sonntag, 14. Februar 2010 15:25 Uhr'],
+                ['l',                                  '14.2.2010'],
+                ['ll',                                 '14. Febr. 2010'],
+                ['lll',                                '14. Febr. 2010 15:25 Uhr'],
+                ['llll',                               'So., 14. Febr. 2010 15:25 Uhr']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/en-ca.js b/test/lang/en-ca.js
index a79556484550dbcc0366386e88373faf052bc17c..6e719eed1742e05647500354132d3eea2bb4584c 100644 (file)
--- a/test/lang/en-ca.js
+++ b/test/lang/en-ca.js
@@ -41,7 +41,7 @@ exports["lang:en-ca"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'Sunday, February 14th 2010, 3:25:50 pm'],
@@ -61,7 +61,11 @@ exports["lang:en-ca"] = {
                 ['L',                                  '2010-02-14'],
                 ['LL',                                 '14 February, 2010'],
                 ['LLL',                                '14 February, 2010 3:25 PM'],
-                ['LLLL',                               'Sunday, 14 February, 2010 3:25 PM']
+                ['LLLL',                               'Sunday, 14 February, 2010 3:25 PM'],
+                ['l',                                  '2010-2-14'],
+                ['ll',                                 '14 Feb, 2010'],
+                ['lll',                                '14 Feb, 2010 3:25 PM'],
+                ['llll',                               'Sun, 14 Feb, 2010 3:25 PM']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/en-gb.js b/test/lang/en-gb.js
index 5a1e302eb6431f0d86eb1004de063fd94db48e4b..88f606d5caae60a4332b0947172378395b4b94c2 100644 (file)
--- a/test/lang/en-gb.js
+++ b/test/lang/en-gb.js
@@ -38,7 +38,7 @@ exports["lang:en-gb"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'Sunday, February 14th 2010, 3:25:50 pm'],
                 ['ddd, hA',                            'Sun, 3PM'],
@@ -57,7 +57,11 @@ exports["lang:en-gb"] = {
                 ['L',                                  '14/02/2010'],
                 ['LL',                                 '14 February 2010'],
                 ['LLL',                                '14 February 2010 3:25 PM'],
-                ['LLLL',                               'Sunday, 14 February 2010 3:25 PM']
+                ['LLLL',                               'Sunday, 14 February 2010 3:25 PM'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 Feb 2010'],
+                ['lll',                                '14 Feb 2010 3:25 PM'],
+                ['llll',                               'Sun, 14 Feb 2010 3:25 PM']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/en.js b/test/lang/en.js
index e4891a5ddc8cdad71ab9d25c32a0dca9b1c4e79c..d4e203e51117fff575463988b9bf39c67d5886ff 100644 (file)
--- a/test/lang/en.js
+++ b/test/lang/en.js
@@ -42,7 +42,7 @@ exports["lang:en"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'Sunday, February 14th 2010, 3:25:50 pm'],
@@ -62,7 +62,11 @@ exports["lang:en"] = {
                 ['L',                                  '02/14/2010'],
                 ['LL',                                 'February 14 2010'],
                 ['LLL',                                'February 14 2010 3:25 PM'],
-                ['LLLL',                               'Sunday, February 14 2010 3:25 PM']
+                ['LLLL',                               'Sunday, February 14 2010 3:25 PM'],
+                ['l',                                  '2/14/2010'],
+                ['ll',                                 'Feb 14 2010'],
+                ['lll',                                'Feb 14 2010 3:25 PM'],
+                ['llll',                               'Sun, Feb 14 2010 3:25 PM']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/eo.js b/test/lang/eo.js
index 9975b794fc84037e1d0893763a233f33308bdd6d..1d7fa76939936ca449e4139730375ce8d4c1e0af 100644 (file)
--- a/test/lang/eo.js
+++ b/test/lang/eo.js
@@ -39,7 +39,7 @@ exports["lang:eo"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'Dimanĉo, februaro 14a 2010, 3:25:50 p.t.m.'],
@@ -59,7 +59,11 @@ exports["lang:eo"] = {
                 ['L',                                  '2010-02-14'],
                 ['LL',                                 '14-an de februaro, 2010'],
                 ['LLL',                                '14-an de februaro, 2010 15:25'],
-                ['LLLL',                               'Dimanĉo, la 14-an de februaro, 2010 15:25']
+                ['LLLL',                               'Dimanĉo, la 14-an de februaro, 2010 15:25'],
+                ['l',                                  '2010-2-14'],
+                ['ll',                                 '14-an de feb, 2010'],
+                ['lll',                                '14-an de feb, 2010 15:25'],
+                ['llll',                               'Dim, la 14-an de feb, 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/es.js b/test/lang/es.js
index f045f6879357aab9945f7598484f4958c76d7af4..2cf99bedf49ff157448720bda2283aafc880f826 100644 (file)
--- a/test/lang/es.js
+++ b/test/lang/es.js
@@ -38,7 +38,7 @@ exports["lang:es"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'domingo, febrero 14º 2010, 3:25:50 pm'],
                 ['ddd, hA',                            'dom., 3PM'],
@@ -57,7 +57,11 @@ exports["lang:es"] = {
                 ['L',                                  '14/02/2010'],
                 ['LL',                                 '14 de febrero de 2010'],
                 ['LLL',                                '14 de febrero de 2010 15:25'],
-                ['LLLL',                               'domingo, 14 de febrero de 2010 15:25']
+                ['LLLL',                               'domingo, 14 de febrero de 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 de feb. de 2010'],
+                ['lll',                                '14 de feb. de 2010 15:25'],
+                ['llll',                               'dom., 14 de feb. de 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/et.js b/test/lang/et.js
index 61bf14f0e722ab84ea8d9d6c21ec2220e2ca6905..2a61c6db6e781735db089a38e08caa81bae57aba 100644 (file)
--- a/test/lang/et.js
+++ b/test/lang/et.js
@@ -39,27 +39,31 @@ exports["lang:et"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, Do MMMM YYYY, H:mm:ss',      'pühapäev, 14. veebruar 2010, 15:25:50'],
-                ['ddd, h',                            'P, 3'],
-                ['M Mo MM MMMM MMM',                   '2 2. 02 veebruar veebr'],
-                ['YYYY YY',                            '2010 10'],
-                ['D Do DD',                            '14 14. 14'],
-                ['d do dddd ddd dd',                   '0 0. pühapäev P P'],
-                ['DDD DDDo DDDD',                      '45 45. 045'],
-                ['w wo ww',                            '6 6. 06'],
-                ['h hh',                               '3 03'],
-                ['H HH',                               '15 15'],
-                ['m mm',                               '25 25'],
-                ['s ss',                               '50 50'],
-                ['a A',                                'pm PM'],
-                ['\\a\\a\\st\\a DDDo päev', 'aasta 45. päev'],
-                ['L',                                  '14.02.2010'],
-                ['LL',                                 '14. veebruar 2010'],
-                ['LLL',                                '14. veebruar 2010 15:25'],
-                ['LLLL',                               'pühapäev, 14. veebruar 2010 15:25']
+                ['ddd, h',                           'P, 3'],
+                ['M Mo MM MMMM MMM',                 '2 2. 02 veebruar veebr'],
+                ['YYYY YY',                          '2010 10'],
+                ['D Do DD',                          '14 14. 14'],
+                ['d do dddd ddd dd',                 '0 0. pühapäev P P'],
+                ['DDD DDDo DDDD',                    '45 45. 045'],
+                ['w wo ww',                          '6 6. 06'],
+                ['h hh',                             '3 03'],
+                ['H HH',                             '15 15'],
+                ['m mm',                             '25 25'],
+                ['s ss',                             '50 50'],
+                ['a A',                              'pm PM'],
+                ['[aasta] DDDo [päev]',              'aasta 45. päev'],
+                ['L',                                '14.02.2010'],
+                ['LL',                               '14. veebruar 2010'],
+                ['LLL',                              '14. veebruar 2010 15:25'],
+                ['LLLL',                             'pühapäev, 14. veebruar 2010 15:25'],
+                ['l',                                '14.2.2010'],
+                ['ll',                               '14. veebr 2010'],
+                ['lll',                              '14. veebr 2010 15:25'],
+                ['llll',                             'P, 14. veebr 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/eu.js b/test/lang/eu.js
index ba3126815795294f3ead35f5d76617a2a9f5e084..cbca3f06ac8cea4ba0fa22ac3a4492f86c2946dd 100644 (file)
--- a/test/lang/eu.js
+++ b/test/lang/eu.js
@@ -39,7 +39,7 @@ exports["lang:eu"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'igandea, otsaila 14. 2010, 3:25:50 pm'],
@@ -59,7 +59,11 @@ exports["lang:eu"] = {
                 ['L',                                  '2010-02-14'],
                 ['LL',                                 '2010ko otsailaren 14a'],
                 ['LLL',                                '2010ko otsailaren 14a 15:25'],
-                ['LLLL',                               'igandea, 2010ko otsailaren 14a 15:25']
+                ['LLLL',                               'igandea, 2010ko otsailaren 14a 15:25'],
+                ['l',                                  '2010-2-14'],
+                ['ll',                                 '2010ko ots. 14a'],
+                ['lll',                                '2010ko ots. 14a 15:25'],
+                ['llll',                               'ig., 2010ko ots. 14a 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/fi.js b/test/lang/fi.js
index 5a9f5c9e15e06d0f5ed26f8130839b3741ab46c4..58797f3e1bcb8a14d28ec24091074e3f16b7375e 100644 (file)
--- a/test/lang/fi.js
+++ b/test/lang/fi.js
@@ -38,7 +38,7 @@ exports["lang:fi"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'sunnuntai, helmikuu 14. 2010, 3:25:50 pm'],
                 ['ddd, hA',                            'su, 3PM'],
@@ -53,11 +53,15 @@ exports["lang:fi"] = {
                 ['m mm',                               '25 25'],
                 ['s ss',                               '50 50'],
                 ['a A',                                'pm PM'],
-                ['vuo\\den DDDo päivä', 'vuoden 45. päivä'],
+                ['vuo\\den DDDo päivä',                'vuoden 45. päivä'],
                 ['L',                                  '14.02.2010'],
                 ['LL',                                 '14. helmikuuta 2010'],
                 ['LLL',                                '14. helmikuuta 2010, klo 15.25'],
-                ['LLLL',                               'sunnuntai, 14. helmikuuta 2010, klo 15.25']
+                ['LLLL',                               'sunnuntai, 14. helmikuuta 2010, klo 15.25'],
+                ['l',                                  '14.2.2010'],
+                ['ll',                                 '14. hel 2010'],
+                ['lll',                                '14. hel 2010, klo 15.25'],
+                ['llll',                               'su, 14. hel 2010, klo 15.25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/fr-ca.js b/test/lang/fr-ca.js
index 6bccdbaec456566cbeeb8752c890b916e6406f46..28edfaa28a6037064dfc6eb19ce853ecbc7f372d 100644 (file)
--- a/test/lang/fr-ca.js
+++ b/test/lang/fr-ca.js
@@ -41,7 +41,7 @@ exports["lang:fr-ca"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'dimanche, février 14ème 2010, 3:25:50 pm'],
@@ -61,7 +61,11 @@ exports["lang:fr-ca"] = {
                 ['L',                                  '2010-02-14'],
                 ['LL',                                 '14 février 2010'],
                 ['LLL',                                '14 février 2010 15:25'],
-                ['LLLL',                               'dimanche 14 février 2010 15:25']
+                ['LLLL',                               'dimanche 14 février 2010 15:25'],
+                ['l',                                  '2010-2-14'],
+                ['ll',                                 '14 févr. 2010'],
+                ['lll',                                '14 févr. 2010 15:25'],
+                ['llll',                               'dim. 14 févr. 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/fr.js b/test/lang/fr.js
index 82b63beba03bed784f02e82a313df4daac92db0d..9a9a5ef9823170c61edad9f503ed1355ef52d15b 100644 (file)
--- a/test/lang/fr.js
+++ b/test/lang/fr.js
@@ -39,7 +39,7 @@ exports["lang:fr"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'dimanche, février 14ème 2010, 3:25:50 pm'],
@@ -59,7 +59,11 @@ exports["lang:fr"] = {
                 ['L',                                  '14/02/2010'],
                 ['LL',                                 '14 février 2010'],
                 ['LLL',                                '14 février 2010 15:25'],
-                ['LLLL',                               'dimanche 14 février 2010 15:25']
+                ['LLLL',                               'dimanche 14 février 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 févr. 2010'],
+                ['lll',                                '14 févr. 2010 15:25'],
+                ['llll',                               'dim. 14 févr. 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/he.js b/test/lang/he.js
index 743b11446386a306d705c149993fc5d36d0204f2..d168080cf7f5854b7a67cc3ebe7fbaa1bb4e5699 100644 (file)
--- a/test/lang/he.js
+++ b/test/lang/he.js
@@ -39,7 +39,7 @@ exports["lang:he"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'ראשון, פברואר 14 2010, 3:25:50 pm'],
@@ -59,7 +59,11 @@ exports["lang:he"] = {
                 ['L',                                  '14/02/2010'],
                 ['LL',                                 '14 בפברואר 2010'],
                 ['LLL',                                '14 בפברואר 2010 15:25'],
-                ['LLLL',                               'ראשון, 14 בפברואר 2010 15:25']
+                ['LLLL',                               'ראשון, 14 בפברואר 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 פבר׳ 2010'],
+                ['lll',                                '14 פבר׳ 2010 15:25'],
+                ['llll',                               'א׳, 14 פבר׳ 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/hu.js b/test/lang/hu.js
index 569da3bf6a641fc3c0e8c1377a598ed394dec788..1ab11fc875b331a45f6ad2458931ca28cedb08f0 100644 (file)
--- a/test/lang/hu.js
+++ b/test/lang/hu.js
@@ -38,7 +38,7 @@ exports["lang:hu"] = {
     },
 
     "format" : function(test) {
-        test.expect(16);
+        test.expect(20);
 
         var a = [
                 ['dddd, MMMM Do YYYY, HH:mm:ss',      'vasárnap, február 14. 2010, 15:25:50'],
@@ -52,11 +52,15 @@ exports["lang:hu"] = {
                 ['H HH',                               '15 15'],
                 ['m mm',                               '25 25'],
                 ['s ss',                               '50 50'],
-                ['\\az év DDDo n\\apj\\a',           'az év 45. napja'],
+                ['\\az év DDDo n\\apj\\a',             'az év 45. napja'],
                 ['L',                                  '2010.02.14.'],
                 ['LL',                                 '2010. február 14.'],
                 ['LLL',                                '2010. február 14., 15:25'],
-                ['LLLL',                               '2010. február 14., vasárnap 15:25']
+                ['LLLL',                               '2010. február 14., vasárnap 15:25'],
+                ['l',                                  '2010.2.14.'],
+                ['ll',                                 '2010. feb 14.'],
+                ['lll',                                '2010. feb 14., 15:25'],
+                ['llll',                               '2010. feb 14., v 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/id.js b/test/lang/id.js
index 0bec455fc0b9b78eab0aa55004c70c253138adee..9f14459e821fd1d1136487083259b9818c6678e2 100644 (file)
--- a/test/lang/id.js
+++ b/test/lang/id.js
@@ -38,7 +38,7 @@ exports["lang:id"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'Minggu, Februari 14 2010, 3:25:50 sore'],
                 ['ddd, hA',                            'Min, 3sore'],
@@ -57,7 +57,11 @@ exports["lang:id"] = {
                 ['L',                                  '14/02/2010'],
                 ['LL',                                 '14 Februari 2010'],
                 ['LLL',                                '14 Februari 2010 pukul 15.25'],
-                ['LLLL',                               'Minggu, 14 Februari 2010 pukul 15.25']
+                ['LLLL',                               'Minggu, 14 Februari 2010 pukul 15.25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 Feb 2010'],
+                ['lll',                                '14 Feb 2010 pukul 15.25'],
+                ['llll',                               'Min, 14 Feb 2010 pukul 15.25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/is.js b/test/lang/is.js
index aa1436900c5f4e629bd0031b4ba763078aabea0c..9ada489f3d6f028974fb850591c712a597fd71bd 100644 (file)
--- a/test/lang/is.js
+++ b/test/lang/is.js
@@ -39,7 +39,7 @@ exports["lang:is"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, Do MMMM YYYY, h:mm:ss a',      'sunnudagur, 14. febrúar 2010, 3:25:50 pm'],
@@ -55,11 +55,15 @@ exports["lang:is"] = {
                 ['m mm',                               '25 25'],
                 ['s ss',                               '50 50'],
                 ['a A',                                'pm PM'],
-                ['t\\he DDDo \\d\\ay of t\\he ye\\ar', 'the 45. day of the year'],
+                ['[the] DDDo [day of the year]',       'the 45. day of the year'],
                 ['L',                                  '14/02/2010'],
                 ['LL',                                 '14. febrúar 2010'],
                 ['LLL',                                '14. febrúar 2010 kl. 15:25'],
-                ['LLLL',                               'sunnudagur, 14. febrúar 2010 kl. 15:25']
+                ['LLLL',                               'sunnudagur, 14. febrúar 2010 kl. 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14. feb 2010'],
+                ['lll',                                '14. feb 2010 kl. 15:25'],
+                ['llll',                               'sun, 14. feb 2010 kl. 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/it.js b/test/lang/it.js
index b2648a5b9e14ea476b6a1182771281a3399df5c0..e9392925110495e7867521ef95e395ff464155be 100644 (file)
--- a/test/lang/it.js
+++ b/test/lang/it.js
@@ -39,7 +39,7 @@ exports["lang:it"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'Domenica, Febbraio 14º 2010, 3:25:50 pm'],
@@ -59,7 +59,11 @@ exports["lang:it"] = {
                 ['L',                                  '14/02/2010'],
                 ['LL',                                 '14 Febbraio 2010'],
                 ['LLL',                                '14 Febbraio 2010 15:25'],
-                ['LLLL',                               'Domenica, 14 Febbraio 2010 15:25']
+                ['LLLL',                               'Domenica, 14 Febbraio 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 Feb 2010'],
+                ['lll',                                '14 Feb 2010 15:25'],
+                ['llll',                               'Dom, 14 Feb 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/ja.js b/test/lang/ja.js
index 1899ab242dd817892f9c7e3fdb51c6d82c4ab74b..f363f56921264339978f3b44feee50505ea8f508 100644 (file)
--- a/test/lang/ja.js
+++ b/test/lang/ja.js
@@ -39,7 +39,7 @@ exports["lang:ja"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, a h:mm:ss',      '日曜日, 2月 14 2010, 午後 3:25:50'],
@@ -59,7 +59,11 @@ exports["lang:ja"] = {
                 ['L',                                  '2010/02/14'],
                 ['LL',                                 '2010年2月14日'],
                 ['LLL',                                '2010年2月14日午後3時25分'],
-                ['LLLL',                               '2010年2月14日午後3時25分 日曜日']
+                ['LLLL',                               '2010年2月14日午後3時25分 日曜日'],
+                ['l',                                  '2010/2/14'],
+                ['ll',                                 '2010年2月14日'],
+                ['lll',                                '2010年2月14日午後3時25分'],
+                ['llll',                               '2010年2月14日午後3時25分 日']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/ko.js b/test/lang/ko.js
index 0147fb187b761e19ce66b814f654dd1fd292304b..24dd1005e4d484563caa779703dd28cba6b87e06 100644 (file)
--- a/test/lang/ko.js
+++ b/test/lang/ko.js
@@ -38,7 +38,7 @@ exports["lang:kr"] = {
         test.done();
     },
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['YYYY년 MMMM Do dddd a h:mm:ss',      '2010년 2월 14일 일요일 오후 3:25:50'],
@@ -58,7 +58,11 @@ exports["lang:kr"] = {
                 ['L',                                  '2010.02.14'],
                 ['LL',                                 '2010년 2월 14일'],
                 ['LLL',                                '2010년 2월 14일 오후 3시 25분'],
-                ['LLLL',                               '2010년 2월 14일 일요일 오후 3시 25분']
+                ['LLLL',                               '2010년 2월 14일 일요일 오후 3시 25분'],
+                ['l',                                  '2010.2.14'],
+                ['ll',                                 '2010년 2월 14일'],
+                ['lll',                                '2010년 2월 14일 오후 3시 25분'],
+                ['llll',                               '2010년 2월 14일 일 오후 3시 25분']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/lv.js b/test/lang/lv.js
index e0e556969f2af72a1d7d725304c6b162a9170439..d5ec3bd06e6e7483e6e2267f1d9e1d03e0ac2bc5 100644 (file)
--- a/test/lang/lv.js
+++ b/test/lang/lv.js
@@ -39,7 +39,7 @@ exports["lang:lv"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, Do MMMM YYYY, h:mm:ss a',      'svētdiena, 14. februāris 2010, 3:25:50 pm'],
@@ -59,7 +59,11 @@ exports["lang:lv"] = {
                 ['L',                                  '2010.02.14.'],
                 ['LL',                                 '2010. gada 14. februāris'],
                 ['LLL',                                '2010. gada 14. februāris, 15:25'],
-                ['LLLL',                               '2010. gada 14. februāris, svētdiena, 15:25']
+                ['LLLL',                               '2010. gada 14. februāris, svētdiena, 15:25'],
+                ['l',                                  '2010.2.14.'],
+                ['ll',                                 '2010. gada 14. feb'],
+                ['lll',                                '2010. gada 14. feb, 15:25'],
+                ['llll',                               '2010. gada 14. feb, Sv, 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/nb.js b/test/lang/nb.js
index 94b6bbcfdf5ff7f99c7518de5a7fb320c713f77e..d51b31008f14126344451b7c072642ebb4224af9 100644 (file)
--- a/test/lang/nb.js
+++ b/test/lang/nb.js
@@ -39,7 +39,7 @@ exports["lang:nb"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'søndag, februar 14. 2010, 3:25:50 pm'],
@@ -59,7 +59,11 @@ exports["lang:nb"] = {
                 ['L',                                  '2010-02-14'],
                 ['LL',                                 '14 februar 2010'],
                 ['LLL',                                '14 februar 2010 15:25'],
-                ['LLLL',                               'søndag 14 februar 2010 15:25']
+                ['LLLL',                               'søndag 14 februar 2010 15:25'],
+                ['l',                                  '2010-2-14'],
+                ['ll',                                 '14 feb 2010'],
+                ['lll',                                '14 feb 2010 15:25'],
+                ['llll',                               'søn 14 feb 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/ne.js b/test/lang/ne.js
index 80e5aeabc97523bbad512ec60c580a4140a85a0f..ac5b290561c682c9fa1cdfdd6e3a1941f6dad7c2 100644 (file)
--- a/test/lang/ne.js
+++ b/test/lang/ne.js
@@ -39,7 +39,7 @@ exports["lang:ne"] = {
     },
 
     "format" : function(test) {
-        test.expect(17);
+        test.expect(21);
 
         var a = [
                 ['dddd, Do MMMM YYYY, aको h:mm:ss बजे','आइतबार, १४ फेब्रुवरी २०१०, बेलुकाको ३:२५:५० बजे'],
@@ -58,7 +58,11 @@ exports["lang:ne"] = {
                 ['L',                                  '१४/०२/२०१०'],
                 ['LL',                                 '१४ फेब्रुवरी २०१०'],
                 ['LLL',                                '१४ फेब्रुवरी २०१०, बेलुकाको ३:२५ बजे'],
-                ['LLLL',                               'आइतबार, १४ फेब्रुवरी २०१०, बेलुकाको ३:२५ बजे']
+                ['LLLL',                               'आइतबार, १४ फेब्रुवरी २०१०, बेलुकाको ३:२५ बजे'],
+                ['l',                                  '१४/२/२०१०'],
+                ['ll',                                 '१४ फेब्रु. २०१०'],
+                ['lll',                                '१४ फेब्रु. २०१०, बेलुकाको ३:२५ बजे'],
+                ['llll',                               'आइत., १४ फेब्रु. २०१०, बेलुकाको ३:२५ बजे']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/nl.js b/test/lang/nl.js
index af506ef8e6bd18b4ed2066e38646078e558ac54b..b2aaca775f8f29e6f6648b818377a1b99401050f 100644 (file)
--- a/test/lang/nl.js
+++ b/test/lang/nl.js
@@ -39,7 +39,7 @@ exports["lang:nl"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, HH:mm:ss',       'zondag, februari 14de 2010, 15:25:50'],
@@ -59,7 +59,11 @@ exports["lang:nl"] = {
                 ['L',                                  '14-02-2010'],
                 ['LL',                                 '14 februari 2010'],
                 ['LLL',                                '14 februari 2010 15:25'],
-                ['LLLL',                               'zondag 14 februari 2010 15:25']
+                ['LLLL',                               'zondag 14 februari 2010 15:25'],
+                ['l',                                  '14-2-2010'],
+                ['ll',                                 '14 feb. 2010'],
+                ['lll',                                '14 feb. 2010 15:25'],
+                ['llll',                               'zo. 14 feb. 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/pl.js b/test/lang/pl.js
index 54d52229272377d6df957795d6ca24bd8ef08637..e7f4fd1da0f42f5862a5816ced3b7172cf8f3c4c 100644 (file)
--- a/test/lang/pl.js
+++ b/test/lang/pl.js
@@ -39,7 +39,7 @@ exports["lang:pl"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'niedziela, luty 14. 2010, 3:25:50 pm'],
@@ -59,7 +59,11 @@ exports["lang:pl"] = {
                 ['L',                                  '14-02-2010'],
                 ['LL',                                 '14 luty 2010'],
                 ['LLL',                                '14 luty 2010 15:25'],
-                ['LLLL',                               'niedziela, 14 luty 2010 15:25']
+                ['LLLL',                               'niedziela, 14 luty 2010 15:25'],
+                ['l',                                  '14-2-2010'],
+                ['ll',                                 '14 lut 2010'],
+                ['lll',                                '14 lut 2010 15:25'],
+                ['llll',                               'nie, 14 lut 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/pt-br.js b/test/lang/pt-br.js
index 1f6cb8f05e670bcb519489ced02734aaa37ea054..32a8bffb1d48ebc3b30229dfc8effc343bd5c2dc 100644 (file)
--- a/test/lang/pt-br.js
+++ b/test/lang/pt-br.js
@@ -42,7 +42,7 @@ exports["lang:pt-br"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'Domingo, Fevereiro 14º 2010, 3:25:50 pm'],
@@ -62,7 +62,11 @@ exports["lang:pt-br"] = {
                 ['L',                                  '14/02/2010'],
                 ['LL',                                 '14 de Fevereiro de 2010'],
                 ['LLL',                                '14 de Fevereiro de 2010 15:25'],
-                ['LLLL',                               'Domingo, 14 de Fevereiro de 2010 15:25']
+                ['LLLL',                               'Domingo, 14 de Fevereiro de 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 de Fev de 2010'],
+                ['lll',                                '14 de Fev de 2010 15:25'],
+                ['llll',                               'Dom, 14 de Fev de 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/pt.js b/test/lang/pt.js
index 7835f7718ecc78e25520b8aa207a2a5fafbede7c..8f270bcd5449fb2a8397765e3c6a6eccaaeca157 100644 (file)
--- a/test/lang/pt.js
+++ b/test/lang/pt.js
@@ -39,7 +39,7 @@ exports["lang:pt"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'Domingo, Fevereiro 14º 2010, 3:25:50 pm'],
@@ -59,7 +59,11 @@ exports["lang:pt"] = {
                 ['L',                                  '14/02/2010'],
                 ['LL',                                 '14 de Fevereiro de 2010'],
                 ['LLL',                                '14 de Fevereiro de 2010 15:25'],
-                ['LLLL',                               'Domingo, 14 de Fevereiro de 2010 15:25']
+                ['LLLL',                               'Domingo, 14 de Fevereiro de 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 de Fev de 2010'],
+                ['lll',                                '14 de Fev de 2010 15:25'],
+                ['llll',                               'Dom, 14 de Fev de 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/ro.js b/test/lang/ro.js
index 48a9c44a8563062ff9c50b2448301b4a759e25b4..8651104ec3480a2d35367ada873f32a3ea8ca069 100644 (file)
--- a/test/lang/ro.js
+++ b/test/lang/ro.js
@@ -39,7 +39,7 @@ exports["lang:ro"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss A',  'Duminică, Februarie 14 2010, 3:25:50 PM'],
@@ -55,11 +55,15 @@ exports["lang:ro"] = {
                 ['m mm',                           '25 25'],
                 ['s ss',                           '50 50'],
                 ['a A',                            'pm PM'],
-                ['\\a DDDo\\a zi \\a \\anului',    'a 45a zi a anului'],
+                ['[a] DDDo[a zi a anului]',        'a 45a zi a anului'],
                 ['L',                              '14/02/2010'],
                 ['LL',                             '14 Februarie 2010'],
                 ['LLL',                            '14 Februarie 2010 15:25'],
-                ['LLLL',                           'Duminică, 14 Februarie 2010 15:25']
+                ['LLLL',                           'Duminică, 14 Februarie 2010 15:25'],
+                ['l',                              '14/2/2010'],
+                ['ll',                             '14 Feb 2010'],
+                ['lll',                            '14 Feb 2010 15:25'],
+                ['llll',                           'Dum, 14 Feb 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/ru.js b/test/lang/ru.js
index 075b30b2e37f67a3a53e0d7b865011efe5d11e18..83b49836feec54f924c8d5e2d7d2035574a476de 100644 (file)
--- a/test/lang/ru.js
+++ b/test/lang/ru.js
@@ -39,7 +39,7 @@ exports["lang:ru"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'воскресенье, февраль 14. 2010, 3:25:50 pm'],
@@ -59,7 +59,11 @@ exports["lang:ru"] = {
                 ['L',                                  '14.02.2010'],
                 ['LL',                                 '14 февраля 2010 г.'],
                 ['LLL',                                '14 февраля 2010 г., 15:25'],
-                ['LLLL',                               'воскресенье, 14 февраля 2010 г., 15:25']
+                ['LLLL',                               'воскресенье, 14 февраля 2010 г., 15:25'],
+                ['l',                                  '14.2.2010'],
+                ['ll',                                 '14 фев 2010 г.'],
+                ['lll',                                '14 фев 2010 г., 15:25'],
+                ['llll',                               'вск, 14 фев 2010 г., 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/sl.js b/test/lang/sl.js
index 952a0d30bce200fcfa2367b6511cd2853fac50ec..81f73e6ef0fb8b361cfc7fc915e7e4ffae1b502f 100644 (file)
--- a/test/lang/sl.js
+++ b/test/lang/sl.js
@@ -39,7 +39,7 @@ exports["lang:sl"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
         var a = [
                 ['dddd, Do MMMM YYYY, h:mm:ss a',      'nedelja, 14. februar 2010, 3:25:50 pm'],
                 ['ddd, hA',                            'ned., 3PM'],
@@ -58,7 +58,11 @@ exports["lang:sl"] = {
                 ['L',                                  '14. 02. 2010'],
                 ['LL',                                 '14. februar 2010'],
                 ['LLL',                                '14. februar 2010 15:25'],
-                ['LLLL',                               'nedelja, 14. februar 2010 15:25']
+                ['LLLL',                               'nedelja, 14. februar 2010 15:25'],
+                ['l',                                  '14. 2. 2010'],
+                ['ll',                                 '14. feb. 2010'],
+                ['lll',                                '14. feb. 2010 15:25'],
+                ['llll',                               'ned., 14. feb. 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/sv.js b/test/lang/sv.js
index 9288f47e174d81bca8c1f8c02f501cf13e825fd2..e1e8492bc0894e3a06179a983203029fff8222f4 100644 (file)
--- a/test/lang/sv.js
+++ b/test/lang/sv.js
@@ -37,7 +37,7 @@ exports["lang:sv"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'söndag, februari 14e 2010, 3:25:50 pm'],
                 ['ddd, hA',                            'sön, 3PM'],
@@ -56,7 +56,11 @@ exports["lang:sv"] = {
                 ['L',                                  '2010-02-14'],
                 ['LL',                                 '14 februari 2010'],
                 ['LLL',                                '14 februari 2010 15:25'],
-                ['LLLL',                               'söndag 14 februari 2010 15:25']
+                ['LLLL',                               'söndag 14 februari 2010 15:25'],
+                ['l',                                  '2010-2-14'],
+                ['ll',                                 '14 feb 2010'],
+                ['lll',                                '14 feb 2010 15:25'],
+                ['llll',                               'sön 14 feb 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/th.js b/test/lang/th.js
index 2a856e009e92a266c91eb95b0c0e7d1e97502e3c..b031bbc5095aed4713e1dd7d90758e30051bf227 100644 (file)
--- a/test/lang/th.js
+++ b/test/lang/th.js
@@ -39,7 +39,7 @@ exports["lang:th"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, Do MMMM YYYY, h:mm:ss a',      'อาทิตย์, 14 กุมภาพันธ์ 2010, 3:25:50 หลังเที่ยง'],
@@ -59,7 +59,11 @@ exports["lang:th"] = {
                 ['L',                                  '2010/02/14'],
                 ['LL',                                 '14 กุมภาพันธ์ 2010'],
                 ['LLL',                                '14 กุมภาพันธ์ 2010 เวลา 15 นาฬิกา 25 นาที'],
-                ['LLLL',                               'วันอาทิตย์ที่ 14 กุมภาพันธ์ 2010 เวลา 15 นาฬิกา 25 นาที']
+                ['LLLL',                               'วันอาทิตย์ที่ 14 กุมภาพันธ์ 2010 เวลา 15 นาฬิกา 25 นาที'],
+                ['l',                                  '2010/2/14'],
+                ['ll',                                 '14 กุมภา 2010'],
+                ['lll',                                '14 กุมภา 2010 เวลา 15 นาฬิกา 25 นาที'],
+                ['llll',                               'วันอาทิตย์ที่ 14 กุมภา 2010 เวลา 15 นาฬิกา 25 นาที']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/tr.js b/test/lang/tr.js
index abcec2ad0b75ea8ecda6eceb902e627bf5d453c0..4b5923f53d57f50da51d2b6f7c275ec3a92e26f8 100644 (file)
--- a/test/lang/tr.js
+++ b/test/lang/tr.js
@@ -54,11 +54,15 @@ exports["lang:tr"] = {
                 ['m mm',                               '25 25'],
                 ['s ss',                               '50 50'],
                 ['a A',                                'pm PM'],
-                ['yılın DDDo günü',                    'yılın 45\'inci günü'],
+                ['[yılın] DDDo [günü]',                'yılın 45\'inci günü'],
                 ['L',                                  '14.02.2010'],
                 ['LL',                                 '14 Şubat 2010'],
                 ['LLL',                                '14 Şubat 2010 15:25'],
-                ['LLLL',                               'Pazar, 14 Şubat 2010 15:25']
+                ['LLLL',                               'Pazar, 14 Şubat 2010 15:25'],
+                ['l',                                  '14.2.2010'],
+                ['ll',                                 '14 Şub 2010'],
+                ['lll',                                '14 Şub 2010 15:25'],
+                ['llll',                               'Paz, 14 Şub 2010 15:25']
             ],
             DDDo = [
                 [359, '360\'ıncı'],

diff --git a/test/lang/tzm-la.js b/test/lang/tzm-la.js
index 4058cc62aad9983d2ff5ad1d5aa021d0e1056be6..be9c7bc251d1aaae50be9dfade221698e815d6e9 100644 (file)
--- a/test/lang/tzm-la.js
+++ b/test/lang/tzm-la.js
@@ -27,7 +27,7 @@ exports["lang:tzm-la"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
         moment.lang('tzm-la');
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'asamas, brˤayrˤ 14 2010, 3:25:50 pm'],
@@ -47,7 +47,11 @@ exports["lang:tzm-la"] = {
                 ['L',                                  '14/02/2010'],
                 ['LL',                                 '14 brˤayrˤ 2010'],
                 ['LLL',                                '14 brˤayrˤ 2010 15:25'],
-                ['LLLL',                               'asamas 14 brˤayrˤ 2010 15:25']
+                ['LLLL',                               'asamas 14 brˤayrˤ 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 brˤayrˤ 2010'],
+                ['lll',                                '14 brˤayrˤ 2010 15:25'],
+                ['llll',                               'asamas 14 brˤayrˤ 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/tzm.js b/test/lang/tzm.js
index 5dc49d971565de7231fe738966c4964d8f5b62d1..41eef1e21e68d4a05d107601ee05358dba3b16ec 100644 (file)
--- a/test/lang/tzm.js
+++ b/test/lang/tzm.js
@@ -27,7 +27,7 @@ exports["lang:tzm"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
         moment.lang('tzm');
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'ⴰⵙⴰⵎⴰⵙ, ⴱⵕⴰⵢⵕ 14 2010, 3:25:50 pm'],
@@ -47,7 +47,11 @@ exports["lang:tzm"] = {
                 ['L',                                  '14/02/2010'],
                 ['LL',                                 '14 ⴱⵕⴰⵢⵕ 2010'],
                 ['LLL',                                '14 ⴱⵕⴰⵢⵕ 2010 15:25'],
-                ['LLLL',                               'ⴰⵙⴰⵎⴰⵙ 14 ⴱⵕⴰⵢⵕ 2010 15:25']
+                ['LLLL',                               'ⴰⵙⴰⵎⴰⵙ 14 ⴱⵕⴰⵢⵕ 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 ⴱⵕⴰⵢⵕ 2010'],
+                ['lll',                                '14 ⴱⵕⴰⵢⵕ 2010 15:25'],
+                ['llll',                               'ⴰⵙⴰⵎⴰⵙ 14 ⴱⵕⴰⵢⵕ 2010 15:25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/zh-cn.js b/test/lang/zh-cn.js
index 5455464a12093e1355802a03962b210d8b3d8e1c..622133ef5f1966d6eb26d62401729f65d326229c 100644 (file)
--- a/test/lang/zh-cn.js
+++ b/test/lang/zh-cn.js
@@ -41,7 +41,7 @@ exports["lang:zh-cn"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, a h:mm:ss',      '星期日, 二月 14 2010, 下午 3:25:50'],
@@ -61,7 +61,11 @@ exports["lang:zh-cn"] = {
                 ['L',                                  '2010年2月14日'],
                 ['LL',                                 '2010年2月14日'],
                 ['LLL',                                '2010年2月14日下午3点25'],
-                ['LLLL',                               '2010年2月14日星期日下午3点25']
+                ['LLLL',                               '2010年2月14日星期日下午3点25'],
+                ['l',                                  '2010年2月14日'],
+                ['ll',                                 '2010年2月14日'],
+                ['lll',                                '2010年2月14日下午3点25'],
+                ['llll',                               '2010年2月14日星期日下午3点25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;

diff --git a/test/lang/zh-tw.js b/test/lang/zh-tw.js
index 9a5b1b221b4c45b395115864f946892aa0a42915..8a066749ff9e0b820a11ada2e1ad749b8f11c41b 100644 (file)
--- a/test/lang/zh-tw.js
+++ b/test/lang/zh-tw.js
@@ -39,7 +39,7 @@ exports["lang:zh-tw"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
+        test.expect(22);
 
         var a = [
                 ['dddd, MMMM Do YYYY, a h:mm:ss',      '星期日, 二月 14 2010, 下午 3:25:50'],
@@ -59,7 +59,11 @@ exports["lang:zh-tw"] = {
                 ['L',                                  '2010年2月14日'],
                 ['LL',                                 '2010年2月14日'],
                 ['LLL',                                '2010年2月14日下午3點25'],
-                ['LLLL',                               '2010年2月14日星期日下午3點25']
+                ['LLLL',                               '2010年2月14日星期日下午3點25'],
+                ['l',                                  '2010年2月14日'],
+                ['ll',                                 '2010年2月14日'],
+                ['lll',                                '2010年2月14日下午3點25'],
+                ['llll',                               '2010年2月14日星期日下午3點25']
             ],
             b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
             i;