From a8ff975474868335486654be6c116f9f27e5618c Mon Sep 17 00:00:00 2001 From: Iskren Chernev Date: Sat, 9 Jan 2016 11:07:51 +0200 Subject: [PATCH] Revert "Merge pull request #2746 from mbad0la:develop" This reverts commit 9ea2d6b1a86d59b36bce792771cffc3f85b382b0, reversing changes made to f52a86863dd1fc638501b5f4b4fbe371f8fa725d. --- src/lib/locale/en.js | 3 --- src/lib/units/month.js | 2 +- src/locale/en-au.js | 5 +---- src/locale/en-ca.js | 5 +---- src/locale/en-gb.js | 5 +---- src/locale/en-ie.js | 3 --- src/locale/en-nz.js | 5 +---- src/test/locale/en-au.js | 4 ++-- src/test/locale/en-ca.js | 4 ++-- src/test/locale/en-gb.js | 4 ++-- src/test/locale/en-nz.js | 4 ++-- src/test/locale/en.js | 4 ++-- src/test/moment/create.js | 8 ++++---- src/test/moment/is_valid.js | 1 - src/test/moment/listers.js | 2 +- 15 files changed, 20 insertions(+), 39 deletions(-) diff --git a/src/lib/locale/en.js b/src/lib/locale/en.js index 30d95f281..20964cd9c 100644 --- 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 3584f6ba9..18e42cff8 100644 --- 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 d20c76b29..13c4702d8 100644 --- 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 22988a653..9273cf693 100644 --- 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 160e7f118..82a643fc3 100644 --- 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 7316df23b..cb3ae8faf 100644 --- 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 2e2226975..c6e9f18a0 100644 --- 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 db65cf3bc..f5acdf126 100644 --- 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 ee822f4ac..edaa5d4c8 100644 --- 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 5ddc16eb3..4187ca74c 100644 --- 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 5bfa5e582..90c4f1b81 100644 --- 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 2b12f9d35..f0f205d8a 100644 --- 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 17ee70d15..dbe31af08 100644 --- 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 adf2e5f2f..6b3abeba5 100644 --- 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 bbe95698d..242ae3402 100644 --- 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']); -- 2.47.2