From: François B Date: Mon, 27 Feb 2017 08:07:21 +0000 (+0100) Subject: Rename ordinalParse → dayOfMonthOrdinalParse X-Git-Tag: 2.18.0~8^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f613c2cccdfd2aaeb646247ff22a8361b1cd7dd;p=thirdparty%2Fmoment.git Rename ordinalParse → dayOfMonthOrdinalParse "ordinalParse" was poorly named, because, contrary to "ordinal" short which is responsible to display ordinal for many units, the former cares only about day of month parsing. --- diff --git a/src/lib/locale/base-config.js b/src/lib/locale/base-config.js index cbb0b36b4..d7a7c66db 100644 --- a/src/lib/locale/base-config.js +++ b/src/lib/locale/base-config.js @@ -1,7 +1,7 @@ import { defaultCalendar } from './calendar'; import { defaultLongDateFormat } from './formats'; import { defaultInvalidDate } from './invalid'; -import { defaultOrdinal, defaultOrdinalParse } from './ordinal'; +import { defaultOrdinal, defaultDayOfMonthOrdinalParse } from './ordinal'; import { defaultRelativeTime } from './relative'; // months @@ -28,7 +28,7 @@ export var baseConfig = { longDateFormat: defaultLongDateFormat, invalidDate: defaultInvalidDate, ordinal: defaultOrdinal, - ordinalParse: defaultOrdinalParse, + dayOfMonthOrdinalParse: defaultDayOfMonthOrdinalParse, relativeTime: defaultRelativeTime, months: defaultLocaleMonths, diff --git a/src/lib/locale/en.js b/src/lib/locale/en.js index 20964cd9c..4a7d250be 100644 --- a/src/lib/locale/en.js +++ b/src/lib/locale/en.js @@ -3,7 +3,7 @@ import { getSetGlobalLocale } from './locales'; import toInt from '../utils/to-int'; getSetGlobalLocale('en', { - ordinalParse: /\d{1,2}(th|st|nd|rd)/, + dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/, ordinal : function (number) { var b = number % 10, output = (toInt(number % 100 / 10) === 1) ? 'th' : diff --git a/src/lib/locale/ordinal.js b/src/lib/locale/ordinal.js index 0028aca02..e2efc05a2 100644 --- a/src/lib/locale/ordinal.js +++ b/src/lib/locale/ordinal.js @@ -1,5 +1,5 @@ export var defaultOrdinal = '%d'; -export var defaultOrdinalParse = /\d{1,2}/; +export var defaultDayOfMonthOrdinalParse = /\d{1,2}/; export function ordinal (number) { return this._ordinal.replace('%d', number); diff --git a/src/lib/locale/set.js b/src/lib/locale/set.js index 45a2f46e1..c977d95eb 100644 --- a/src/lib/locale/set.js +++ b/src/lib/locale/set.js @@ -15,8 +15,9 @@ export function set (config) { } this._config = config; // Lenient ordinal parsing accepts just a number in addition to - // number + (possibly) stuff coming from _ordinalParseLenient. - this._ordinalParseLenient = new RegExp(this._ordinalParse.source + '|' + (/\d{1,2}/).source); + // number + (possibly) stuff coming from _dayOfMonthOrdinalParse. + this._dayOfMonthOrdinalParseLenient = new RegExp( + this._dayOfMonthOrdinalParse.source + '|' + (/\d{1,2}/).source); } export function mergeConfigs(parentConfig, childConfig) { diff --git a/src/lib/units/day-of-month.js b/src/lib/units/day-of-month.js index e28ec9f4d..d277b32e8 100644 --- a/src/lib/units/day-of-month.js +++ b/src/lib/units/day-of-month.js @@ -23,7 +23,7 @@ addUnitPriority('date', 9); addRegexToken('D', match1to2); addRegexToken('DD', match1to2, match2); addRegexToken('Do', function (isStrict, locale) { - return isStrict ? locale._ordinalParse : locale._ordinalParseLenient; + return isStrict ? locale._dayOfMonthOrdinalParse : locale._dayOfMonthOrdinalParseLenient; }); addParseToken(['D', 'DD'], DATE); diff --git a/src/locale/af.js b/src/locale/af.js index addd82738..b6bdbabc2 100644 --- a/src/locale/af.js +++ b/src/locale/af.js @@ -52,7 +52,7 @@ export default moment.defineLocale('af', { y : '\'n jaar', yy : '%d jaar' }, - ordinalParse: /\d{1,2}(ste|de)/, + dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/, ordinal : function (number) { return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); // Thanks to Joris Röling : https://github.com/jjupiter }, diff --git a/src/locale/az.js b/src/locale/az.js index f9b368b81..74a08bd7f 100644 --- a/src/locale/az.js +++ b/src/locale/az.js @@ -78,7 +78,7 @@ export default moment.defineLocale('az', { return 'axşam'; } }, - ordinalParse: /\d{1,2}-(ıncı|inci|nci|üncü|ncı|uncu)/, + dayOfMonthOrdinalParse: /\d{1,2}-(ıncı|inci|nci|üncü|ncı|uncu)/, ordinal : function (number) { if (number === 0) { // special case for zero return number + '-ıncı'; diff --git a/src/locale/be.js b/src/locale/be.js index c22c6e1e6..233972c62 100644 --- a/src/locale/be.js +++ b/src/locale/be.js @@ -102,7 +102,7 @@ export default moment.defineLocale('be', { return 'вечара'; } }, - ordinalParse: /\d{1,2}-(і|ы|га)/, + dayOfMonthOrdinalParse: /\d{1,2}-(і|ы|га)/, ordinal: function (number, period) { switch (period) { case 'M': diff --git a/src/locale/bg.js b/src/locale/bg.js index 0c4597ed5..a09df5241 100644 --- a/src/locale/bg.js +++ b/src/locale/bg.js @@ -53,7 +53,7 @@ export default moment.defineLocale('bg', { y : 'година', yy : '%d години' }, - ordinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/, + dayOfMonthOrdinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/, ordinal : function (number) { var lastDigit = number % 10, last2Digits = number % 100; diff --git a/src/locale/br.js b/src/locale/br.js index 86c580d47..925d1303b 100644 --- a/src/locale/br.js +++ b/src/locale/br.js @@ -86,7 +86,7 @@ export default moment.defineLocale('br', { y : 'ur bloaz', yy : specialMutationForYears }, - ordinalParse: /\d{1,2}(añ|vet)/, + dayOfMonthOrdinalParse: /\d{1,2}(añ|vet)/, ordinal : function (number) { var output = (number === 1) ? 'añ' : 'vet'; return number + output; diff --git a/src/locale/bs.js b/src/locale/bs.js index 90cb0b96c..970082148 100644 --- a/src/locale/bs.js +++ b/src/locale/bs.js @@ -124,7 +124,7 @@ export default moment.defineLocale('bs', { y : 'godinu', yy : translate }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/ca.js b/src/locale/ca.js index b66353929..fe806973c 100644 --- a/src/locale/ca.js +++ b/src/locale/ca.js @@ -60,7 +60,7 @@ export default moment.defineLocale('ca', { y : 'un any', yy : '%d anys' }, - ordinalParse: /\d{1,2}(r|n|t|è|a)/, + dayOfMonthOrdinalParse: /\d{1,2}(r|n|t|è|a)/, ordinal : function (number, period) { var output = (number === 1) ? 'r' : (number === 2) ? 'n' : diff --git a/src/locale/cs.js b/src/locale/cs.js index 621b8031c..144bae0ac 100644 --- a/src/locale/cs.js +++ b/src/locale/cs.js @@ -153,7 +153,7 @@ export default moment.defineLocale('cs', { y : translate, yy : translate }, - ordinalParse : /\d{1,2}\./, + dayOfMonthOrdinalParse : /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/cv.js b/src/locale/cv.js index 1884d2dbf..354ff66e7 100644 --- a/src/locale/cv.js +++ b/src/locale/cv.js @@ -44,7 +44,7 @@ export default moment.defineLocale('cv', { y : 'пӗр ҫул', yy : '%d ҫул' }, - ordinalParse: /\d{1,2}-мӗш/, + dayOfMonthOrdinalParse: /\d{1,2}-мӗш/, ordinal : '%d-мӗш', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/cy.js b/src/locale/cy.js index 972b70099..615bac310 100644 --- a/src/locale/cy.js +++ b/src/locale/cy.js @@ -44,7 +44,7 @@ export default moment.defineLocale('cy', { y: 'blwyddyn', yy: '%d flynedd' }, - ordinalParse: /\d{1,2}(fed|ain|af|il|ydd|ed|eg)/, + dayOfMonthOrdinalParse: /\d{1,2}(fed|ain|af|il|ydd|ed|eg)/, // traditional ordinal numbers above 31 are not commonly used in colloquial Welsh ordinal: function (number) { var b = number, diff --git a/src/locale/da.js b/src/locale/da.js index 973a3fea4..7e601e2fa 100644 --- a/src/locale/da.js +++ b/src/locale/da.js @@ -41,7 +41,7 @@ export default moment.defineLocale('da', { y : 'et Ã¥r', yy : '%d Ã¥r' }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/de-at.js b/src/locale/de-at.js index 4e59f6872..e00201129 100644 --- a/src/locale/de-at.js +++ b/src/locale/de-at.js @@ -60,7 +60,7 @@ export default moment.defineLocale('de-at', { y : processRelativeTime, yy : processRelativeTime }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/de.js b/src/locale/de.js index 1839b5955..c54f59c25 100644 --- a/src/locale/de.js +++ b/src/locale/de.js @@ -59,7 +59,7 @@ export default moment.defineLocale('de', { y : processRelativeTime, yy : processRelativeTime }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/el.js b/src/locale/el.js index dee3d2560..facd7f6a2 100644 --- a/src/locale/el.js +++ b/src/locale/el.js @@ -78,7 +78,7 @@ export default moment.defineLocale('el', { y : 'ένας χρόνος', yy : '%d χρόνια' }, - ordinalParse: /\d{1,2}η/, + dayOfMonthOrdinalParse: /\d{1,2}η/, ordinal: '%dη', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/en-au.js b/src/locale/en-au.js index 5f7140952..4e3d5f4fa 100644 --- a/src/locale/en-au.js +++ b/src/locale/en-au.js @@ -41,7 +41,7 @@ export default moment.defineLocale('en-au', { y : 'a year', yy : '%d years' }, - ordinalParse: /\d{1,2}(st|nd|rd|th)/, + dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/, ordinal : function (number) { var b = number % 10, output = (~~(number % 100 / 10) === 1) ? 'th' : diff --git a/src/locale/en-ca.js b/src/locale/en-ca.js index a678eab57..4783cfec2 100644 --- a/src/locale/en-ca.js +++ b/src/locale/en-ca.js @@ -41,7 +41,7 @@ export default moment.defineLocale('en-ca', { y : 'a year', yy : '%d years' }, - ordinalParse: /\d{1,2}(st|nd|rd|th)/, + dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/, ordinal : function (number) { var b = number % 10, output = (~~(number % 100 / 10) === 1) ? 'th' : diff --git a/src/locale/en-gb.js b/src/locale/en-gb.js index f551112d7..ccff36607 100644 --- a/src/locale/en-gb.js +++ b/src/locale/en-gb.js @@ -41,7 +41,7 @@ export default moment.defineLocale('en-gb', { y : 'a year', yy : '%d years' }, - ordinalParse: /\d{1,2}(st|nd|rd|th)/, + dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/, ordinal : function (number) { var b = number % 10, output = (~~(number % 100 / 10) === 1) ? 'th' : diff --git a/src/locale/en-ie.js b/src/locale/en-ie.js index 3447973e3..008b84e57 100644 --- a/src/locale/en-ie.js +++ b/src/locale/en-ie.js @@ -41,7 +41,7 @@ export default moment.defineLocale('en-ie', { y : 'a year', yy : '%d years' }, - ordinalParse: /\d{1,2}(st|nd|rd|th)/, + dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/, ordinal : function (number) { var b = number % 10, output = (~~(number % 100 / 10) === 1) ? 'th' : diff --git a/src/locale/en-nz.js b/src/locale/en-nz.js index 8413be1c2..a974da7cd 100644 --- a/src/locale/en-nz.js +++ b/src/locale/en-nz.js @@ -41,7 +41,7 @@ export default moment.defineLocale('en-nz', { y : 'a year', yy : '%d years' }, - ordinalParse: /\d{1,2}(st|nd|rd|th)/, + dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/, ordinal : function (number) { var b = number % 10, output = (~~(number % 100 / 10) === 1) ? 'th' : diff --git a/src/locale/eo.js b/src/locale/eo.js index 81bd0f68a..66cb7683f 100644 --- a/src/locale/eo.js +++ b/src/locale/eo.js @@ -54,7 +54,7 @@ export default moment.defineLocale('eo', { y : 'jaro', yy : '%d jaroj' }, - ordinalParse: /\d{1,2}a/, + dayOfMonthOrdinalParse: /\d{1,2}a/, ordinal : '%da', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/es-do.js b/src/locale/es-do.js index c0e713b1e..43a861476 100644 --- a/src/locale/es-do.js +++ b/src/locale/es-do.js @@ -63,7 +63,7 @@ export default moment.defineLocale('es-do', { y : 'un año', yy : '%d años' }, - ordinalParse : /\d{1,2}º/, + dayOfMonthOrdinalParse : /\d{1,2}º/, ordinal : '%dº', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/es.js b/src/locale/es.js index f4b720e66..78607eae2 100644 --- a/src/locale/es.js +++ b/src/locale/es.js @@ -64,7 +64,7 @@ export default moment.defineLocale('es', { y : 'un año', yy : '%d años' }, - ordinalParse : /\d{1,2}º/, + dayOfMonthOrdinalParse : /\d{1,2}º/, ordinal : '%dº', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/et.js b/src/locale/et.js index f8a718ba6..faa458581 100644 --- a/src/locale/et.js +++ b/src/locale/et.js @@ -61,7 +61,7 @@ export default moment.defineLocale('et', { y : processRelativeTime, yy : processRelativeTime }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/eu.js b/src/locale/eu.js index 390819b65..b73019ec1 100644 --- a/src/locale/eu.js +++ b/src/locale/eu.js @@ -47,7 +47,7 @@ export default moment.defineLocale('eu', { y : 'urte bat', yy : '%d urte' }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/fa.js b/src/locale/fa.js index 45c950d12..7daa53af3 100644 --- a/src/locale/fa.js +++ b/src/locale/fa.js @@ -87,7 +87,7 @@ export default moment.defineLocale('fa', { return symbolMap[match]; }).replace(/,/g, '،'); }, - ordinalParse: /\d{1,2}م/, + dayOfMonthOrdinalParse: /\d{1,2}م/, ordinal : '%dم', week : { dow : 6, // Saturday is the first day of the week. diff --git a/src/locale/fi.js b/src/locale/fi.js index f91e1280b..07ebb29c1 100644 --- a/src/locale/fi.js +++ b/src/locale/fi.js @@ -88,7 +88,7 @@ export default moment.defineLocale('fi', { y : translate, yy : translate }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/fo.js b/src/locale/fo.js index e3b169d74..15749b7a4 100644 --- a/src/locale/fo.js +++ b/src/locale/fo.js @@ -41,7 +41,7 @@ export default moment.defineLocale('fo', { y : 'eitt ár', yy : '%d ár' }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/fr-ca.js b/src/locale/fr-ca.js index 3228b8dc0..82d822c29 100644 --- a/src/locale/fr-ca.js +++ b/src/locale/fr-ca.js @@ -43,7 +43,7 @@ export default moment.defineLocale('fr-ca', { y : 'un an', yy : '%d ans' }, - ordinalParse : /\d{1,2}(er|e)/, + dayOfMonthOrdinalParse: /\d{1,2}(er|e)/, ordinal : function (number, period) { switch (period) { // Words with masculine grammatical gender: mois, trimestre, jour diff --git a/src/locale/fr-ch.js b/src/locale/fr-ch.js index 714081544..7bfe02880 100644 --- a/src/locale/fr-ch.js +++ b/src/locale/fr-ch.js @@ -43,7 +43,7 @@ export default moment.defineLocale('fr-ch', { y : 'un an', yy : '%d ans' }, - ordinalParse : /\d{1,2}(er|e)/, + dayOfMonthOrdinalParse: /\d{1,2}(er|e)/, ordinal : function (number, period) { switch (period) { // Words with masculine grammatical gender: mois, trimestre, jour diff --git a/src/locale/fr.js b/src/locale/fr.js index 7e7fe636b..f2fac695f 100644 --- a/src/locale/fr.js +++ b/src/locale/fr.js @@ -43,7 +43,7 @@ export default moment.defineLocale('fr', { y : 'un an', yy : '%d ans' }, - ordinalParse : /\d{1,2}(er|)/, + dayOfMonthOrdinalParse: /\d{1,2}(er|)/, ordinal : function (number, period) { switch (period) { // TODO: Return 'e' when day of month > 1. Move this case inside diff --git a/src/locale/fy.js b/src/locale/fy.js index 1b49a6318..c0c58a3a4 100644 --- a/src/locale/fy.js +++ b/src/locale/fy.js @@ -54,7 +54,7 @@ export default moment.defineLocale('fy', { y : 'ien jier', yy : '%d jierren' }, - ordinalParse: /\d{1,2}(ste|de)/, + dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/, ordinal : function (number) { return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); }, diff --git a/src/locale/gd.js b/src/locale/gd.js index 3ec664e47..e088871bc 100644 --- a/src/locale/gd.js +++ b/src/locale/gd.js @@ -54,7 +54,7 @@ export default moment.defineLocale('gd', { y : 'bliadhna', yy : '%d bliadhna' }, - ordinalParse : /\d{1,2}(d|na|mh)/, + dayOfMonthOrdinalParse : /\d{1,2}(d|na|mh)/, ordinal : function (number) { var output = number === 1 ? 'd' : number % 10 === 2 ? 'na' : 'mh'; return number + output; diff --git a/src/locale/gl.js b/src/locale/gl.js index d0ea61d49..6f53907f1 100644 --- a/src/locale/gl.js +++ b/src/locale/gl.js @@ -58,7 +58,7 @@ export default moment.defineLocale('gl', { y : 'un ano', yy : '%d anos' }, - ordinalParse : /\d{1,2}º/, + dayOfMonthOrdinalParse : /\d{1,2}º/, ordinal : '%dº', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/hr.js b/src/locale/hr.js index 84878ad09..59d060c4b 100644 --- a/src/locale/hr.js +++ b/src/locale/hr.js @@ -126,7 +126,7 @@ export default moment.defineLocale('hr', { y : 'godinu', yy : translate }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/hu.js b/src/locale/hu.js index 0cffecf83..6f636111b 100644 --- a/src/locale/hu.js +++ b/src/locale/hu.js @@ -90,7 +90,7 @@ export default moment.defineLocale('hu', { y : translate, yy : translate }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/hy-am.js b/src/locale/hy-am.js index bc50205e0..8cd904a3c 100644 --- a/src/locale/hy-am.js +++ b/src/locale/hy-am.js @@ -63,7 +63,7 @@ export default moment.defineLocale('hy-am', { return 'երեկոյան'; } }, - ordinalParse: /\d{1,2}|\d{1,2}-(Õ«Õ¶|րդ)/, + dayOfMonthOrdinalParse: /\d{1,2}|\d{1,2}-(Õ«Õ¶|րդ)/, ordinal: function (number, period) { switch (period) { case 'DDD': diff --git a/src/locale/is.js b/src/locale/is.js index 22f873d0b..d1c90cd0b 100644 --- a/src/locale/is.js +++ b/src/locale/is.js @@ -108,7 +108,7 @@ export default moment.defineLocale('is', { y : translate, yy : translate }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/it.js b/src/locale/it.js index 0b4fe0ffd..1edd3c758 100644 --- a/src/locale/it.js +++ b/src/locale/it.js @@ -51,7 +51,7 @@ export default moment.defineLocale('it', { y : 'un anno', yy : '%d anni' }, - ordinalParse : /\d{1,2}º/, + dayOfMonthOrdinalParse : /\d{1,2}º/, ordinal: '%dº', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/ja.js b/src/locale/ja.js index 6b2180489..5fffc83e0 100644 --- a/src/locale/ja.js +++ b/src/locale/ja.js @@ -41,7 +41,7 @@ export default moment.defineLocale('ja', { lastWeek : '[前週]dddd LT', sameElse : 'L' }, - ordinalParse : /\d{1,2}日/, + dayOfMonthOrdinalParse : /\d{1,2}日/, ordinal : function (number, period) { switch (period) { case 'd': diff --git a/src/locale/ka.js b/src/locale/ka.js index 42b527703..6bae6a069 100644 --- a/src/locale/ka.js +++ b/src/locale/ka.js @@ -59,7 +59,7 @@ export default moment.defineLocale('ka', { y : 'წელი', yy : '%d წელი' }, - ordinalParse: /0|1-ლი|მე-\d{1,2}|\d{1,2}-ე/, + dayOfMonthOrdinalParse: /0|1-ლი|მე-\d{1,2}|\d{1,2}-ე/, ordinal : function (number) { if (number === 0) { return number; diff --git a/src/locale/kk.js b/src/locale/kk.js index 073405439..95b81fbad 100644 --- a/src/locale/kk.js +++ b/src/locale/kk.js @@ -64,7 +64,7 @@ export default moment.defineLocale('kk', { y : 'бір жыл', yy : '%d жыл' }, - ordinalParse: /\d{1,2}-(ші|шы)/, + dayOfMonthOrdinalParse: /\d{1,2}-(ші|шы)/, ordinal : function (number) { var a = number % 10, b = number >= 100 ? 100 : null; diff --git a/src/locale/ko.js b/src/locale/ko.js index 4fdcae1de..7018e7365 100644 --- a/src/locale/ko.js +++ b/src/locale/ko.js @@ -47,7 +47,7 @@ export default moment.defineLocale('ko', { y : '일 년', yy : '%d년' }, - ordinalParse : /\d{1,2}일/, + dayOfMonthOrdinalParse : /\d{1,2}일/, ordinal : '%d일', meridiemParse : /오전|오후/, isPM : function (token) { diff --git a/src/locale/ky.js b/src/locale/ky.js index 566677c81..3aeaa244f 100644 --- a/src/locale/ky.js +++ b/src/locale/ky.js @@ -65,7 +65,7 @@ export default moment.defineLocale('ky', { y : 'бир жыл', yy : '%d жыл' }, - ordinalParse: /\d{1,2}-(чи|чы|чү|чу)/, + dayOfMonthOrdinalParse: /\d{1,2}-(чи|чы|чү|чу)/, ordinal : function (number) { var a = number % 10, b = number >= 100 ? 100 : null; diff --git a/src/locale/lb.js b/src/locale/lb.js index 843b7adf2..adaf04b06 100644 --- a/src/locale/lb.js +++ b/src/locale/lb.js @@ -118,7 +118,7 @@ export default moment.defineLocale('lb', { y : processRelativeTime, yy : '%d Joer' }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal: '%d.', week: { dow: 1, // Monday is the first day of the week. diff --git a/src/locale/lo.js b/src/locale/lo.js index 5f6ad7d5c..c049693b3 100644 --- a/src/locale/lo.js +++ b/src/locale/lo.js @@ -53,7 +53,7 @@ export default moment.defineLocale('lo', { y : '1 ປີ', yy : '%d ປີ' }, - ordinalParse: /(ທີ່)\d{1,2}/, + dayOfMonthOrdinalParse: /(ທີ່)\d{1,2}/, ordinal : function (number) { return 'ທີ່' + number; } diff --git a/src/locale/lt.js b/src/locale/lt.js index 363f19360..1043cd326 100644 --- a/src/locale/lt.js +++ b/src/locale/lt.js @@ -96,7 +96,7 @@ export default moment.defineLocale('lt', { y : translateSingular, yy : translate }, - ordinalParse: /\d{1,2}-oji/, + dayOfMonthOrdinalParse: /\d{1,2}-oji/, ordinal : function (number) { return number + '-oji'; }, diff --git a/src/locale/lv.js b/src/locale/lv.js index 5afe0b7af..4a07b2c86 100644 --- a/src/locale/lv.js +++ b/src/locale/lv.js @@ -78,7 +78,7 @@ export default moment.defineLocale('lv', { y : relativeTimeWithSingular, yy : relativeTimeWithPlural }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/me.js b/src/locale/me.js index 1635cb500..77d32b56e 100644 --- a/src/locale/me.js +++ b/src/locale/me.js @@ -92,7 +92,7 @@ export default moment.defineLocale('me', { y : 'godinu', yy : translator.translate }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/mi.js b/src/locale/mi.js index 6c894bbe0..cb77ad9e4 100644 --- a/src/locale/mi.js +++ b/src/locale/mi.js @@ -45,7 +45,7 @@ export default moment.defineLocale('mi', { y: 'he tau', yy: '%d tau' }, - ordinalParse: /\d{1,2}º/, + dayOfMonthOrdinalParse: /\d{1,2}º/, ordinal: '%dº', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/mk.js b/src/locale/mk.js index ccd7a1618..27424a7a4 100644 --- a/src/locale/mk.js +++ b/src/locale/mk.js @@ -53,7 +53,7 @@ export default moment.defineLocale('mk', { y : 'година', yy : '%d години' }, - ordinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/, + dayOfMonthOrdinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/, ordinal : function (number) { var lastDigit = number % 10, last2Digits = number % 100; diff --git a/src/locale/nb.js b/src/locale/nb.js index 00744383c..d528accec 100644 --- a/src/locale/nb.js +++ b/src/locale/nb.js @@ -44,7 +44,7 @@ export default moment.defineLocale('nb', { y : 'ett Ã¥r', yy : '%d Ã¥r' }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/nl-be.js b/src/locale/nl-be.js index adeb7e744..1e4a089ed 100644 --- a/src/locale/nl-be.js +++ b/src/locale/nl-be.js @@ -67,7 +67,7 @@ export default moment.defineLocale('nl-be', { y : 'één jaar', yy : '%d jaar' }, - ordinalParse: /\d{1,2}(ste|de)/, + dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/, ordinal : function (number) { return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); }, diff --git a/src/locale/nl.js b/src/locale/nl.js index 15fc330a9..816fd5ab2 100644 --- a/src/locale/nl.js +++ b/src/locale/nl.js @@ -67,7 +67,7 @@ export default moment.defineLocale('nl', { y : 'één jaar', yy : '%d jaar' }, - ordinalParse: /\d{1,2}(ste|de)/, + dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/, ordinal : function (number) { return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); }, diff --git a/src/locale/nn.js b/src/locale/nn.js index 13ecbca43..4bdccce5f 100644 --- a/src/locale/nn.js +++ b/src/locale/nn.js @@ -41,7 +41,7 @@ export default moment.defineLocale('nn', { y : 'eit Ã¥r', yy : '%d Ã¥r' }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/pl.js b/src/locale/pl.js index a4d331392..559163405 100644 --- a/src/locale/pl.js +++ b/src/locale/pl.js @@ -88,7 +88,7 @@ export default moment.defineLocale('pl', { y : 'rok', yy : translate }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/pt-br.js b/src/locale/pt-br.js index e4f19cc99..8ea1ddac8 100644 --- a/src/locale/pt-br.js +++ b/src/locale/pt-br.js @@ -46,7 +46,7 @@ export default moment.defineLocale('pt-br', { y : 'um ano', yy : '%d anos' }, - ordinalParse: /\d{1,2}º/, + dayOfMonthOrdinalParse: /\d{1,2}º/, ordinal : '%dº' }); diff --git a/src/locale/pt.js b/src/locale/pt.js index 72715145b..b8a2c5200 100644 --- a/src/locale/pt.js +++ b/src/locale/pt.js @@ -46,7 +46,7 @@ export default moment.defineLocale('pt', { y : 'um ano', yy : '%d anos' }, - ordinalParse: /\d{1,2}º/, + dayOfMonthOrdinalParse: /\d{1,2}º/, ordinal : '%dº', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/ru.js b/src/locale/ru.js index 2f10d6749..633208a02 100644 --- a/src/locale/ru.js +++ b/src/locale/ru.js @@ -150,7 +150,7 @@ export default moment.defineLocale('ru', { return 'вечера'; } }, - ordinalParse: /\d{1,2}-(й|го|я)/, + dayOfMonthOrdinalParse: /\d{1,2}-(й|го|я)/, ordinal: function (number, period) { switch (period) { case 'M': diff --git a/src/locale/se.js b/src/locale/se.js index af6a01c31..a46a75852 100644 --- a/src/locale/se.js +++ b/src/locale/se.js @@ -42,7 +42,7 @@ export default moment.defineLocale('se', { y : 'okta jahki', yy : '%d jagit' }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/si.js b/src/locale/si.js index 0cc2b78e5..71bdf349f 100644 --- a/src/locale/si.js +++ b/src/locale/si.js @@ -43,7 +43,7 @@ export default moment.defineLocale('si', { y : 'වසර', yy : 'වසර %d' }, - ordinalParse: /\d{1,2} වැනි/, + dayOfMonthOrdinalParse: /\d{1,2} වැනි/, ordinal : function (number) { return number + ' වැනි'; }, diff --git a/src/locale/sk.js b/src/locale/sk.js index 0d5f0e04a..0c0f5bf14 100644 --- a/src/locale/sk.js +++ b/src/locale/sk.js @@ -131,7 +131,7 @@ export default moment.defineLocale('sk', { y : translate, yy : translate }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/sl.js b/src/locale/sl.js index 2f36d5bf3..41c11e853 100644 --- a/src/locale/sl.js +++ b/src/locale/sl.js @@ -143,7 +143,7 @@ export default moment.defineLocale('sl', { y : processRelativeTime, yy : processRelativeTime }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/sq.js b/src/locale/sq.js index b0011c7f0..b47752a65 100644 --- a/src/locale/sq.js +++ b/src/locale/sq.js @@ -51,7 +51,7 @@ export default moment.defineLocale('sq', { y : 'një vit', yy : '%d vite' }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/sr-cyrl.js b/src/locale/sr-cyrl.js index 90449c1ae..69cdb6b38 100644 --- a/src/locale/sr-cyrl.js +++ b/src/locale/sr-cyrl.js @@ -91,7 +91,7 @@ export default moment.defineLocale('sr-cyrl', { y : 'годину', yy : translator.translate }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/sr.js b/src/locale/sr.js index 6716b4272..5634879cb 100644 --- a/src/locale/sr.js +++ b/src/locale/sr.js @@ -91,7 +91,7 @@ export default moment.defineLocale('sr', { y : 'godinu', yy : translator.translate }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/ss.js b/src/locale/ss.js index f6a7d0a8c..0d472bfd6 100644 --- a/src/locale/ss.js +++ b/src/locale/ss.js @@ -70,7 +70,7 @@ export default moment.defineLocale('ss', { return hour + 12; } }, - ordinalParse: /\d{1,2}/, + dayOfMonthOrdinalParse: /\d{1,2}/, ordinal : '%d', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/sv.js b/src/locale/sv.js index 15d1c9d99..7f3061398 100644 --- a/src/locale/sv.js +++ b/src/locale/sv.js @@ -43,7 +43,7 @@ export default moment.defineLocale('sv', { y : 'ett Ã¥r', yy : '%d Ã¥r' }, - ordinalParse: /\d{1,2}(e|a)/, + dayOfMonthOrdinalParse: /\d{1,2}(e|a)/, ordinal : function (number) { var b = number % 10, output = (~~(number % 100 / 10) === 1) ? 'e' : diff --git a/src/locale/ta.js b/src/locale/ta.js index 6be3e2e0b..ae418327e 100644 --- a/src/locale/ta.js +++ b/src/locale/ta.js @@ -65,7 +65,7 @@ export default moment.defineLocale('ta', { y : 'ஒரு வருடம்', yy : '%d ஆண்டுகள்' }, - ordinalParse: /\d{1,2}வது/, + dayOfMonthOrdinalParse: /\d{1,2}வது/, ordinal : function (number) { return number + 'வது'; }, diff --git a/src/locale/te.js b/src/locale/te.js index d9edc388d..d8bba8608 100644 --- a/src/locale/te.js +++ b/src/locale/te.js @@ -42,7 +42,7 @@ export default moment.defineLocale('te', { y : 'ఒక సంవత్సరం', yy : '%d సంవత్సరాలు' }, - ordinalParse : /\d{1,2}à°µ/, + dayOfMonthOrdinalParse : /\d{1,2}à°µ/, ordinal : '%dà°µ', meridiemParse: /రాత్రి|ఉదయం|మధ్యాహ్నం|సాయంత్రం/, meridiemHour : function (hour, meridiem) { diff --git a/src/locale/tet.js b/src/locale/tet.js index e048e243b..117f7dd35 100644 --- a/src/locale/tet.js +++ b/src/locale/tet.js @@ -42,7 +42,7 @@ export default moment.defineLocale('tet', { y : 'tinan ida', yy : 'tinan %d' }, - ordinalParse: /\d{1,2}(st|nd|rd|th)/, + dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/, ordinal : function (number) { var b = number % 10, output = (~~(number % 100 / 10) === 1) ? 'th' : diff --git a/src/locale/tl-ph.js b/src/locale/tl-ph.js index d93f6389b..c1bf183fc 100644 --- a/src/locale/tl-ph.js +++ b/src/locale/tl-ph.js @@ -41,7 +41,7 @@ export default moment.defineLocale('tl-ph', { y : 'isang taon', yy : '%d taon' }, - ordinalParse: /\d{1,2}/, + dayOfMonthOrdinalParse: /\d{1,2}/, ordinal : function (number) { return number; }, diff --git a/src/locale/tlh.js b/src/locale/tlh.js index af1b08d4b..857d9a716 100644 --- a/src/locale/tlh.js +++ b/src/locale/tlh.js @@ -101,7 +101,7 @@ export default moment.defineLocale('tlh', { y : 'wa’ DIS', yy : translate }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/tr.js b/src/locale/tr.js index 0ae427acb..04bdea076 100644 --- a/src/locale/tr.js +++ b/src/locale/tr.js @@ -63,7 +63,7 @@ export default moment.defineLocale('tr', { y : 'bir yıl', yy : '%d yıl' }, - ordinalParse: /\d{1,2}'(inci|nci|üncü|ncı|uncu|ıncı)/, + dayOfMonthOrdinalParse: /\d{1,2}'(inci|nci|üncü|ncı|uncu|ıncı)/, ordinal : function (number) { if (number === 0) { // special case for zero return number + '\'ıncı'; diff --git a/src/locale/tzl.js b/src/locale/tzl.js index d4fcdbfde..c86fb697c 100644 --- a/src/locale/tzl.js +++ b/src/locale/tzl.js @@ -55,7 +55,7 @@ export default moment.defineLocale('tzl', { y : processRelativeTime, yy : processRelativeTime }, - ordinalParse: /\d{1,2}\./, + dayOfMonthOrdinalParse: /\d{1,2}\./, ordinal : '%d.', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/uk.js b/src/locale/uk.js index dd09f816f..8c6525433 100644 --- a/src/locale/uk.js +++ b/src/locale/uk.js @@ -119,7 +119,7 @@ export default moment.defineLocale('uk', { return 'вечора'; } }, - ordinalParse: /\d{1,2}-(й|го)/, + dayOfMonthOrdinalParse: /\d{1,2}-(й|го)/, ordinal: function (number, period) { switch (period) { case 'M': diff --git a/src/locale/vi.js b/src/locale/vi.js index bbd81cada..28c2d5609 100644 --- a/src/locale/vi.js +++ b/src/locale/vi.js @@ -58,7 +58,7 @@ export default moment.defineLocale('vi', { y : 'một năm', yy : '%d năm' }, - ordinalParse: /\d{1,2}/, + dayOfMonthOrdinalParse: /\d{1,2}/, ordinal : function (number) { return number; }, diff --git a/src/locale/x-pseudo.js b/src/locale/x-pseudo.js index 008359eb5..fba51128b 100644 --- a/src/locale/x-pseudo.js +++ b/src/locale/x-pseudo.js @@ -42,7 +42,7 @@ export default moment.defineLocale('x-pseudo', { y : 'á ~ýéár', yy : '%d ý~éárs' }, - ordinalParse: /\d{1,2}(th|st|nd|rd)/, + dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/, ordinal : function (number) { var b = number % 10, output = (~~(number % 100 / 10) === 1) ? 'th' : diff --git a/src/locale/yo.js b/src/locale/yo.js index e7ee7a286..26f3aa94d 100644 --- a/src/locale/yo.js +++ b/src/locale/yo.js @@ -41,7 +41,7 @@ export default moment.defineLocale('yo', { y : 'ọdún kan', yy : 'ọdún %d' }, - ordinalParse : /ọjọ́\s\d{1,2}/, + dayOfMonthOrdinalParse : /ọjọ́\s\d{1,2}/, ordinal : 'ọjọ́ %d', week : { dow : 1, // Monday is the first day of the week. diff --git a/src/locale/zh-cn.js b/src/locale/zh-cn.js index f19341359..662f3047c 100644 --- a/src/locale/zh-cn.js +++ b/src/locale/zh-cn.js @@ -62,7 +62,7 @@ export default moment.defineLocale('zh-cn', { lastWeek : '[上]ddddLT', sameElse : 'L' }, - ordinalParse: /\d{1,2}(日|月|周)/, + dayOfMonthOrdinalParse: /\d{1,2}(日|月|周)/, ordinal : function (number, period) { switch (period) { case 'd': diff --git a/src/locale/zh-hk.js b/src/locale/zh-hk.js index f8bf2d1da..73430a469 100644 --- a/src/locale/zh-hk.js +++ b/src/locale/zh-hk.js @@ -61,7 +61,7 @@ export default moment.defineLocale('zh-hk', { lastWeek : '[上]ddddLT', sameElse : 'L' }, - ordinalParse: /\d{1,2}(日|月|週)/, + dayOfMonthOrdinalParse: /\d{1,2}(日|月|週)/, ordinal : function (number, period) { switch (period) { case 'd' : diff --git a/src/locale/zh-tw.js b/src/locale/zh-tw.js index fba8a8015..6bb6a7c0f 100644 --- a/src/locale/zh-tw.js +++ b/src/locale/zh-tw.js @@ -60,7 +60,7 @@ export default moment.defineLocale('zh-tw', { lastWeek : '[上]ddddLT', sameElse : 'L' }, - ordinalParse: /\d{1,2}(日|月|週)/, + dayOfMonthOrdinalParse: /\d{1,2}(日|月|週)/, ordinal : function (number, period) { switch (period) { case 'd' : diff --git a/src/test/helpers/common-locale.js b/src/test/helpers/common-locale.js index 63ed5b38e..20c86e620 100644 --- a/src/test/helpers/common-locale.js +++ b/src/test/helpers/common-locale.js @@ -5,39 +5,39 @@ import moment from '../../moment'; import defaults from '../../lib/utils/defaults'; export function defineCommonLocaleTests(locale, options) { - test('lenient ordinal parsing', function (assert) { + test('lenient day of month ordinal parsing', function (assert) { var i, ordinalStr, testMoment; for (i = 1; i <= 31; ++i) { ordinalStr = moment([2014, 0, i]).format('YYYY MM Do'); testMoment = moment(ordinalStr, 'YYYY MM Do'); assert.equal(testMoment.year(), 2014, - 'lenient ordinal parsing ' + i + ' year check'); + 'lenient day of month ordinal parsing ' + i + ' year check'); assert.equal(testMoment.month(), 0, - 'lenient ordinal parsing ' + i + ' month check'); + 'lenient day of month ordinal parsing ' + i + ' month check'); assert.equal(testMoment.date(), i, - 'lenient ordinal parsing ' + i + ' date check'); + 'lenient day of month ordinal parsing ' + i + ' date check'); } }); - test('lenient ordinal parsing of number', function (assert) { + test('lenient day of month ordinal parsing of number', function (assert) { var i, testMoment; for (i = 1; i <= 31; ++i) { testMoment = moment('2014 01 ' + i, 'YYYY MM Do'); assert.equal(testMoment.year(), 2014, - 'lenient ordinal parsing of number ' + i + ' year check'); + 'lenient day of month ordinal parsing of number ' + i + ' year check'); assert.equal(testMoment.month(), 0, - 'lenient ordinal parsing of number ' + i + ' month check'); + 'lenient day of month ordinal parsing of number ' + i + ' month check'); assert.equal(testMoment.date(), i, - 'lenient ordinal parsing of number ' + i + ' date check'); + 'lenient day of month ordinal parsing of number ' + i + ' date check'); } }); - test('strict ordinal parsing', function (assert) { + test('strict day of month ordinal parsing', function (assert) { var i, ordinalStr, testMoment; for (i = 1; i <= 31; ++i) { ordinalStr = moment([2014, 0, i]).format('YYYY MM Do'); testMoment = moment(ordinalStr, 'YYYY MM Do', true); - assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i); + assert.ok(testMoment.isValid(), 'strict day of month ordinal parsing ' + i); } }); diff --git a/src/test/locale/pa-in.js b/src/test/locale/pa-in.js index 73f45a96e..4d7558d54 100644 --- a/src/test/locale/pa-in.js +++ b/src/test/locale/pa-in.js @@ -284,38 +284,38 @@ test('weeks year starting sunday formatted', function (assert) { assert.equal(moment([2012, 0, 15]).format('w ww wo'), 'à©© ੦੩ à©©', 'Jan 15 2012 should be week 3'); }); -test('lenient ordinal parsing', function (assert) { +test('lenient day of month ordinal parsing', function (assert) { var i, ordinalStr, testMoment; for (i = 1; i <= 31; ++i) { ordinalStr = moment([2014, 0, i]).format('YYYY MM Do'); testMoment = moment(ordinalStr, 'YYYY MM Do'); assert.equal(testMoment.year(), 2014, - 'lenient ordinal parsing ' + i + ' year check'); + 'lenient day of month ordinal parsing ' + i + ' year check'); assert.equal(testMoment.month(), 0, - 'lenient ordinal parsing ' + i + ' month check'); + 'lenient day of month ordinal parsing ' + i + ' month check'); assert.equal(testMoment.date(), i, - 'lenient ordinal parsing ' + i + ' date check'); + 'lenient day of month ordinal parsing ' + i + ' date check'); } }); -test('lenient ordinal parsing of number', function (assert) { +test('lenient day of month ordinal parsing of number', function (assert) { var i, testMoment; for (i = 1; i <= 31; ++i) { testMoment = moment('2014 01 ' + i, 'YYYY MM Do'); assert.equal(testMoment.year(), 2014, - 'lenient ordinal parsing of number ' + i + ' year check'); + 'lenient day of month ordinal parsing of number ' + i + ' year check'); assert.equal(testMoment.month(), 0, - 'lenient ordinal parsing of number ' + i + ' month check'); + 'lenient day of month ordinal parsing of number ' + i + ' month check'); assert.equal(testMoment.date(), i, - 'lenient ordinal parsing of number ' + i + ' date check'); + 'lenient day of month ordinal parsing of number ' + i + ' date check'); } }); -test('strict ordinal parsing', function (assert) { +test('strict day of month ordinal parsing', function (assert) { var i, ordinalStr, testMoment; for (i = 1; i <= 31; ++i) { ordinalStr = moment([2014, 0, i]).format('YYYY MM Do'); testMoment = moment(ordinalStr, 'YYYY MM Do', true); - assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i); + assert.ok(testMoment.isValid(), 'strict day of month ordinal parsing ' + i); } }); diff --git a/src/test/moment/locale_inheritance.js b/src/test/moment/locale_inheritance.js index 97e8f6a0f..b5e718db9 100644 --- a/src/test/moment/locale_inheritance.js +++ b/src/test/moment/locale_inheritance.js @@ -133,21 +133,21 @@ test('ordinal', function (assert) { test('ordinal parse', function (assert) { moment.defineLocale('base-ordinal-parse-1', { - ordinalParse : /\d{1,2}x/ + dayOfMonthOrdinalParse : /\d{1,2}x/ }); moment.defineLocale('child-ordinal-parse-1', { parentLocale: 'base-ordinal-parse-1', - ordinalParse : /\d{1,2}y/ + dayOfMonthOrdinalParse : /\d{1,2}y/ }); assert.ok(moment.utc('2015-01-1y', 'YYYY-MM-Do', true).isValid(), 'ordinal parse uses child'); moment.defineLocale('base-ordinal-parse-2', { - ordinalParse : /\d{1,2}x/ + dayOfMonthOrdinalParse : /\d{1,2}x/ }); moment.defineLocale('child-ordinal-parse-2', { parentLocale: 'base-ordinal-parse-2', - ordinalParse : /\d{1,2}/ + dayOfMonthOrdinalParse : /\d{1,2}/ }); assert.ok(moment.utc('2015-01-1', 'YYYY-MM-Do', true).isValid(), 'ordinal parse uses child (default)'); diff --git a/src/test/moment/locale_update.js b/src/test/moment/locale_update.js index fd189aad1..ab956b415 100644 --- a/src/test/moment/locale_update.js +++ b/src/test/moment/locale_update.js @@ -134,20 +134,20 @@ test('ordinal', function (assert) { test('ordinal parse', function (assert) { moment.defineLocale('ordinal-parse-1', null); moment.defineLocale('ordinal-parse-1', { - ordinalParse : /\d{1,2}x/ + dayOfMonthOrdinalParse : /\d{1,2}x/ }); moment.updateLocale('ordinal-parse-1', { - ordinalParse : /\d{1,2}y/ + dayOfMonthOrdinalParse : /\d{1,2}y/ }); assert.ok(moment.utc('2015-01-1y', 'YYYY-MM-Do', true).isValid(), 'ordinal parse uses child'); moment.defineLocale('ordinal-parse-2', null); moment.defineLocale('ordinal-parse-2', { - ordinalParse : /\d{1,2}x/ + dayOfMonthOrdinalParse : /\d{1,2}x/ }); moment.updateLocale('ordinal-parse-2', { - ordinalParse : /\d{1,2}/ + dayOfMonthOrdinalParse : /\d{1,2}/ }); assert.ok(moment.utc('2015-01-1', 'YYYY-MM-Do', true).isValid(), 'ordinal parse uses child (default)');