From: Tim Wood Date: Wed, 28 Dec 2011 18:53:39 +0000 (-0800) Subject: Finishing adding support for parsing month names X-Git-Tag: 1.3.0~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8b58447190f5a677c2a82ed4563211855fd0795;p=thirdparty%2Fmoment.git Finishing adding support for parsing month names #117 --- diff --git a/moment.js b/moment.js index c658baf6e..853111a11 100644 --- a/moment.js +++ b/moment.js @@ -213,7 +213,6 @@ isUsingUTC = false, inputParts = string.match(inputCharacters), formatParts = format.match(tokenCharacters), - monthRegex = moment.monthsParse, i, isPm; @@ -231,8 +230,7 @@ // fall through to MMMM case 'MMMM' : for (a = 0; a < 12; a++) { - if (monthRegex[i].test(input)) { - console.log('found it'); + if (moment.monthsParse[a].test(input)) { inArray[1] = a; break; } @@ -386,15 +384,16 @@ // language switching and caching moment.lang = function (key, values) { - var i, param, req; + var i, + param, + req, + parse = []; if (values) { - languages[key] = values; - if (!values.monthsParse) { - languages[key].monthsParse = []; - for (i = 0; i < 12; i++) { - languages[key].monthsParse[i] = new RegExp(values.months[i] + '|' + values.monthsShort[i], 'i'); - } + for (i = 0; i < 12; i++) { + parse[i] = new RegExp('^' + values.months[i] + '|^' + values.monthsShort[i].replace('.', ''), 'i'); } + values.monthsParse = values.monthsParse || parse; + languages[key] = values; } if (languages[key]) { for (i = 0; i < paramsToParse.length; i++) {