Revert "Merge pull request #2746 from mbad0la:develop"

This reverts commit 9ea2d6b1a86d59b36bce792771cffc3f85b382b0, reversing
changes made to f52a86863dd1fc638501b5f4b4fbe371f8fa725d.

diff --git a/src/lib/locale/en.js b/src/lib/locale/en.js
index 30d95f2819e86da13f46f5f6cbc25541d801e2b8..20964cd9c1c2ea926399b1185e9cd36dc2404856 100644 (file)
--- a/src/lib/locale/en.js
+++ b/src/lib/locale/en.js
@@ -3,9 +3,6 @@ import { getSetGlobalLocale } from './locales';
 import toInt from '../utils/to-int';
 
 getSetGlobalLocale('en', {
-    monthsParse : [/^jan/i, /^feb/i, /^mar/i, /^apr/i, /^may/i, /^jun/i, /^jul/i, /^aug/i, /^sep/i, /^oct/i, /^nov/i, /^dec/i],
-    longMonthsParse : [/^january$/i, /^february$/i, /^march$/i, /^april$/i, /^may$/i, /^june$/i, /^july$/i, /^august$/i, /^september$/i, /^october$/i, /^november$/i, /^december$/i],
-    shortMonthsParse : [/^jan$/i, /^feb$/i, /^mar$/i, /^apr$/i, /^may$/i, /^jun$/i, /^jul$/i, /^aug/i, /^sept?$/i, /^oct$/i, /^nov$/i, /^dec$/i],
     ordinalParse: /\d{1,2}(th|st|nd|rd)/,
     ordinal : function (number) {
         var b = number % 10,

diff --git a/src/lib/units/month.js b/src/lib/units/month.js
index 3584f6ba9352339233dfb40b2b6c9a926ee2c6d2..18e42cff834c8e1f4abd1939279d3977b0569734 100644 (file)
--- a/src/lib/units/month.js
+++ b/src/lib/units/month.js
@@ -62,7 +62,7 @@ export function localeMonths (m, format) {
         this._months[MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'][m.month()];
 }
 
-export var defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sept_Oct_Nov_Dec'.split('_');
+export var defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_');
 export function localeMonthsShort (m, format) {
     return isArray(this._monthsShort) ? this._monthsShort[m.month()] :
         this._monthsShort[MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'][m.month()];

diff --git a/src/locale/en-au.js b/src/locale/en-au.js
index d20c76b2904e9beb53d037a3632a09a36effd0c0..13c4702d8ad85a46edbb25ab657fc57d77715ea6 100644 (file)
--- a/src/locale/en-au.js
+++ b/src/locale/en-au.js
@@ -5,10 +5,7 @@ import moment from '../moment';
 
 export default moment.defineLocale('en-au', {
     months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-    monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sept_Oct_Nov_Dec'.split('_'),
-    monthsParse : [/^jan/i, /^feb/i, /^mar/i, /^apr/i, /^may/i, /^jun/i, /^jul/i, /^aug/i, /^sep/i, /^oct/i, /^nov/i, /^dec/i],
-    longMonthsParse : [/^january$/i, /^february$/i, /^march$/i, /^april$/i, /^may$/i, /^june$/i, /^july$/i, /^august$/i, /^september$/i, /^october$/i, /^november$/i, /^december$/i],
-    shortMonthsParse : [/^jan$/i, /^feb$/i, /^mar$/i, /^apr$/i, /^may$/i, /^jun$/i, /^jul$/i, /^aug/i, /^sept?$/i, /^oct$/i, /^nov$/i, /^dec$/i],
+    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('_'),
     weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),

diff --git a/src/locale/en-ca.js b/src/locale/en-ca.js
index 22988a6537207fabe912c146e8c56c7e289fe638..9273cf693a5b6a9af3c2fa3137f631ade05b7e1f 100644 (file)
--- a/src/locale/en-ca.js
+++ b/src/locale/en-ca.js
@@ -6,10 +6,7 @@ import moment from '../moment';
 
 export default moment.defineLocale('en-ca', {
     months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-    monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sept_Oct_Nov_Dec'.split('_'),
-    monthsParse : [/^jan/i, /^feb/i, /^mar/i, /^apr/i, /^may/i, /^jun/i, /^jul/i, /^aug/i, /^sep/i, /^oct/i, /^nov/i, /^dec/i],
-    longMonthsParse : [/^january$/i, /^february$/i, /^march$/i, /^april$/i, /^may$/i, /^june$/i, /^july$/i, /^august$/i, /^september$/i, /^october$/i, /^november$/i, /^december$/i],
-    shortMonthsParse : [/^jan$/i, /^feb$/i, /^mar$/i, /^apr$/i, /^may$/i, /^jun$/i, /^jul$/i, /^aug/i, /^sept?$/i, /^oct$/i, /^nov$/i, /^dec$/i],
+    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('_'),
     weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),

diff --git a/src/locale/en-gb.js b/src/locale/en-gb.js
index 160e7f118f44020cf9dbf53ea9c34b3f2090c3e2..82a643fc34026df4afa894db667f6d239af53e68 100644 (file)
--- a/src/locale/en-gb.js
+++ b/src/locale/en-gb.js
@@ -6,10 +6,7 @@ import moment from '../moment';
 
 export default moment.defineLocale('en-gb', {
     months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-    monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sept_Oct_Nov_Dec'.split('_'),
-    monthsParse : [/^jan/i, /^feb/i, /^mar/i, /^apr/i, /^may/i, /^jun/i, /^jul/i, /^aug/i, /^sep/i, /^oct/i, /^nov/i, /^dec/i],
-    longMonthsParse : [/^january$/i, /^february$/i, /^march$/i, /^april$/i, /^may$/i, /^june$/i, /^july$/i, /^august$/i, /^september$/i, /^october$/i, /^november$/i, /^december$/i],
-    shortMonthsParse : [/^jan$/i, /^feb$/i, /^mar$/i, /^apr$/i, /^may$/i, /^jun$/i, /^jul$/i, /^aug/i, /^sept?$/i, /^oct$/i, /^nov$/i, /^dec$/i],
+    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('_'),
     weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),

diff --git a/src/locale/en-ie.js b/src/locale/en-ie.js
index 7316df23b2c8f1b3aee80bc04fd416889e53908c..cb3ae8faf65397b85276255fa1e65f852aacde0f 100644 (file)
--- a/src/locale/en-ie.js
+++ b/src/locale/en-ie.js
@@ -7,9 +7,6 @@ import moment from '../moment';
 export default moment.defineLocale('en-ie', {
     months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
     monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
-    monthsParse : [/^jan/i, /^feb/i, /^mar/i, /^apr/i, /^may/i, /^jun/i, /^jul/i, /^aug/i, /^sep/i, /^oct/i, /^nov/i, /^dec/i],
-    longMonthsParse : [/^january$/i, /^february$/i, /^march$/i, /^april$/i, /^may$/i, /^june$/i, /^july$/i, /^august$/i, /^september$/i, /^october$/i, /^november$/i, /^december$/i],
-    shortMonthsParse : [/^jan$/i, /^feb$/i, /^mar$/i, /^apr$/i, /^may$/i, /^jun$/i, /^jul$/i, /^aug/i, /^sept?$/i, /^oct$/i, /^nov$/i, /^dec$/i],
     weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
     weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
     weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),

diff --git a/src/locale/en-nz.js b/src/locale/en-nz.js
index 2e22269753f9c01a1e3d50ef486f4e765d494d80..c6e9f18a050b01aa3c05893d2d02f740eceeb4cd 100644 (file)
--- a/src/locale/en-nz.js
+++ b/src/locale/en-nz.js
@@ -5,10 +5,7 @@ import moment from '../moment';
 
 export default moment.defineLocale('en-nz', {
     months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-    monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sept_Oct_Nov_Dec'.split('_'),
-    monthsParse : [/^jan/i, /^feb/i, /^mar/i, /^apr/i, /^may/i, /^jun/i, /^jul/i, /^aug/i, /^sep/i, /^oct/i, /^nov/i, /^dec/i],
-    longMonthsParse : [/^january$/i, /^february$/i, /^march$/i, /^april$/i, /^may$/i, /^june$/i, /^july$/i, /^august$/i, /^september$/i, /^october$/i, /^november$/i, /^december$/i],
-    shortMonthsParse : [/^jan$/i, /^feb$/i, /^mar$/i, /^apr$/i, /^may$/i, /^jun$/i, /^jul$/i, /^aug/i, /^sept?$/i, /^oct$/i, /^nov$/i, /^dec$/i],
+    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('_'),
     weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),

diff --git a/src/test/locale/en-au.js b/src/test/locale/en-au.js
index db65cf3bc51c5af414e63431134af2ffb626c849..f5acdf126c417834a1cb6610cb7a6ac34e314670 100644 (file)
--- a/src/test/locale/en-au.js
+++ b/src/test/locale/en-au.js
@@ -3,7 +3,7 @@ import moment from '../../moment';
 localeModule('en-au');
 
 test('parse', function (assert) {
-    var tests = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sept_October Oct_November Nov_December Dec'.split('_'), i;
+    var tests = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split('_'), i;
     function equalTest(input, mmm, i) {
         assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
     }
@@ -91,7 +91,7 @@ test('format ordinal', function (assert) {
 });
 
 test('format month', function (assert) {
-    var expected = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sept_October Oct_November Nov_December Dec'.split('_'), i;
+    var expected = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split('_'), i;
     for (i = 0; i < expected.length; i++) {
         assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
     }

diff --git a/src/test/locale/en-ca.js b/src/test/locale/en-ca.js
index ee822f4acc75a349b1ccb1da3f78ca88470bcfdc..edaa5d4c8393b34d87b63554018328a83622384c 100644 (file)
--- a/src/test/locale/en-ca.js
+++ b/src/test/locale/en-ca.js
@@ -4,7 +4,7 @@ localeModule('en-ca');
 
 test('parse', function (assert) {
     var i,
-        tests = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sept_October Oct_November Nov_December Dec'.split('_');
+        tests = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split('_');
 
     function equalTest(input, mmm, i) {
         assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
@@ -96,7 +96,7 @@ test('format ordinal', function (assert) {
 
 test('format month', function (assert) {
     var i,
-        expected = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sept_October Oct_November Nov_December Dec'.split('_');
+        expected = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split('_');
 
     for (i = 0; i < expected.length; i++) {
         assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);

diff --git a/src/test/locale/en-gb.js b/src/test/locale/en-gb.js
index 5ddc16eb36cbd4da3f35eb41268c872082447edd..4187ca74cd844eab47b23cdc6f1c9ae911921ca5 100644 (file)
--- a/src/test/locale/en-gb.js
+++ b/src/test/locale/en-gb.js
@@ -3,7 +3,7 @@ import moment from '../../moment';
 localeModule('en-gb');
 
 test('parse', function (assert) {
-    var tests = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sept_October Oct_November Nov_December Dec'.split('_'), i;
+    var tests = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split('_'), i;
     function equalTest(input, mmm, i) {
         assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
     }
@@ -91,7 +91,7 @@ test('format ordinal', function (assert) {
 });
 
 test('format month', function (assert) {
-    var expected = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sept_October Oct_November Nov_December Dec'.split('_'), i;
+    var expected = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split('_'), i;
     for (i = 0; i < expected.length; i++) {
         assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
     }

diff --git a/src/test/locale/en-nz.js b/src/test/locale/en-nz.js
index 5bfa5e5829e9573dd55a4d7973d143e87dd9ebd8..90c4f1b81bbac0b5ce8d855a03a57ea681b0202d 100644 (file)
--- a/src/test/locale/en-nz.js
+++ b/src/test/locale/en-nz.js
@@ -3,7 +3,7 @@ import moment from '../../moment';
 localeModule('en-nz');
 
 test('parse', function (assert) {
-    var tests = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sept_October Oct_November Nov_December Dec'.split('_'), i;
+    var tests = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split('_'), i;
     function equalTest(input, mmm, i) {
         assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
     }
@@ -91,7 +91,7 @@ test('format ordinal', function (assert) {
 });
 
 test('format month', function (assert) {
-    var expected = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sept_October Oct_November Nov_December Dec'.split('_'), i;
+    var expected = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split('_'), i;
     for (i = 0; i < expected.length; i++) {
         assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
     }

diff --git a/src/test/locale/en.js b/src/test/locale/en.js
index 2b12f9d35cc4cd36b58db4ec749e52d9e19e518c..f0f205d8a2060d091dea5d98c22f4f51e3735237 100644 (file)
--- a/src/test/locale/en.js
+++ b/src/test/locale/en.js
@@ -4,7 +4,7 @@ localeModule('en');
 
 test('parse', function (assert) {
     var i,
-        tests = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sept_October Oct_November Nov_December Dec'.split('_');
+        tests = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split('_');
 
     function equalTest(input, mmm, i) {
         assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
@@ -96,7 +96,7 @@ test('format ordinal', function (assert) {
 
 test('format month', function (assert) {
     var i,
-        expected = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sept_October Oct_November Nov_December Dec'.split('_');
+        expected = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split('_');
 
     for (i = 0; i < expected.length; i++) {
         assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);

diff --git a/src/test/moment/create.js b/src/test/moment/create.js
index 17ee70d15d5578bf45905554e9b5d9f786eb426c..dbe31af082987b014e5286b0cb8ae07ca2a1eb3b 100644 (file)
--- a/src/test/moment/create.js
+++ b/src/test/moment/create.js
@@ -234,11 +234,11 @@ test('string with format', function (assert) {
         ['L',                   '09/02/1999'],
         ['l',                   '9/2/1999'],
         ['LL',                  'September 2, 1999'],
-        ['ll',                  'Sept 2, 1999'],
+        ['ll',                  'Sep 2, 1999'],
         ['LLL',                 'September 2, 1999 12:30 AM'],
-        ['lll',                 'Sept 2, 1999 12:30 AM'],
+        ['lll',                 'Sep 2, 1999 12:30 AM'],
         ['LLLL',                'Thursday, September 2, 1999 12:30 AM'],
-        ['llll',                'Thu, Sept 2, 1999 12:30 AM']
+        ['llll',                'Thu, Sep 2, 1999 12:30 AM']
     ],
     m,
     i;
@@ -290,7 +290,7 @@ test('string with format no separators', function (assert) {
         ['MMDDYYYY',          '12021999'],
         ['DDMMYYYY',          '12021999'],
         ['YYYYMMDD',          '19991202'],
-        ['DDMMMYYYY',         '10Sept2001']
+        ['DDMMMYYYY',         '10Sep2001']
     ], i;
 
     for (i = 0; i < a.length; i++) {

diff --git a/src/test/moment/is_valid.js b/src/test/moment/is_valid.js
index adf2e5f2fab04a212aca5f414f5ae7563d70a55d..6b3abeba5eadd0bf445f6b47c751e38950160f9a 100644 (file)
--- a/src/test/moment/is_valid.js
+++ b/src/test/moment/is_valid.js
@@ -77,7 +77,6 @@ test('string with bad month name', function (assert) {
 
 test('string with spaceless format', function (assert) {
     assert.equal(moment('10Sep2001', 'DDMMMYYYY').isValid(), true, 'Parsing 10Sep2001 should result in a valid date');
-    assert.equal(moment('10Sept2001', 'DDMMMYYYY').isValid(), true, 'Parsing 10Sept2001 should result in a valid date');
 });
 
 test('invalid string iso 8601', function (assert) {

diff --git a/src/test/moment/listers.js b/src/test/moment/listers.js
index bbe95698d09073dee96cbfed85f9d75d9b26fdf3..242ae3402102cbfefcca85eecb4385fbd06bbab9 100644 (file)
--- a/src/test/moment/listers.js
+++ b/src/test/moment/listers.js
@@ -5,7 +5,7 @@ module('listers');
 
 test('default', function (assert) {
     assert.deepEqual(moment.months(), ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']);
-    assert.deepEqual(moment.monthsShort(), ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sept', 'Oct', 'Nov', 'Dec']);
+    assert.deepEqual(moment.monthsShort(), ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']);
     assert.deepEqual(moment.weekdays(), ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']);
     assert.deepEqual(moment.weekdaysShort(), ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']);
     assert.deepEqual(moment.weekdaysMin(), ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa']);