From 7c385a7877aa4b0163dda6206f656846db2cf039 Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Thu, 17 Sep 2015 12:32:47 -0400 Subject: iOS9 fixes (which includes ionic updates to 1.1.0) --- www/lib/moment/src/lib/create/from-anything.js | 23 ++++---- www/lib/moment/src/lib/create/from-string.js | 6 +- www/lib/moment/src/lib/create/valid.js | 1 + www/lib/moment/src/lib/duration/as.js | 6 +- www/lib/moment/src/lib/duration/bubble.js | 39 +++++++------ www/lib/moment/src/lib/duration/iso-string.js | 36 ++++++++++-- www/lib/moment/src/lib/format/format.js | 7 +-- www/lib/moment/src/lib/locale/formats.js | 22 +++++--- www/lib/moment/src/lib/locale/locales.js | 4 +- www/lib/moment/src/lib/moment/calendar.js | 4 +- www/lib/moment/src/lib/moment/constructor.js | 2 +- www/lib/moment/src/lib/moment/min-max.js | 2 +- www/lib/moment/src/lib/moment/prototype.js | 3 +- www/lib/moment/src/lib/moment/to-type.js | 13 +++++ www/lib/moment/src/lib/parse/regex.js | 9 ++- www/lib/moment/src/lib/units/day-of-week.js | 28 ++++----- www/lib/moment/src/lib/units/day-of-year.js | 18 +++--- www/lib/moment/src/lib/units/millisecond.js | 38 ++++++++++--- www/lib/moment/src/lib/units/offset.js | 31 ++++++---- www/lib/moment/src/lib/units/year.js | 6 +- www/lib/moment/src/lib/utils/abs-ceil.js | 7 +++ www/lib/moment/src/lib/utils/deprecate.js | 5 +- www/lib/moment/src/lib/utils/to-int.js | 8 +-- www/lib/moment/src/lib/utils/zero-fill.js | 10 ++-- www/lib/moment/src/locale/af.js | 6 +- www/lib/moment/src/locale/ar-ma.js | 6 +- www/lib/moment/src/locale/ar-sa.js | 4 +- www/lib/moment/src/locale/ar-tn.js | 6 +- www/lib/moment/src/locale/ar.js | 4 +- www/lib/moment/src/locale/az.js | 6 +- www/lib/moment/src/locale/be.js | 6 +- www/lib/moment/src/locale/bg.js | 6 +- www/lib/moment/src/locale/bn.js | 8 +-- www/lib/moment/src/locale/bo.js | 6 +- www/lib/moment/src/locale/br.js | 4 +- www/lib/moment/src/locale/bs.js | 6 +- www/lib/moment/src/locale/ca.js | 4 +- www/lib/moment/src/locale/cs.js | 6 +- www/lib/moment/src/locale/cv.js | 6 +- www/lib/moment/src/locale/cy.js | 6 +- www/lib/moment/src/locale/da.js | 6 +- www/lib/moment/src/locale/de-at.js | 4 +- www/lib/moment/src/locale/de.js | 4 +- www/lib/moment/src/locale/el.js | 4 +- www/lib/moment/src/locale/en-au.js | 4 +- www/lib/moment/src/locale/en-ca.js | 4 +- www/lib/moment/src/locale/en-gb.js | 4 +- www/lib/moment/src/locale/eo.js | 6 +- www/lib/moment/src/locale/es.js | 6 +- www/lib/moment/src/locale/et.js | 6 +- www/lib/moment/src/locale/eu.js | 10 ++-- www/lib/moment/src/locale/fa.js | 6 +- www/lib/moment/src/locale/fi.js | 8 +-- www/lib/moment/src/locale/fo.js | 6 +- www/lib/moment/src/locale/fr-ca.js | 10 ++-- www/lib/moment/src/locale/fr.js | 6 +- www/lib/moment/src/locale/fy.js | 6 +- www/lib/moment/src/locale/gl.js | 6 +- www/lib/moment/src/locale/he.js | 10 ++-- www/lib/moment/src/locale/hi.js | 4 +- www/lib/moment/src/locale/hr.js | 6 +- www/lib/moment/src/locale/hu.js | 6 +- www/lib/moment/src/locale/hy-am.js | 6 +- www/lib/moment/src/locale/id.js | 6 +- www/lib/moment/src/locale/is.js | 6 +- www/lib/moment/src/locale/it.js | 6 +- www/lib/moment/src/locale/ja.js | 6 +- www/lib/moment/src/locale/jv.js | 6 +- www/lib/moment/src/locale/ka.js | 4 +- www/lib/moment/src/locale/km.js | 6 +- www/lib/moment/src/locale/ko.js | 4 +- www/lib/moment/src/locale/lb.js | 4 +- www/lib/moment/src/locale/lt.js | 22 ++++++-- www/lib/moment/src/locale/lv.js | 6 +- www/lib/moment/src/locale/me.js | 6 +- www/lib/moment/src/locale/mk.js | 6 +- www/lib/moment/src/locale/ml.js | 4 +- www/lib/moment/src/locale/mr.js | 4 +- www/lib/moment/src/locale/ms-my.js | 6 +- www/lib/moment/src/locale/ms.js | 73 ++++++++++++++++++++++++ www/lib/moment/src/locale/my.js | 4 +- www/lib/moment/src/locale/nb.js | 6 +- www/lib/moment/src/locale/ne.js | 4 +- www/lib/moment/src/locale/nl.js | 6 +- www/lib/moment/src/locale/nn.js | 6 +- www/lib/moment/src/locale/pl.js | 6 +- www/lib/moment/src/locale/pt-br.js | 8 +-- www/lib/moment/src/locale/pt.js | 6 +- www/lib/moment/src/locale/ro.js | 2 +- www/lib/moment/src/locale/ru.js | 6 +- www/lib/moment/src/locale/si.js | 6 +- www/lib/moment/src/locale/sk.js | 6 +- www/lib/moment/src/locale/sl.js | 6 +- www/lib/moment/src/locale/sq.js | 6 +- www/lib/moment/src/locale/sr-cyrl.js | 6 +- www/lib/moment/src/locale/sr.js | 6 +- www/lib/moment/src/locale/sv.js | 6 +- www/lib/moment/src/locale/ta.js | 6 +- www/lib/moment/src/locale/th.js | 6 +- www/lib/moment/src/locale/tl-ph.js | 6 +- www/lib/moment/src/locale/tr.js | 6 +- www/lib/moment/src/locale/tzl.js | 78 ++++++++++++++++++++++++++ www/lib/moment/src/locale/tzm-latn.js | 6 +- www/lib/moment/src/locale/tzm.js | 6 +- www/lib/moment/src/locale/uk.js | 6 +- www/lib/moment/src/locale/uz.js | 6 +- www/lib/moment/src/locale/vi.js | 10 ++-- www/lib/moment/src/locale/zh-cn.js | 8 +-- www/lib/moment/src/locale/zh-tw.js | 8 +-- www/lib/moment/src/moment.js | 4 +- 110 files changed, 616 insertions(+), 367 deletions(-) create mode 100644 www/lib/moment/src/lib/utils/abs-ceil.js create mode 100644 www/lib/moment/src/locale/ms.js create mode 100644 www/lib/moment/src/locale/tzl.js (limited to 'www/lib/moment/src') diff --git a/www/lib/moment/src/lib/create/from-anything.js b/www/lib/moment/src/lib/create/from-anything.js index 4b836c0f..5a69dc55 100644 --- a/www/lib/moment/src/lib/create/from-anything.js +++ b/www/lib/moment/src/lib/create/from-anything.js @@ -14,9 +14,19 @@ import { configFromArray } from './from-array'; import { configFromObject } from './from-object'; function createFromConfig (config) { + var res = new Moment(checkOverflow(prepareConfig(config))); + if (res._nextDay) { + // Adding is smart enough around DST + res.add(1, 'd'); + res._nextDay = undefined; + } + + return res; +} + +export function prepareConfig (config) { var input = config._i, - format = config._f, - res; + format = config._f; config._locale = config._locale || getLocale(config._l); @@ -40,14 +50,7 @@ function createFromConfig (config) { configFromInput(config); } - res = new Moment(checkOverflow(config)); - if (res._nextDay) { - // Adding is smart enough around DST - res.add(1, 'd'); - res._nextDay = undefined; - } - - return res; + return config; } function configFromInput(config) { diff --git a/www/lib/moment/src/lib/create/from-string.js b/www/lib/moment/src/lib/create/from-string.js index 4bd6d591..4a7163b2 100644 --- a/www/lib/moment/src/lib/create/from-string.js +++ b/www/lib/moment/src/lib/create/from-string.js @@ -36,14 +36,14 @@ export function configFromISO(config) { getParsingFlags(config).iso = true; for (i = 0, l = isoDates.length; i < l; i++) { if (isoDates[i][1].exec(string)) { - // match[5] should be 'T' or undefined - config._f = isoDates[i][0] + (match[6] || ' '); + config._f = isoDates[i][0]; break; } } for (i = 0, l = isoTimes.length; i < l; i++) { if (isoTimes[i][1].exec(string)) { - config._f += isoTimes[i][0]; + // match[6] should be 'T' or space + config._f += (match[6] || ' ') + isoTimes[i][0]; break; } } diff --git a/www/lib/moment/src/lib/create/valid.js b/www/lib/moment/src/lib/create/valid.js index 89204f85..ad56bfe0 100644 --- a/www/lib/moment/src/lib/create/valid.js +++ b/www/lib/moment/src/lib/create/valid.js @@ -9,6 +9,7 @@ export function isValid(m) { flags.overflow < 0 && !flags.empty && !flags.invalidMonth && + !flags.invalidWeekday && !flags.nullInput && !flags.invalidFormat && !flags.userInvalidated; diff --git a/www/lib/moment/src/lib/duration/as.js b/www/lib/moment/src/lib/duration/as.js index 258c501e..03ecd6da 100644 --- a/www/lib/moment/src/lib/duration/as.js +++ b/www/lib/moment/src/lib/duration/as.js @@ -1,4 +1,4 @@ -import { daysToYears, yearsToDays } from './bubble'; +import { daysToMonths, monthsToDays } from './bubble'; import { normalizeUnits } from '../units/aliases'; import toInt from '../utils/to-int'; @@ -11,11 +11,11 @@ export function as (units) { if (units === 'month' || units === 'year') { days = this._days + milliseconds / 864e5; - months = this._months + daysToYears(days) * 12; + months = this._months + daysToMonths(days); return units === 'month' ? months : months / 12; } else { // handle milliseconds separately because of floating point math errors (issue #1867) - days = this._days + Math.round(yearsToDays(this._months / 12)); + days = this._days + Math.round(monthsToDays(this._months)); switch (units) { case 'week' : return days / 7 + milliseconds / 6048e5; case 'day' : return days + milliseconds / 864e5; diff --git a/www/lib/moment/src/lib/duration/bubble.js b/www/lib/moment/src/lib/duration/bubble.js index 3dae6b24..0c4a336e 100644 --- a/www/lib/moment/src/lib/duration/bubble.js +++ b/www/lib/moment/src/lib/duration/bubble.js @@ -1,11 +1,22 @@ import absFloor from '../utils/abs-floor'; +import absCeil from '../utils/abs-ceil'; +import { createUTCDate } from '../create/date-from-array'; export function bubble () { var milliseconds = this._milliseconds; var days = this._days; var months = this._months; var data = this._data; - var seconds, minutes, hours, years = 0; + var seconds, minutes, hours, years, monthsFromDays; + + // if we have a mix of positive and negative values, bubble down first + // check: https://github.com/moment/moment/issues/2166 + if (!((milliseconds >= 0 && days >= 0 && months >= 0) || + (milliseconds <= 0 && days <= 0 && months <= 0))) { + milliseconds += absCeil(monthsToDays(months) + days) * 864e5; + days = 0; + months = 0; + } // The following code bubbles up values, see the tests for // examples of what that means. @@ -22,17 +33,13 @@ export function bubble () { days += absFloor(hours / 24); - // Accurately convert days to years, assume start from year 0. - years = absFloor(daysToYears(days)); - days -= absFloor(yearsToDays(years)); - - // 30 days to a month - // TODO (iskren): Use anchor date (like 1st Jan) to compute this. - months += absFloor(days / 30); - days %= 30; + // convert days to months + monthsFromDays = absFloor(daysToMonths(days)); + months += monthsFromDays; + days -= absCeil(monthsToDays(monthsFromDays)); // 12 months -> 1 year - years += absFloor(months / 12); + years = absFloor(months / 12); months %= 12; data.days = days; @@ -42,13 +49,13 @@ export function bubble () { return this; } -export function daysToYears (days) { +export function daysToMonths (days) { // 400 years have 146097 days (taking into account leap year rules) - return days * 400 / 146097; + // 400 years have 12 months === 4800 + return days * 4800 / 146097; } -export function yearsToDays (years) { - // years * 365 + absFloor(years / 4) - - // absFloor(years / 100) + absFloor(years / 400); - return years * 146097 / 400; +export function monthsToDays (months) { + // the reverse of daysToMonths + return months * 146097 / 4800; } diff --git a/www/lib/moment/src/lib/duration/iso-string.js b/www/lib/moment/src/lib/duration/iso-string.js index 2670a9d3..f33a968d 100644 --- a/www/lib/moment/src/lib/duration/iso-string.js +++ b/www/lib/moment/src/lib/duration/iso-string.js @@ -1,13 +1,37 @@ +import absFloor from '../utils/abs-floor'; var abs = Math.abs; export function toISOString() { + // for ISO strings we do not use the normal bubbling rules: + // * milliseconds bubble up until they become hours + // * days do not bubble at all + // * months bubble up until they become years + // This is because there is no context-free conversion between hours and days + // (think of clock changes) + // and also not between days and months (28-31 days per month) + var seconds = abs(this._milliseconds) / 1000; + var days = abs(this._days); + var months = abs(this._months); + var minutes, hours, years; + + // 3600 seconds -> 60 minutes -> 1 hour + minutes = absFloor(seconds / 60); + hours = absFloor(minutes / 60); + seconds %= 60; + minutes %= 60; + + // 12 months -> 1 year + years = absFloor(months / 12); + months %= 12; + + // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js - var Y = abs(this.years()); - var M = abs(this.months()); - var D = abs(this.days()); - var h = abs(this.hours()); - var m = abs(this.minutes()); - var s = abs(this.seconds() + this.milliseconds() / 1000); + var Y = years; + var M = months; + var D = days; + var h = hours; + var m = minutes; + var s = seconds; var total = this.asSeconds(); if (!total) { diff --git a/www/lib/moment/src/lib/format/format.js b/www/lib/moment/src/lib/format/format.js index 565da01e..5378170b 100644 --- a/www/lib/moment/src/lib/format/format.js +++ b/www/lib/moment/src/lib/format/format.js @@ -1,6 +1,6 @@ import zeroFill from '../utils/zero-fill'; -export var formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|x|X|zz?|ZZ?|.)/g; +export var formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g; var localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g; @@ -68,10 +68,7 @@ export function formatMoment(m, format) { } format = expandFormat(format, m.localeData()); - - if (!formatFunctions[format]) { - formatFunctions[format] = makeFormatFunction(format); - } + formatFunctions[format] = formatFunctions[format] || makeFormatFunction(format); return formatFunctions[format](m); } diff --git a/www/lib/moment/src/lib/locale/formats.js b/www/lib/moment/src/lib/locale/formats.js index 22b75ad3..6d83b039 100644 --- a/www/lib/moment/src/lib/locale/formats.js +++ b/www/lib/moment/src/lib/locale/formats.js @@ -3,17 +3,21 @@ export var defaultLongDateFormat = { LT : 'h:mm A', L : 'MM/DD/YYYY', LL : 'MMMM D, YYYY', - LLL : 'MMMM D, YYYY LT', - LLLL : 'dddd, MMMM D, YYYY LT' + LLL : 'MMMM D, YYYY h:mm A', + LLLL : 'dddd, MMMM D, YYYY h:mm A' }; export function longDateFormat (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; + var format = this._longDateFormat[key], + formatUpper = this._longDateFormat[key.toUpperCase()]; + + if (format || !formatUpper) { + return format; } - return output; + + this._longDateFormat[key] = formatUpper.replace(/MMMM|MM|DD|dddd/g, function (val) { + return val.slice(1); + }); + + return this._longDateFormat[key]; } diff --git a/www/lib/moment/src/lib/locale/locales.js b/www/lib/moment/src/lib/locale/locales.js index 0e58dedf..a32e5ace 100644 --- a/www/lib/moment/src/lib/locale/locales.js +++ b/www/lib/moment/src/lib/locale/locales.js @@ -78,9 +78,7 @@ export function getSetGlobalLocale (key, values) { export function defineLocale (name, values) { if (values !== null) { values.abbr = name; - if (!locales[name]) { - locales[name] = new Locale(); - } + locales[name] = locales[name] || new Locale(); locales[name].set(values); // backwards compat for now: also set the locale diff --git a/www/lib/moment/src/lib/moment/calendar.js b/www/lib/moment/src/lib/moment/calendar.js index 66d70adc..c9df8031 100644 --- a/www/lib/moment/src/lib/moment/calendar.js +++ b/www/lib/moment/src/lib/moment/calendar.js @@ -1,7 +1,7 @@ import { createLocal } from '../create/local'; import { cloneWithOffset } from '../units/offset'; -export function calendar (time) { +export function calendar (time, formats) { // We want to compare the start of today, vs this. // Getting start-of-today depends on whether we're local/utc/offset or not. var now = time || createLocal(), @@ -13,5 +13,5 @@ export function calendar (time) { diff < 1 ? 'sameDay' : diff < 2 ? 'nextDay' : diff < 7 ? 'nextWeek' : 'sameElse'; - return this.format(this.localeData().calendar(format, this, createLocal(now))); + return this.format(formats && formats[format] || this.localeData().calendar(format, this, createLocal(now))); } diff --git a/www/lib/moment/src/lib/moment/constructor.js b/www/lib/moment/src/lib/moment/constructor.js index f7355939..f5f3da0f 100644 --- a/www/lib/moment/src/lib/moment/constructor.js +++ b/www/lib/moment/src/lib/moment/constructor.js @@ -58,7 +58,7 @@ var updateInProgress = false; // Moment prototype object export function Moment(config) { copyConfig(this, config); - this._d = new Date(+config._d); + this._d = new Date(config._d != null ? config._d.getTime() : NaN); // Prevent infinite loop in case updateOffset creates new moment // objects. if (updateInProgress === false) { diff --git a/www/lib/moment/src/lib/moment/min-max.js b/www/lib/moment/src/lib/moment/min-max.js index c4a88d24..912cbfe7 100644 --- a/www/lib/moment/src/lib/moment/min-max.js +++ b/www/lib/moment/src/lib/moment/min-max.js @@ -33,7 +33,7 @@ function pickBy(fn, moments) { } res = moments[0]; for (i = 1; i < moments.length; ++i) { - if (moments[i][fn](res)) { + if (!moments[i].isValid() || moments[i][fn](res)) { res = moments[i]; } } diff --git a/www/lib/moment/src/lib/moment/prototype.js b/www/lib/moment/src/lib/moment/prototype.js index 5601bc0b..d17f743a 100644 --- a/www/lib/moment/src/lib/moment/prototype.js +++ b/www/lib/moment/src/lib/moment/prototype.js @@ -14,7 +14,7 @@ import { getSet } from './get-set'; import { locale, localeData, lang } from './locale'; import { prototypeMin, prototypeMax } from './min-max'; import { startOf, endOf } from './start-end-of'; -import { valueOf, toDate, toArray, unix } from './to-type'; +import { valueOf, toDate, toArray, toObject, unix } from './to-type'; import { isValid, parsingFlags, invalidAt } from './valid'; proto.add = add; @@ -44,6 +44,7 @@ proto.set = getSet; proto.startOf = startOf; proto.subtract = subtract; proto.toArray = toArray; +proto.toObject = toObject; proto.toDate = toDate; proto.toISOString = toISOString; proto.toJSON = toISOString; diff --git a/www/lib/moment/src/lib/moment/to-type.js b/www/lib/moment/src/lib/moment/to-type.js index edc1338d..3008d95e 100644 --- a/www/lib/moment/src/lib/moment/to-type.js +++ b/www/lib/moment/src/lib/moment/to-type.js @@ -14,3 +14,16 @@ export function toArray () { var m = this; return [m.year(), m.month(), m.date(), m.hour(), m.minute(), m.second(), m.millisecond()]; } + +export function toObject () { + var m = this; + return { + years: m.year(), + months: m.month(), + date: m.date(), + hours: m.hours(), + minutes: m.minutes(), + seconds: m.seconds(), + milliseconds: m.milliseconds() + }; +} diff --git a/www/lib/moment/src/lib/parse/regex.js b/www/lib/moment/src/lib/parse/regex.js index 23091a08..9e7d6788 100644 --- a/www/lib/moment/src/lib/parse/regex.js +++ b/www/lib/moment/src/lib/parse/regex.js @@ -22,8 +22,15 @@ import hasOwnProp from '../utils/has-own-prop'; var regexes = {}; +function isFunction (sth) { + // https://github.com/moment/moment/issues/2325 + return typeof sth === 'function' && + Object.prototype.toString.call(sth) === '[object Function]'; +} + + export function addRegexToken (token, regex, strictRegex) { - regexes[token] = typeof regex === 'function' ? regex : function (isStrict) { + regexes[token] = isFunction(regex) ? regex : function (isStrict) { return (isStrict && strictRegex) ? strictRegex : regex; }; } diff --git a/www/lib/moment/src/lib/units/day-of-week.js b/www/lib/moment/src/lib/units/day-of-week.js index 7af24083..a82f1263 100644 --- a/www/lib/moment/src/lib/units/day-of-week.js +++ b/www/lib/moment/src/lib/units/day-of-week.js @@ -57,18 +57,20 @@ addWeekParseToken(['d', 'e', 'E'], function (input, week, config, token) { // HELPERS function parseWeekday(input, locale) { - if (typeof input === 'string') { - if (!isNaN(input)) { - input = parseInt(input, 10); - } - else { - input = locale.weekdaysParse(input); - if (typeof input !== 'number') { - return null; - } - } + if (typeof input !== 'string') { + return input; + } + + if (!isNaN(input)) { + return parseInt(input, 10); } - return input; + + input = locale.weekdaysParse(input); + if (typeof input === 'number') { + return input; + } + + return null; } // LOCALES @@ -91,9 +93,7 @@ export function localeWeekdaysMin (m) { export function localeWeekdaysParse (weekdayName) { var i, mom, regex; - if (!this._weekdaysParse) { - this._weekdaysParse = []; - } + this._weekdaysParse = this._weekdaysParse || []; for (i = 0; i < 7; i++) { // make the regex if we don't have it already diff --git a/www/lib/moment/src/lib/units/day-of-year.js b/www/lib/moment/src/lib/units/day-of-year.js index 7c4d2860..0c34fa39 100644 --- a/www/lib/moment/src/lib/units/day-of-year.js +++ b/www/lib/moment/src/lib/units/day-of-year.js @@ -26,18 +26,18 @@ addParseToken(['DDD', 'DDDD'], function (input, array, config) { //http://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday export function dayOfYearFromWeeks(year, week, weekday, firstDayOfWeekOfYear, firstDayOfWeek) { - var d = createUTCDate(year, 0, 1).getUTCDay(); - var daysToAdd; - var dayOfYear; + var week1Jan = 6 + firstDayOfWeek - firstDayOfWeekOfYear, janX = createUTCDate(year, 0, 1 + week1Jan), d = janX.getUTCDay(), dayOfYear; + if (d < firstDayOfWeek) { + d += 7; + } - d = d === 0 ? 7 : d; - weekday = weekday != null ? weekday : firstDayOfWeek; - daysToAdd = firstDayOfWeek - d + (d > firstDayOfWeekOfYear ? 7 : 0) - (d < firstDayOfWeek ? 7 : 0); - dayOfYear = 7 * (week - 1) + (weekday - firstDayOfWeek) + daysToAdd + 1; + weekday = weekday != null ? 1 * weekday : firstDayOfWeek; + + dayOfYear = 1 + week1Jan + 7 * (week - 1) - d + weekday; return { - year : dayOfYear > 0 ? year : year - 1, - dayOfYear : dayOfYear > 0 ? dayOfYear : daysInYear(year - 1) + dayOfYear + year: dayOfYear > 0 ? year : year - 1, + dayOfYear: dayOfYear > 0 ? dayOfYear : daysInYear(year - 1) + dayOfYear }; } diff --git a/www/lib/moment/src/lib/units/millisecond.js b/www/lib/moment/src/lib/units/millisecond.js index 2fb73af0..134d88ee 100644 --- a/www/lib/moment/src/lib/units/millisecond.js +++ b/www/lib/moment/src/lib/units/millisecond.js @@ -16,12 +16,26 @@ addFormatToken(0, ['SS', 2], 0, function () { return ~~(this.millisecond() / 10); }); -function milliseconds (token) { - addFormatToken(0, [token, 3], 0, 'millisecond'); -} +addFormatToken(0, ['SSS', 3], 0, 'millisecond'); +addFormatToken(0, ['SSSS', 4], 0, function () { + return this.millisecond() * 10; +}); +addFormatToken(0, ['SSSSS', 5], 0, function () { + return this.millisecond() * 100; +}); +addFormatToken(0, ['SSSSSS', 6], 0, function () { + return this.millisecond() * 1000; +}); +addFormatToken(0, ['SSSSSSS', 7], 0, function () { + return this.millisecond() * 10000; +}); +addFormatToken(0, ['SSSSSSSS', 8], 0, function () { + return this.millisecond() * 100000; +}); +addFormatToken(0, ['SSSSSSSSS', 9], 0, function () { + return this.millisecond() * 1000000; +}); -milliseconds('SSS'); -milliseconds('SSSS'); // ALIASES @@ -32,11 +46,19 @@ addUnitAlias('millisecond', 'ms'); addRegexToken('S', match1to3, match1); addRegexToken('SS', match1to3, match2); addRegexToken('SSS', match1to3, match3); -addRegexToken('SSSS', matchUnsigned); -addParseToken(['S', 'SS', 'SSS', 'SSSS'], function (input, array) { + +var token; +for (token = 'SSSS'; token.length <= 9; token += 'S') { + addRegexToken(token, matchUnsigned); +} + +function parseMs(input, array) { array[MILLISECOND] = toInt(('0.' + input) * 1000); -}); +} +for (token = 'S'; token.length <= 9; token += 'S') { + addParseToken(token, parseMs); +} // MOMENTS export var getSetMillisecond = makeGetSet('Milliseconds', false); diff --git a/www/lib/moment/src/lib/units/offset.js b/www/lib/moment/src/lib/units/offset.js index 75aeb021..33288c0b 100644 --- a/www/lib/moment/src/lib/units/offset.js +++ b/www/lib/moment/src/lib/units/offset.js @@ -1,11 +1,12 @@ import zeroFill from '../utils/zero-fill'; import { createDuration } from '../duration/create'; import { addSubtract } from '../moment/add-subtract'; -import { isMoment } from '../moment/constructor'; +import { isMoment, copyConfig } from '../moment/constructor'; import { addFormatToken } from '../format/format'; import { addRegexToken, matchOffset } from '../parse/regex'; import { addParseToken } from '../parse/token'; import { createLocal } from '../create/local'; +import { prepareConfig } from '../create/from-anything'; import { createUTC } from '../create/utc'; import isDate from '../utils/is-date'; import toInt from '../utils/to-int'; @@ -67,7 +68,6 @@ export function cloneWithOffset(input, model) { } else { return createLocal(input).local(); } - return model._isUTC ? createLocal(input).zone(model._offset || 0) : createLocal(input).local(); } function getDateOffset (m) { @@ -167,12 +167,7 @@ export function setOffsetToParsedOffset () { } export function hasAlignedHourOffset (input) { - if (!input) { - input = 0; - } - else { - input = createLocal(input).utcOffset(); - } + input = input ? createLocal(input).utcOffset() : 0; return (this.utcOffset() - input) % 60 === 0; } @@ -185,12 +180,24 @@ export function isDaylightSavingTime () { } export function isDaylightSavingTimeShifted () { - if (this._a) { - var other = this._isUTC ? createUTC(this._a) : createLocal(this._a); - return this.isValid() && compareArrays(this._a, other.toArray()) > 0; + if (typeof this._isDSTShifted !== 'undefined') { + return this._isDSTShifted; + } + + var c = {}; + + copyConfig(c, this); + c = prepareConfig(c); + + if (c._a) { + var other = c._isUTC ? createUTC(c._a) : createLocal(c._a); + this._isDSTShifted = this.isValid() && + compareArrays(c._a, other.toArray()) > 0; + } else { + this._isDSTShifted = false; } - return false; + return this._isDSTShifted; } export function isLocal () { diff --git a/www/lib/moment/src/lib/units/year.js b/www/lib/moment/src/lib/units/year.js index 4d8a03b1..cc32b55b 100644 --- a/www/lib/moment/src/lib/units/year.js +++ b/www/lib/moment/src/lib/units/year.js @@ -29,7 +29,10 @@ addRegexToken('YYYY', match1to4, match4); addRegexToken('YYYYY', match1to6, match6); addRegexToken('YYYYYY', match1to6, match6); -addParseToken(['YYYY', 'YYYYY', 'YYYYYY'], YEAR); +addParseToken(['YYYYY', 'YYYYYY'], YEAR); +addParseToken('YYYY', function (input, array) { + array[YEAR] = input.length === 2 ? hooks.parseTwoDigitYear(input) : toInt(input); +}); addParseToken('YY', function (input, array) { array[YEAR] = hooks.parseTwoDigitYear(input); }); @@ -57,4 +60,3 @@ export var getSetYear = makeGetSet('FullYear', false); export function getIsLeapYear () { return isLeapYear(this.year()); } - diff --git a/www/lib/moment/src/lib/utils/abs-ceil.js b/www/lib/moment/src/lib/utils/abs-ceil.js new file mode 100644 index 00000000..7cf93290 --- /dev/null +++ b/www/lib/moment/src/lib/utils/abs-ceil.js @@ -0,0 +1,7 @@ +export default function absCeil (number) { + if (number < 0) { + return Math.floor(number); + } else { + return Math.ceil(number); + } +} diff --git a/www/lib/moment/src/lib/utils/deprecate.js b/www/lib/moment/src/lib/utils/deprecate.js index a076ad71..df4286b8 100644 --- a/www/lib/moment/src/lib/utils/deprecate.js +++ b/www/lib/moment/src/lib/utils/deprecate.js @@ -8,12 +8,11 @@ function warn(msg) { } export function deprecate(msg, fn) { - var firstTime = true, - msgWithStack = msg + '\n' + (new Error()).stack; + var firstTime = true; return extend(function () { if (firstTime) { - warn(msgWithStack); + warn(msg + '\n' + (new Error()).stack); firstTime = false; } return fn.apply(this, arguments); diff --git a/www/lib/moment/src/lib/utils/to-int.js b/www/lib/moment/src/lib/utils/to-int.js index 945e0198..fb489416 100644 --- a/www/lib/moment/src/lib/utils/to-int.js +++ b/www/lib/moment/src/lib/utils/to-int.js @@ -1,13 +1,11 @@ +import absFloor from './abs-floor'; + export default function toInt(argumentForCoercion) { var coercedNumber = +argumentForCoercion, value = 0; if (coercedNumber !== 0 && isFinite(coercedNumber)) { - if (coercedNumber >= 0) { - value = Math.floor(coercedNumber); - } else { - value = Math.ceil(coercedNumber); - } + value = absFloor(coercedNumber); } return value; diff --git a/www/lib/moment/src/lib/utils/zero-fill.js b/www/lib/moment/src/lib/utils/zero-fill.js index af45dd90..7009ec90 100644 --- a/www/lib/moment/src/lib/utils/zero-fill.js +++ b/www/lib/moment/src/lib/utils/zero-fill.js @@ -1,9 +1,7 @@ export default function zeroFill(number, targetLength, forceSign) { - var output = '' + Math.abs(number), + var absNumber = '' + Math.abs(number), + zerosToFill = targetLength - absNumber.length, sign = number >= 0; - - while (output.length < targetLength) { - output = '0' + output; - } - return (sign ? (forceSign ? '+' : '') : '-') + output; + return (sign ? (forceSign ? '+' : '') : '-') + + Math.pow(10, Math.max(0, zerosToFill)).toString().substr(1) + absNumber; } diff --git a/www/lib/moment/src/locale/af.js b/www/lib/moment/src/locale/af.js index 8a490ef1..13b8d7b1 100644 --- a/www/lib/moment/src/locale/af.js +++ b/www/lib/moment/src/locale/af.js @@ -23,11 +23,11 @@ export default moment.defineLocale('af', { }, longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd, D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd, D MMMM YYYY HH:mm' }, calendar : { sameDay : '[Vandag om] LT', diff --git a/www/lib/moment/src/locale/ar-ma.js b/www/lib/moment/src/locale/ar-ma.js index 374468eb..fe79651b 100644 --- a/www/lib/moment/src/locale/ar-ma.js +++ b/www/lib/moment/src/locale/ar-ma.js @@ -13,11 +13,11 @@ export default moment.defineLocale('ar-ma', { weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd D MMMM YYYY HH:mm' }, calendar : { sameDay: '[اليوم على الساعة] LT', diff --git a/www/lib/moment/src/locale/ar-sa.js b/www/lib/moment/src/locale/ar-sa.js index a0ef282d..d32b0cea 100644 --- a/www/lib/moment/src/locale/ar-sa.js +++ b/www/lib/moment/src/locale/ar-sa.js @@ -39,8 +39,8 @@ export default moment.defineLocale('ar-sa', { LTS : 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd D MMMM YYYY HH:mm' }, meridiemParse: /ص|م/, isPM : function (input) { diff --git a/www/lib/moment/src/locale/ar-tn.js b/www/lib/moment/src/locale/ar-tn.js index acb3e089..5dd0edba 100644 --- a/www/lib/moment/src/locale/ar-tn.js +++ b/www/lib/moment/src/locale/ar-tn.js @@ -11,11 +11,11 @@ export default moment.defineLocale('ar-tn', { weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'), longDateFormat: { LT: 'HH:mm', - LTS: 'LT:ss', + LTS: 'HH:mm:ss', L: 'DD/MM/YYYY', LL: 'D MMMM YYYY', - LLL: 'D MMMM YYYY LT', - LLLL: 'dddd D MMMM YYYY LT' + LLL: 'D MMMM YYYY HH:mm', + LLLL: 'dddd D MMMM YYYY HH:mm' }, calendar: { sameDay: '[اليوم على الساعة] LT', diff --git a/www/lib/moment/src/locale/ar.js b/www/lib/moment/src/locale/ar.js index 689bc8f6..e8555a08 100644 --- a/www/lib/moment/src/locale/ar.js +++ b/www/lib/moment/src/locale/ar.js @@ -72,8 +72,8 @@ export default moment.defineLocale('ar', { LTS : 'HH:mm:ss', L : 'D/\u200FM/\u200FYYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd D MMMM YYYY HH:mm' }, meridiemParse: /ص|م/, isPM : function (input) { diff --git a/www/lib/moment/src/locale/az.js b/www/lib/moment/src/locale/az.js index ecf93523..b30c12d8 100644 --- a/www/lib/moment/src/locale/az.js +++ b/www/lib/moment/src/locale/az.js @@ -33,11 +33,11 @@ export default moment.defineLocale('az', { weekdaysMin : 'Bz_BE_ÇA_Çə_CA_Cü_Şə'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD.MM.YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd, D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd, D MMMM YYYY HH:mm' }, calendar : { sameDay : '[bugün saat] LT', diff --git a/www/lib/moment/src/locale/be.js b/www/lib/moment/src/locale/be.js index c1451166..54e7e4a0 100644 --- a/www/lib/moment/src/locale/be.js +++ b/www/lib/moment/src/locale/be.js @@ -57,11 +57,11 @@ export default moment.defineLocale('be', { weekdaysMin : 'нд_пн_ат_ср_чц_пт_сб'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD.MM.YYYY', LL : 'D MMMM YYYY г.', - LLL : 'D MMMM YYYY г., LT', - LLLL : 'dddd, D MMMM YYYY г., LT' + LLL : 'D MMMM YYYY г., HH:mm', + LLLL : 'dddd, D MMMM YYYY г., HH:mm' }, calendar : { sameDay: '[Сёння ў] LT', diff --git a/www/lib/moment/src/locale/bg.js b/www/lib/moment/src/locale/bg.js index a1f1f728..d017ae56 100644 --- a/www/lib/moment/src/locale/bg.js +++ b/www/lib/moment/src/locale/bg.js @@ -12,11 +12,11 @@ export default moment.defineLocale('bg', { weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'), longDateFormat : { LT : 'H:mm', - LTS : 'LT:ss', + LTS : 'H:mm:ss', L : 'D.MM.YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd, D MMMM YYYY LT' + LLL : 'D MMMM YYYY H:mm', + LLLL : 'dddd, D MMMM YYYY H:mm' }, calendar : { sameDay : '[Днес в] LT', diff --git a/www/lib/moment/src/locale/bn.js b/www/lib/moment/src/locale/bn.js index 3a16085c..c5893dd7 100644 --- a/www/lib/moment/src/locale/bn.js +++ b/www/lib/moment/src/locale/bn.js @@ -40,8 +40,8 @@ export default moment.defineLocale('bn', { LTS : 'A h:mm:ss সময়', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY, LT', - LLLL : 'dddd, D MMMM YYYY, LT' + LLL : 'D MMMM YYYY, A h:mm সময়', + LLLL : 'dddd, D MMMM YYYY, A h:mm সময়' }, calendar : { sameDay : '[আজ] LT', @@ -76,7 +76,7 @@ export default moment.defineLocale('bn', { return symbolMap[match]; }); }, - meridiemParse: /রাত|শকাল|দুপুর|বিকেল|রাত/, + meridiemParse: /রাত|সকাল|দুপুর|বিকেল|রাত/, isPM: function (input) { return /^(দুপুর|বিকেল|রাত)$/.test(input); }, @@ -87,7 +87,7 @@ export default moment.defineLocale('bn', { if (hour < 4) { return 'রাত'; } else if (hour < 10) { - return 'শকাল'; + return 'সকাল'; } else if (hour < 17) { return 'দুপুর'; } else if (hour < 20) { diff --git a/www/lib/moment/src/locale/bo.js b/www/lib/moment/src/locale/bo.js index 102bf3af..6da128dd 100644 --- a/www/lib/moment/src/locale/bo.js +++ b/www/lib/moment/src/locale/bo.js @@ -37,11 +37,11 @@ export default moment.defineLocale('bo', { weekdaysMin : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'), longDateFormat : { LT : 'A h:mm', - LTS : 'LT:ss', + LTS : 'A h:mm:ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY, LT', - LLLL : 'dddd, D MMMM YYYY, LT' + LLL : 'D MMMM YYYY, A h:mm', + LLLL : 'dddd, D MMMM YYYY, A h:mm' }, calendar : { sameDay : '[དི་རིང] LT', diff --git a/www/lib/moment/src/locale/br.js b/www/lib/moment/src/locale/br.js index d6b501d1..f95afb38 100644 --- a/www/lib/moment/src/locale/br.js +++ b/www/lib/moment/src/locale/br.js @@ -59,8 +59,8 @@ export default moment.defineLocale('br', { LTS : 'h[e]mm:ss A', L : 'DD/MM/YYYY', LL : 'D [a viz] MMMM YYYY', - LLL : 'D [a viz] MMMM YYYY LT', - LLLL : 'dddd, D [a viz] MMMM YYYY LT' + LLL : 'D [a viz] MMMM YYYY h[e]mm A', + LLLL : 'dddd, D [a viz] MMMM YYYY h[e]mm A' }, calendar : { sameDay : '[Hiziv da] LT', diff --git a/www/lib/moment/src/locale/bs.js b/www/lib/moment/src/locale/bs.js index 62b7f8ed..8ac94f08 100644 --- a/www/lib/moment/src/locale/bs.js +++ b/www/lib/moment/src/locale/bs.js @@ -66,11 +66,11 @@ export default moment.defineLocale('bs', { weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'), longDateFormat : { LT : 'H:mm', - LTS : 'LT:ss', + LTS : 'H:mm:ss', L : 'DD. MM. YYYY', LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY LT', - LLLL : 'dddd, D. MMMM YYYY LT' + LLL : 'D. MMMM YYYY H:mm', + LLLL : 'dddd, D. MMMM YYYY H:mm' }, calendar : { sameDay : '[danas u] LT', diff --git a/www/lib/moment/src/locale/ca.js b/www/lib/moment/src/locale/ca.js index f03f4501..d0c1a45c 100644 --- a/www/lib/moment/src/locale/ca.js +++ b/www/lib/moment/src/locale/ca.js @@ -15,8 +15,8 @@ export default moment.defineLocale('ca', { LTS : 'LT:ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd D MMMM YYYY LT' + LLL : 'D MMMM YYYY H:mm', + LLLL : 'dddd D MMMM YYYY H:mm' }, calendar : { sameDay : function () { diff --git a/www/lib/moment/src/locale/cs.js b/www/lib/moment/src/locale/cs.js index 9388ee88..57b750ba 100644 --- a/www/lib/moment/src/locale/cs.js +++ b/www/lib/moment/src/locale/cs.js @@ -78,11 +78,11 @@ export default moment.defineLocale('cs', { weekdaysMin : 'ne_po_út_st_čt_pá_so'.split('_'), longDateFormat : { LT: 'H:mm', - LTS : 'LT:ss', + LTS : 'H:mm:ss', L : 'DD.MM.YYYY', LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY LT', - LLLL : 'dddd D. MMMM YYYY LT' + LLL : 'D. MMMM YYYY H:mm', + LLLL : 'dddd D. MMMM YYYY H:mm' }, calendar : { sameDay: '[dnes v] LT', diff --git a/www/lib/moment/src/locale/cv.js b/www/lib/moment/src/locale/cv.js index 09db067d..f1cafe14 100644 --- a/www/lib/moment/src/locale/cv.js +++ b/www/lib/moment/src/locale/cv.js @@ -12,11 +12,11 @@ export default moment.defineLocale('cv', { weekdaysMin : 'вр_тн_ыт_юн_кҫ_эр_шм'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD-MM-YYYY', LL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ]', - LLL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], LT', - LLLL : 'dddd, YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], LT' + LLL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm', + LLLL : 'dddd, YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm' }, calendar : { sameDay: '[Паян] LT [сехетре]', diff --git a/www/lib/moment/src/locale/cy.js b/www/lib/moment/src/locale/cy.js index 2d574a6e..b674ba42 100644 --- a/www/lib/moment/src/locale/cy.js +++ b/www/lib/moment/src/locale/cy.js @@ -13,11 +13,11 @@ export default moment.defineLocale('cy', { // time formats are the same as en-gb longDateFormat: { LT: 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L: 'DD/MM/YYYY', LL: 'D MMMM YYYY', - LLL: 'D MMMM YYYY LT', - LLLL: 'dddd, D MMMM YYYY LT' + LLL: 'D MMMM YYYY HH:mm', + LLLL: 'dddd, D MMMM YYYY HH:mm' }, calendar: { sameDay: '[Heddiw am] LT', diff --git a/www/lib/moment/src/locale/da.js b/www/lib/moment/src/locale/da.js index 9ee01132..a98c4bcd 100644 --- a/www/lib/moment/src/locale/da.js +++ b/www/lib/moment/src/locale/da.js @@ -12,11 +12,11 @@ export default moment.defineLocale('da', { weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY LT', - LLLL : 'dddd [d.] D. MMMM YYYY LT' + LLL : 'D. MMMM YYYY HH:mm', + LLLL : 'dddd [d.] D. MMMM YYYY HH:mm' }, calendar : { sameDay : '[I dag kl.] LT', diff --git a/www/lib/moment/src/locale/de-at.js b/www/lib/moment/src/locale/de-at.js index 4aae191b..5a28e7f3 100644 --- a/www/lib/moment/src/locale/de-at.js +++ b/www/lib/moment/src/locale/de-at.js @@ -31,8 +31,8 @@ export default moment.defineLocale('de-at', { LTS: 'HH:mm:ss', L : 'DD.MM.YYYY', LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY LT', - LLLL : 'dddd, D. MMMM YYYY LT' + LLL : 'D. MMMM YYYY HH:mm', + LLLL : 'dddd, D. MMMM YYYY HH:mm' }, calendar : { sameDay: '[Heute um] LT [Uhr]', diff --git a/www/lib/moment/src/locale/de.js b/www/lib/moment/src/locale/de.js index 58c0c30e..205d6839 100644 --- a/www/lib/moment/src/locale/de.js +++ b/www/lib/moment/src/locale/de.js @@ -30,8 +30,8 @@ export default moment.defineLocale('de', { LTS: 'HH:mm:ss', L : 'DD.MM.YYYY', LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY LT', - LLLL : 'dddd, D. MMMM YYYY LT' + LLL : 'D. MMMM YYYY HH:mm', + LLLL : 'dddd, D. MMMM YYYY HH:mm' }, calendar : { sameDay: '[Heute um] LT [Uhr]', diff --git a/www/lib/moment/src/locale/el.js b/www/lib/moment/src/locale/el.js index 8830ada0..83a34218 100644 --- a/www/lib/moment/src/locale/el.js +++ b/www/lib/moment/src/locale/el.js @@ -34,8 +34,8 @@ export default moment.defineLocale('el', { LTS : 'h:mm:ss A', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd, D MMMM YYYY LT' + LLL : 'D MMMM YYYY h:mm A', + LLLL : 'dddd, D MMMM YYYY h:mm A' }, calendarEl : { sameDay : '[Σήμερα {}] LT', diff --git a/www/lib/moment/src/locale/en-au.js b/www/lib/moment/src/locale/en-au.js index a06b6cb7..13c4702d 100644 --- a/www/lib/moment/src/locale/en-au.js +++ b/www/lib/moment/src/locale/en-au.js @@ -14,8 +14,8 @@ export default moment.defineLocale('en-au', { LTS : 'h:mm:ss A', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd, D MMMM YYYY LT' + LLL : 'D MMMM YYYY h:mm A', + LLLL : 'dddd, D MMMM YYYY h:mm A' }, calendar : { sameDay : '[Today at] LT', diff --git a/www/lib/moment/src/locale/en-ca.js b/www/lib/moment/src/locale/en-ca.js index b33f8ab7..9273cf69 100644 --- a/www/lib/moment/src/locale/en-ca.js +++ b/www/lib/moment/src/locale/en-ca.js @@ -15,8 +15,8 @@ export default moment.defineLocale('en-ca', { LTS : 'h:mm:ss A', L : 'YYYY-MM-DD', LL : 'D MMMM, YYYY', - LLL : 'D MMMM, YYYY LT', - LLLL : 'dddd, D MMMM, YYYY LT' + LLL : 'D MMMM, YYYY h:mm A', + LLLL : 'dddd, D MMMM, YYYY h:mm A' }, calendar : { sameDay : '[Today at] LT', diff --git a/www/lib/moment/src/locale/en-gb.js b/www/lib/moment/src/locale/en-gb.js index 09961dd8..82a643fc 100644 --- a/www/lib/moment/src/locale/en-gb.js +++ b/www/lib/moment/src/locale/en-gb.js @@ -15,8 +15,8 @@ export default moment.defineLocale('en-gb', { LTS : 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd, D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd, D MMMM YYYY HH:mm' }, calendar : { sameDay : '[Today at] LT', diff --git a/www/lib/moment/src/locale/eo.js b/www/lib/moment/src/locale/eo.js index 54ecf793..d36d5700 100644 --- a/www/lib/moment/src/locale/eo.js +++ b/www/lib/moment/src/locale/eo.js @@ -14,11 +14,11 @@ export default moment.defineLocale('eo', { weekdaysMin : 'Di_Lu_Ma_Me_Ĵa_Ve_Sa'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'YYYY-MM-DD', LL : 'D[-an de] MMMM, YYYY', - LLL : 'D[-an de] MMMM, YYYY LT', - LLLL : 'dddd, [la] D[-an de] MMMM, YYYY LT' + LLL : 'D[-an de] MMMM, YYYY HH:mm', + LLLL : 'dddd, [la] D[-an de] MMMM, YYYY HH:mm' }, meridiemParse: /[ap]\.t\.m/i, isPM: function (input) { diff --git a/www/lib/moment/src/locale/es.js b/www/lib/moment/src/locale/es.js index c9ea1f5e..f9faafe9 100644 --- a/www/lib/moment/src/locale/es.js +++ b/www/lib/moment/src/locale/es.js @@ -21,11 +21,11 @@ export default moment.defineLocale('es', { weekdaysMin : 'Do_Lu_Ma_Mi_Ju_Vi_Sá'.split('_'), longDateFormat : { LT : 'H:mm', - LTS : 'LT:ss', + LTS : 'H:mm:ss', L : 'DD/MM/YYYY', LL : 'D [de] MMMM [de] YYYY', - LLL : 'D [de] MMMM [de] YYYY LT', - LLLL : 'dddd, D [de] MMMM [de] YYYY LT' + LLL : 'D [de] MMMM [de] YYYY H:mm', + LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm' }, calendar : { sameDay : function () { diff --git a/www/lib/moment/src/locale/et.js b/www/lib/moment/src/locale/et.js index 68cbad94..401ab574 100644 --- a/www/lib/moment/src/locale/et.js +++ b/www/lib/moment/src/locale/et.js @@ -32,11 +32,11 @@ export default moment.defineLocale('et', { weekdaysMin : 'P_E_T_K_N_R_L'.split('_'), longDateFormat : { LT : 'H:mm', - LTS : 'LT:ss', + LTS : 'H:mm:ss', L : 'DD.MM.YYYY', LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY LT', - LLLL : 'dddd, D. MMMM YYYY LT' + LLL : 'D. MMMM YYYY H:mm', + LLLL : 'dddd, D. MMMM YYYY H:mm' }, calendar : { sameDay : '[Täna,] LT', diff --git a/www/lib/moment/src/locale/eu.js b/www/lib/moment/src/locale/eu.js index 2a05907b..08a006c8 100644 --- a/www/lib/moment/src/locale/eu.js +++ b/www/lib/moment/src/locale/eu.js @@ -12,15 +12,15 @@ export default moment.defineLocale('eu', { weekdaysMin : 'ig_al_ar_az_og_ol_lr'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'YYYY-MM-DD', LL : 'YYYY[ko] MMMM[ren] D[a]', - LLL : 'YYYY[ko] MMMM[ren] D[a] LT', - LLLL : 'dddd, YYYY[ko] MMMM[ren] D[a] LT', + LLL : 'YYYY[ko] MMMM[ren] D[a] HH:mm', + LLLL : 'dddd, YYYY[ko] MMMM[ren] D[a] HH:mm', l : 'YYYY-M-D', ll : 'YYYY[ko] MMM D[a]', - lll : 'YYYY[ko] MMM D[a] LT', - llll : 'ddd, YYYY[ko] MMM D[a] LT' + lll : 'YYYY[ko] MMM D[a] HH:mm', + llll : 'ddd, YYYY[ko] MMM D[a] HH:mm' }, calendar : { sameDay : '[gaur] LT[etan]', diff --git a/www/lib/moment/src/locale/fa.js b/www/lib/moment/src/locale/fa.js index e898adfa..96e670ba 100644 --- a/www/lib/moment/src/locale/fa.js +++ b/www/lib/moment/src/locale/fa.js @@ -36,11 +36,11 @@ export default moment.defineLocale('fa', { weekdaysMin : 'ی_د_س_چ_پ_ج_ش'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd, D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd, D MMMM YYYY HH:mm' }, meridiemParse: /قبل از ظهر|بعد از ظهر/, isPM: function (input) { diff --git a/www/lib/moment/src/locale/fi.js b/www/lib/moment/src/locale/fi.js index ee385161..ed929409 100644 --- a/www/lib/moment/src/locale/fi.js +++ b/www/lib/moment/src/locale/fi.js @@ -58,12 +58,12 @@ export default moment.defineLocale('fi', { LTS : 'HH.mm.ss', L : 'DD.MM.YYYY', LL : 'Do MMMM[ta] YYYY', - LLL : 'Do MMMM[ta] YYYY, [klo] LT', - LLLL : 'dddd, Do MMMM[ta] YYYY, [klo] LT', + LLL : 'Do MMMM[ta] YYYY, [klo] HH.mm', + LLLL : 'dddd, Do MMMM[ta] YYYY, [klo] HH.mm', l : 'D.M.YYYY', ll : 'Do MMM YYYY', - lll : 'Do MMM YYYY, [klo] LT', - llll : 'ddd, Do MMM YYYY, [klo] LT' + lll : 'Do MMM YYYY, [klo] HH.mm', + llll : 'ddd, Do MMM YYYY, [klo] HH.mm' }, calendar : { sameDay : '[tänään] [klo] LT', diff --git a/www/lib/moment/src/locale/fo.js b/www/lib/moment/src/locale/fo.js index 28a8e17a..2425fc95 100644 --- a/www/lib/moment/src/locale/fo.js +++ b/www/lib/moment/src/locale/fo.js @@ -12,11 +12,11 @@ export default moment.defineLocale('fo', { weekdaysMin : 'su_má_tý_mi_hó_fr_le'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd D. MMMM, YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd D. MMMM, YYYY HH:mm' }, calendar : { sameDay : '[Í dag kl.] LT', diff --git a/www/lib/moment/src/locale/fr-ca.js b/www/lib/moment/src/locale/fr-ca.js index ef95bd2e..9294b666 100644 --- a/www/lib/moment/src/locale/fr-ca.js +++ b/www/lib/moment/src/locale/fr-ca.js @@ -12,11 +12,11 @@ export default moment.defineLocale('fr-ca', { weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'YYYY-MM-DD', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd D MMMM YYYY HH:mm' }, calendar : { sameDay: '[Aujourd\'hui à] LT', @@ -41,9 +41,9 @@ export default moment.defineLocale('fr-ca', { y : 'un an', yy : '%d ans' }, - ordinalParse: /\d{1,2}(er|)/, + ordinalParse: /\d{1,2}(er|e)/, ordinal : function (number) { - return number + (number === 1 ? 'er' : ''); + return number + (number === 1 ? 'er' : 'e'); } }); diff --git a/www/lib/moment/src/locale/fr.js b/www/lib/moment/src/locale/fr.js index 7492f85b..deb2f631 100644 --- a/www/lib/moment/src/locale/fr.js +++ b/www/lib/moment/src/locale/fr.js @@ -12,11 +12,11 @@ export default moment.defineLocale('fr', { weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd D MMMM YYYY HH:mm' }, calendar : { sameDay: '[Aujourd\'hui à] LT', diff --git a/www/lib/moment/src/locale/fy.js b/www/lib/moment/src/locale/fy.js index 2ccf1790..7c8af617 100644 --- a/www/lib/moment/src/locale/fy.js +++ b/www/lib/moment/src/locale/fy.js @@ -21,11 +21,11 @@ export default moment.defineLocale('fy', { weekdaysMin : 'Si_Mo_Ti_Wo_To_Fr_So'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD-MM-YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd D MMMM YYYY HH:mm' }, calendar : { sameDay: '[hjoed om] LT', diff --git a/www/lib/moment/src/locale/gl.js b/www/lib/moment/src/locale/gl.js index 44138096..02c652c0 100644 --- a/www/lib/moment/src/locale/gl.js +++ b/www/lib/moment/src/locale/gl.js @@ -12,11 +12,11 @@ export default moment.defineLocale('gl', { weekdaysMin : 'Do_Lu_Ma_Mé_Xo_Ve_Sá'.split('_'), longDateFormat : { LT : 'H:mm', - LTS : 'LT:ss', + LTS : 'H:mm:ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd D MMMM YYYY LT' + LLL : 'D MMMM YYYY H:mm', + LLLL : 'dddd D MMMM YYYY H:mm' }, calendar : { sameDay : function () { diff --git a/www/lib/moment/src/locale/he.js b/www/lib/moment/src/locale/he.js index dd4f2d2c..e353158b 100644 --- a/www/lib/moment/src/locale/he.js +++ b/www/lib/moment/src/locale/he.js @@ -14,15 +14,15 @@ export default moment.defineLocale('he', { weekdaysMin : 'א_ב_ג_ד_ה_ו_ש'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D [ב]MMMM YYYY', - LLL : 'D [ב]MMMM YYYY LT', - LLLL : 'dddd, D [ב]MMMM YYYY LT', + LLL : 'D [ב]MMMM YYYY HH:mm', + LLLL : 'dddd, D [ב]MMMM YYYY HH:mm', l : 'D/M/YYYY', ll : 'D MMM YYYY', - lll : 'D MMM YYYY LT', - llll : 'ddd, D MMM YYYY LT' + lll : 'D MMM YYYY HH:mm', + llll : 'ddd, D MMM YYYY HH:mm' }, calendar : { sameDay : '[היום ב־]LT', diff --git a/www/lib/moment/src/locale/hi.js b/www/lib/moment/src/locale/hi.js index 3d568395..07eae1d4 100644 --- a/www/lib/moment/src/locale/hi.js +++ b/www/lib/moment/src/locale/hi.js @@ -40,8 +40,8 @@ export default moment.defineLocale('hi', { LTS : 'A h:mm:ss बजे', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY, LT', - LLLL : 'dddd, D MMMM YYYY, LT' + LLL : 'D MMMM YYYY, A h:mm बजे', + LLLL : 'dddd, D MMMM YYYY, A h:mm बजे' }, calendar : { sameDay : '[आज] LT', diff --git a/www/lib/moment/src/locale/hr.js b/www/lib/moment/src/locale/hr.js index eab62dfb..5dd529a4 100644 --- a/www/lib/moment/src/locale/hr.js +++ b/www/lib/moment/src/locale/hr.js @@ -65,11 +65,11 @@ export default moment.defineLocale('hr', { weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'), longDateFormat : { LT : 'H:mm', - LTS : 'LT:ss', + LTS : 'H:mm:ss', L : 'DD. MM. YYYY', LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY LT', - LLLL : 'dddd, D. MMMM YYYY LT' + LLL : 'D. MMMM YYYY H:mm', + LLLL : 'dddd, D. MMMM YYYY H:mm' }, calendar : { sameDay : '[danas u] LT', diff --git a/www/lib/moment/src/locale/hu.js b/www/lib/moment/src/locale/hu.js index 9359a3cf..bc135092 100644 --- a/www/lib/moment/src/locale/hu.js +++ b/www/lib/moment/src/locale/hu.js @@ -46,11 +46,11 @@ export default moment.defineLocale('hu', { weekdaysMin : 'v_h_k_sze_cs_p_szo'.split('_'), longDateFormat : { LT : 'H:mm', - LTS : 'LT:ss', + LTS : 'H:mm:ss', L : 'YYYY.MM.DD.', LL : 'YYYY. MMMM D.', - LLL : 'YYYY. MMMM D., LT', - LLLL : 'YYYY. MMMM D., dddd LT' + LLL : 'YYYY. MMMM D. H:mm', + LLLL : 'YYYY. MMMM D., dddd H:mm' }, meridiemParse: /de|du/i, isPM: function (input) { diff --git a/www/lib/moment/src/locale/hy-am.js b/www/lib/moment/src/locale/hy-am.js index fdaac2f9..dd78e6a0 100644 --- a/www/lib/moment/src/locale/hy-am.js +++ b/www/lib/moment/src/locale/hy-am.js @@ -31,11 +31,11 @@ export default moment.defineLocale('hy-am', { weekdaysMin : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD.MM.YYYY', LL : 'D MMMM YYYY թ.', - LLL : 'D MMMM YYYY թ., LT', - LLLL : 'dddd, D MMMM YYYY թ., LT' + LLL : 'D MMMM YYYY թ., HH:mm', + LLLL : 'dddd, D MMMM YYYY թ., HH:mm' }, calendar : { sameDay: '[այսօր] LT', diff --git a/www/lib/moment/src/locale/id.js b/www/lib/moment/src/locale/id.js index 8af7f025..7bf359f4 100644 --- a/www/lib/moment/src/locale/id.js +++ b/www/lib/moment/src/locale/id.js @@ -13,11 +13,11 @@ export default moment.defineLocale('id', { weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sb'.split('_'), longDateFormat : { LT : 'HH.mm', - LTS : 'LT.ss', + LTS : 'HH.mm.ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY [pukul] LT', - LLLL : 'dddd, D MMMM YYYY [pukul] LT' + LLL : 'D MMMM YYYY [pukul] HH.mm', + LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm' }, meridiemParse: /pagi|siang|sore|malam/, meridiemHour : function (hour, meridiem) { diff --git a/www/lib/moment/src/locale/is.js b/www/lib/moment/src/locale/is.js index 13b8815c..833907de 100644 --- a/www/lib/moment/src/locale/is.js +++ b/www/lib/moment/src/locale/is.js @@ -79,11 +79,11 @@ export default moment.defineLocale('is', { weekdaysMin : 'Su_Má_Þr_Mi_Fi_Fö_La'.split('_'), longDateFormat : { LT : 'H:mm', - LTS : 'LT:ss', + LTS : 'H:mm:ss', 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.] H:mm', + LLLL : 'dddd, D. MMMM YYYY [kl.] H:mm' }, calendar : { sameDay : '[í dag kl.] LT', diff --git a/www/lib/moment/src/locale/it.js b/www/lib/moment/src/locale/it.js index 63f34ac5..d2d764c5 100644 --- a/www/lib/moment/src/locale/it.js +++ b/www/lib/moment/src/locale/it.js @@ -13,11 +13,11 @@ export default moment.defineLocale('it', { weekdaysMin : 'D_L_Ma_Me_G_V_S'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd, D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd, D MMMM YYYY HH:mm' }, calendar : { sameDay: '[Oggi alle] LT', diff --git a/www/lib/moment/src/locale/ja.js b/www/lib/moment/src/locale/ja.js index 1f9b865f..6cdc4fce 100644 --- a/www/lib/moment/src/locale/ja.js +++ b/www/lib/moment/src/locale/ja.js @@ -12,11 +12,11 @@ export default moment.defineLocale('ja', { weekdaysMin : '日_月_火_水_木_金_土'.split('_'), longDateFormat : { LT : 'Ah時m分', - LTS : 'LTs秒', + LTS : 'Ah時m分s秒', L : 'YYYY/MM/DD', LL : 'YYYY年M月D日', - LLL : 'YYYY年M月D日LT', - LLLL : 'YYYY年M月D日LT dddd' + LLL : 'YYYY年M月D日Ah時m分', + LLLL : 'YYYY年M月D日Ah時m分 dddd' }, meridiemParse: /午前|午後/i, isPM : function (input) { diff --git a/www/lib/moment/src/locale/jv.js b/www/lib/moment/src/locale/jv.js index b5401a0a..8596944f 100644 --- a/www/lib/moment/src/locale/jv.js +++ b/www/lib/moment/src/locale/jv.js @@ -13,11 +13,11 @@ export default moment.defineLocale('jv', { weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sp'.split('_'), longDateFormat : { LT : 'HH.mm', - LTS : 'LT.ss', + LTS : 'HH.mm.ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY [pukul] LT', - LLLL : 'dddd, D MMMM YYYY [pukul] LT' + LLL : 'D MMMM YYYY [pukul] HH.mm', + LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm' }, meridiemParse: /enjing|siyang|sonten|ndalu/, meridiemHour : function (hour, meridiem) { diff --git a/www/lib/moment/src/locale/ka.js b/www/lib/moment/src/locale/ka.js index a750b2a9..b1454b80 100644 --- a/www/lib/moment/src/locale/ka.js +++ b/www/lib/moment/src/locale/ka.js @@ -36,8 +36,8 @@ export default moment.defineLocale('ka', { LTS : 'h:mm:ss A', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd, D MMMM YYYY LT' + LLL : 'D MMMM YYYY h:mm A', + LLLL : 'dddd, D MMMM YYYY h:mm A' }, calendar : { sameDay : '[დღეს] LT[-ზე]', diff --git a/www/lib/moment/src/locale/km.js b/www/lib/moment/src/locale/km.js index db9147ec..389d1f61 100644 --- a/www/lib/moment/src/locale/km.js +++ b/www/lib/moment/src/locale/km.js @@ -12,11 +12,11 @@ export default moment.defineLocale('km', { weekdaysMin: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'), longDateFormat: { LT: 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L: 'DD/MM/YYYY', LL: 'D MMMM YYYY', - LLL: 'D MMMM YYYY LT', - LLLL: 'dddd, D MMMM YYYY LT' + LLL: 'D MMMM YYYY HH:mm', + LLLL: 'dddd, D MMMM YYYY HH:mm' }, calendar: { sameDay: '[ថ្ងៃនៈ ម៉ោង] LT', diff --git a/www/lib/moment/src/locale/ko.js b/www/lib/moment/src/locale/ko.js index a56aee0b..268e7827 100644 --- a/www/lib/moment/src/locale/ko.js +++ b/www/lib/moment/src/locale/ko.js @@ -19,8 +19,8 @@ export default moment.defineLocale('ko', { LTS : 'A h시 m분 s초', L : 'YYYY.MM.DD', LL : 'YYYY년 MMMM D일', - LLL : 'YYYY년 MMMM D일 LT', - LLLL : 'YYYY년 MMMM D일 dddd LT' + LLL : 'YYYY년 MMMM D일 A h시 m분', + LLLL : 'YYYY년 MMMM D일 dddd A h시 m분' }, calendar : { sameDay : '오늘 LT', diff --git a/www/lib/moment/src/locale/lb.js b/www/lib/moment/src/locale/lb.js index 6cc6d555..3f20eeae 100644 --- a/www/lib/moment/src/locale/lb.js +++ b/www/lib/moment/src/locale/lb.js @@ -80,8 +80,8 @@ export default moment.defineLocale('lb', { LTS: 'H:mm:ss [Auer]', L: 'DD.MM.YYYY', LL: 'D. MMMM YYYY', - LLL: 'D. MMMM YYYY LT', - LLLL: 'dddd, D. MMMM YYYY LT' + LLL: 'D. MMMM YYYY H:mm [Auer]', + LLLL: 'dddd, D. MMMM YYYY H:mm [Auer]' }, calendar: { sameDay: '[Haut um] LT', diff --git a/www/lib/moment/src/locale/lt.js b/www/lib/moment/src/locale/lt.js index 80951638..6487c683 100644 --- a/www/lib/moment/src/locale/lt.js +++ b/www/lib/moment/src/locale/lt.js @@ -24,6 +24,16 @@ function translateSeconds(number, withoutSuffix, key, isFuture) { return isFuture ? 'kelių sekundžių' : 'kelias sekundes'; } } +function monthsCaseReplace(m, format) { + var months = { + 'nominative': 'sausis_vasaris_kovas_balandis_gegužė_birželis_liepa_rugpjūtis_rugsėjis_spalis_lapkritis_gruodis'.split('_'), + 'accusative': 'sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio'.split('_') + }, + nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ? + 'accusative' : + 'nominative'; + return months[nounCase][m.month()]; +} function translateSingular(number, withoutSuffix, key, isFuture) { return withoutSuffix ? forms(key)[0] : (isFuture ? forms(key)[1] : forms(key)[2]); } @@ -54,22 +64,22 @@ function relativeWeekDay(moment, format) { } export default moment.defineLocale('lt', { - months : 'sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio'.split('_'), + months : monthsCaseReplace, monthsShort : 'sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd'.split('_'), weekdays : relativeWeekDay, weekdaysShort : 'Sek_Pir_Ant_Tre_Ket_Pen_Šeš'.split('_'), weekdaysMin : 'S_P_A_T_K_Pn_Š'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'YYYY-MM-DD', LL : 'YYYY [m.] MMMM D [d.]', - LLL : 'YYYY [m.] MMMM D [d.], LT [val.]', - LLLL : 'YYYY [m.] MMMM D [d.], dddd, LT [val.]', + LLL : 'YYYY [m.] MMMM D [d.], HH:mm [val.]', + LLLL : 'YYYY [m.] MMMM D [d.], dddd, HH:mm [val.]', l : 'YYYY-MM-DD', ll : 'YYYY [m.] MMMM D [d.]', - lll : 'YYYY [m.] MMMM D [d.], LT [val.]', - llll : 'YYYY [m.] MMMM D [d.], ddd, LT [val.]' + lll : 'YYYY [m.] MMMM D [d.], HH:mm [val.]', + llll : 'YYYY [m.] MMMM D [d.], ddd, HH:mm [val.]' }, calendar : { sameDay : '[Šiandien] LT', diff --git a/www/lib/moment/src/locale/lv.js b/www/lib/moment/src/locale/lv.js index b37cb5cf..53aec40d 100644 --- a/www/lib/moment/src/locale/lv.js +++ b/www/lib/moment/src/locale/lv.js @@ -48,11 +48,11 @@ export default moment.defineLocale('lv', { weekdaysMin : 'Sv_P_O_T_C_Pk_S'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD.MM.YYYY.', LL : 'YYYY. [gada] D. MMMM', - LLL : 'YYYY. [gada] D. MMMM, LT', - LLLL : 'YYYY. [gada] D. MMMM, dddd, LT' + LLL : 'YYYY. [gada] D. MMMM, HH:mm', + LLLL : 'YYYY. [gada] D. MMMM, dddd, HH:mm' }, calendar : { sameDay : '[Šodien pulksten] LT', diff --git a/www/lib/moment/src/locale/me.js b/www/lib/moment/src/locale/me.js index 2c356dab..a5096585 100644 --- a/www/lib/moment/src/locale/me.js +++ b/www/lib/moment/src/locale/me.js @@ -35,11 +35,11 @@ export default moment.defineLocale('me', { weekdaysMin: ['ne', 'po', 'ut', 'sr', 'če', 'pe', 'su'], longDateFormat: { LT: 'H:mm', - LTS : 'LT:ss', + LTS : 'H:mm:ss', L: 'DD. MM. YYYY', LL: 'D. MMMM YYYY', - LLL: 'D. MMMM YYYY LT', - LLLL: 'dddd, D. MMMM YYYY LT' + LLL: 'D. MMMM YYYY H:mm', + LLLL: 'dddd, D. MMMM YYYY H:mm' }, calendar: { sameDay: '[danas u] LT', diff --git a/www/lib/moment/src/locale/mk.js b/www/lib/moment/src/locale/mk.js index 80c522d4..3d2bb931 100644 --- a/www/lib/moment/src/locale/mk.js +++ b/www/lib/moment/src/locale/mk.js @@ -12,11 +12,11 @@ export default moment.defineLocale('mk', { weekdaysMin : 'нe_пo_вт_ср_че_пе_сa'.split('_'), longDateFormat : { LT : 'H:mm', - LTS : 'LT:ss', + LTS : 'H:mm:ss', L : 'D.MM.YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd, D MMMM YYYY LT' + LLL : 'D MMMM YYYY H:mm', + LLLL : 'dddd, D MMMM YYYY H:mm' }, calendar : { sameDay : '[Денес во] LT', diff --git a/www/lib/moment/src/locale/ml.js b/www/lib/moment/src/locale/ml.js index cbb90562..7bafa7a1 100644 --- a/www/lib/moment/src/locale/ml.js +++ b/www/lib/moment/src/locale/ml.js @@ -15,8 +15,8 @@ export default moment.defineLocale('ml', { LTS : 'A h:mm:ss -നു', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY, LT', - LLLL : 'dddd, D MMMM YYYY, LT' + LLL : 'D MMMM YYYY, A h:mm -നു', + LLLL : 'dddd, D MMMM YYYY, A h:mm -നു' }, calendar : { sameDay : '[ഇന്ന്] LT', diff --git a/www/lib/moment/src/locale/mr.js b/www/lib/moment/src/locale/mr.js index 24011a37..7a2b8e09 100644 --- a/www/lib/moment/src/locale/mr.js +++ b/www/lib/moment/src/locale/mr.js @@ -40,8 +40,8 @@ export default moment.defineLocale('mr', { LTS : 'A h:mm:ss वाजता', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY, LT', - LLLL : 'dddd, D MMMM YYYY, LT' + LLL : 'D MMMM YYYY, A h:mm वाजता', + LLLL : 'dddd, D MMMM YYYY, A h:mm वाजता' }, calendar : { sameDay : '[आज] LT', diff --git a/www/lib/moment/src/locale/ms-my.js b/www/lib/moment/src/locale/ms-my.js index 10bce036..1490a1ff 100644 --- a/www/lib/moment/src/locale/ms-my.js +++ b/www/lib/moment/src/locale/ms-my.js @@ -12,11 +12,11 @@ export default moment.defineLocale('ms-my', { weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'), longDateFormat : { LT : 'HH.mm', - LTS : 'LT.ss', + LTS : 'HH.mm.ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY [pukul] LT', - LLLL : 'dddd, D MMMM YYYY [pukul] LT' + LLL : 'D MMMM YYYY [pukul] HH.mm', + LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm' }, meridiemParse: /pagi|tengahari|petang|malam/, meridiemHour: function (hour, meridiem) { diff --git a/www/lib/moment/src/locale/ms.js b/www/lib/moment/src/locale/ms.js new file mode 100644 index 00000000..59fb9a27 --- /dev/null +++ b/www/lib/moment/src/locale/ms.js @@ -0,0 +1,73 @@ +//! moment.js locale configuration +//! locale : Bahasa Malaysia (ms-MY) +//! author : Weldan Jamili : https://github.com/weldan + +import moment from '../moment'; + +export default moment.defineLocale('ms', { + months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'), + monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'), + weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'), + weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'), + weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'), + longDateFormat : { + LT : 'HH.mm', + LTS : 'HH.mm.ss', + L : 'DD/MM/YYYY', + LL : 'D MMMM YYYY', + LLL : 'D MMMM YYYY [pukul] HH.mm', + LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm' + }, + meridiemParse: /pagi|tengahari|petang|malam/, + meridiemHour: function (hour, meridiem) { + if (hour === 12) { + hour = 0; + } + if (meridiem === 'pagi') { + return hour; + } else if (meridiem === 'tengahari') { + return hour >= 11 ? hour : hour + 12; + } else if (meridiem === 'petang' || meridiem === 'malam') { + return hour + 12; + } + }, + meridiem : function (hours, minutes, isLower) { + if (hours < 11) { + return 'pagi'; + } else if (hours < 15) { + return 'tengahari'; + } else if (hours < 19) { + return 'petang'; + } else { + return 'malam'; + } + }, + calendar : { + sameDay : '[Hari ini pukul] LT', + nextDay : '[Esok pukul] LT', + nextWeek : 'dddd [pukul] LT', + lastDay : '[Kelmarin pukul] LT', + lastWeek : 'dddd [lepas pukul] LT', + sameElse : 'L' + }, + relativeTime : { + future : 'dalam %s', + past : '%s yang lepas', + s : 'beberapa saat', + m : 'seminit', + mm : '%d minit', + h : 'sejam', + hh : '%d jam', + d : 'sehari', + dd : '%d hari', + M : 'sebulan', + MM : '%d bulan', + y : 'setahun', + yy : '%d tahun' + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } +}); + diff --git a/www/lib/moment/src/locale/my.js b/www/lib/moment/src/locale/my.js index 54af1400..d9dff819 100644 --- a/www/lib/moment/src/locale/my.js +++ b/www/lib/moment/src/locale/my.js @@ -40,8 +40,8 @@ export default moment.defineLocale('my', { LTS: 'HH:mm:ss', L: 'DD/MM/YYYY', LL: 'D MMMM YYYY', - LLL: 'D MMMM YYYY LT', - LLLL: 'dddd D MMMM YYYY LT' + LLL: 'D MMMM YYYY HH:mm', + LLLL: 'dddd D MMMM YYYY HH:mm' }, calendar: { sameDay: '[ယနေ.] LT [မှာ]', diff --git a/www/lib/moment/src/locale/nb.js b/www/lib/moment/src/locale/nb.js index cadc224d..d5f15a9b 100644 --- a/www/lib/moment/src/locale/nb.js +++ b/www/lib/moment/src/locale/nb.js @@ -13,11 +13,11 @@ export default moment.defineLocale('nb', { weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'), longDateFormat : { LT : 'H.mm', - LTS : 'LT.ss', + LTS : 'H.mm.ss', 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.] H.mm', + LLLL : 'dddd D. MMMM YYYY [kl.] H.mm' }, calendar : { sameDay: '[i dag kl.] LT', diff --git a/www/lib/moment/src/locale/ne.js b/www/lib/moment/src/locale/ne.js index 966db269..e229357c 100644 --- a/www/lib/moment/src/locale/ne.js +++ b/www/lib/moment/src/locale/ne.js @@ -40,8 +40,8 @@ export default moment.defineLocale('ne', { LTS : 'Aको h:mm:ss बजे', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY, LT', - LLLL : 'dddd, D MMMM YYYY, LT' + LLL : 'D MMMM YYYY, Aको h:mm बजे', + LLLL : 'dddd, D MMMM YYYY, Aको h:mm बजे' }, preparse: function (string) { return string.replace(/[१२३४५६७८९०]/g, function (match) { diff --git a/www/lib/moment/src/locale/nl.js b/www/lib/moment/src/locale/nl.js index f493a767..6669531d 100644 --- a/www/lib/moment/src/locale/nl.js +++ b/www/lib/moment/src/locale/nl.js @@ -21,11 +21,11 @@ export default moment.defineLocale('nl', { weekdaysMin : 'Zo_Ma_Di_Wo_Do_Vr_Za'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD-MM-YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd D MMMM YYYY HH:mm' }, calendar : { sameDay: '[vandaag om] LT', diff --git a/www/lib/moment/src/locale/nn.js b/www/lib/moment/src/locale/nn.js index b3f76c56..3f284b3c 100644 --- a/www/lib/moment/src/locale/nn.js +++ b/www/lib/moment/src/locale/nn.js @@ -12,11 +12,11 @@ export default moment.defineLocale('nn', { weekdaysMin : 'su_må_ty_on_to_fr_lø'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD.MM.YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd D MMMM YYYY HH:mm' }, calendar : { sameDay: '[I dag klokka] LT', diff --git a/www/lib/moment/src/locale/pl.js b/www/lib/moment/src/locale/pl.js index e458ea5a..e6a3a5a3 100644 --- a/www/lib/moment/src/locale/pl.js +++ b/www/lib/moment/src/locale/pl.js @@ -46,11 +46,11 @@ export default moment.defineLocale('pl', { weekdaysMin : 'N_Pn_Wt_Śr_Cz_Pt_So'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD.MM.YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd, D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd, D MMMM YYYY HH:mm' }, calendar : { sameDay: '[Dziś o] LT', diff --git a/www/lib/moment/src/locale/pt-br.js b/www/lib/moment/src/locale/pt-br.js index e08e8470..c002fdb3 100644 --- a/www/lib/moment/src/locale/pt-br.js +++ b/www/lib/moment/src/locale/pt-br.js @@ -12,11 +12,11 @@ export default moment.defineLocale('pt-br', { weekdaysMin : 'Dom_2ª_3ª_4ª_5ª_6ª_Sáb'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D [de] MMMM [de] YYYY', - LLL : 'D [de] MMMM [de] YYYY [às] LT', - LLLL : 'dddd, D [de] MMMM [de] YYYY [às] LT' + LLL : 'D [de] MMMM [de] YYYY [às] HH:mm', + LLLL : 'dddd, D [de] MMMM [de] YYYY [às] HH:mm' }, calendar : { sameDay: '[Hoje às] LT', @@ -33,7 +33,7 @@ export default moment.defineLocale('pt-br', { relativeTime : { future : 'em %s', past : '%s atrás', - s : 'segundos', + s : 'poucos segundos', m : 'um minuto', mm : '%d minutos', h : 'uma hora', diff --git a/www/lib/moment/src/locale/pt.js b/www/lib/moment/src/locale/pt.js index 71e37c69..0a38d468 100644 --- a/www/lib/moment/src/locale/pt.js +++ b/www/lib/moment/src/locale/pt.js @@ -12,11 +12,11 @@ export default moment.defineLocale('pt', { weekdaysMin : 'Dom_2ª_3ª_4ª_5ª_6ª_Sáb'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D [de] MMMM [de] YYYY', - LLL : 'D [de] MMMM [de] YYYY LT', - LLLL : 'dddd, D [de] MMMM [de] YYYY LT' + LLL : 'D [de] MMMM [de] YYYY HH:mm', + LLLL : 'dddd, D [de] MMMM [de] YYYY HH:mm' }, calendar : { sameDay: '[Hoje às] LT', diff --git a/www/lib/moment/src/locale/ro.js b/www/lib/moment/src/locale/ro.js index de6cebf0..56413d87 100644 --- a/www/lib/moment/src/locale/ro.js +++ b/www/lib/moment/src/locale/ro.js @@ -28,7 +28,7 @@ export default moment.defineLocale('ro', { weekdaysMin : 'Du_Lu_Ma_Mi_Jo_Vi_Sâ'.split('_'), longDateFormat : { LT : 'H:mm', - LTS : 'LT:ss', + LTS : 'H:mm:ss', L : 'DD.MM.YYYY', LL : 'D MMMM YYYY', LLL : 'D MMMM YYYY H:mm', diff --git a/www/lib/moment/src/locale/ru.js b/www/lib/moment/src/locale/ru.js index 8a210a46..0687888c 100644 --- a/www/lib/moment/src/locale/ru.js +++ b/www/lib/moment/src/locale/ru.js @@ -64,11 +64,11 @@ export default moment.defineLocale('ru', { monthsParse : [/^янв/i, /^фев/i, /^мар/i, /^апр/i, /^ма[й|я]/i, /^июн/i, /^июл/i, /^авг/i, /^сен/i, /^окт/i, /^ноя/i, /^дек/i], longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD.MM.YYYY', LL : 'D MMMM YYYY г.', - LLL : 'D MMMM YYYY г., LT', - LLLL : 'dddd, D MMMM YYYY г., LT' + LLL : 'D MMMM YYYY г., HH:mm', + LLLL : 'dddd, D MMMM YYYY г., HH:mm' }, calendar : { sameDay: '[Сегодня в] LT', diff --git a/www/lib/moment/src/locale/si.js b/www/lib/moment/src/locale/si.js index 0f03b636..15c9f159 100644 --- a/www/lib/moment/src/locale/si.js +++ b/www/lib/moment/src/locale/si.js @@ -1,4 +1,4 @@ -//! moment.js locale configuration +//! moment.js locale configuration //! locale : Sinhalese (si) //! author : Sampath Sitinamaluwa : https://github.com/sampathsris @@ -16,8 +16,8 @@ export default moment.defineLocale('si', { LTS : 'a h:mm:ss', L : 'YYYY/MM/DD', LL : 'YYYY MMMM D', - LLL : 'YYYY MMMM D, LT', - LLLL : 'YYYY MMMM D [වැනි] dddd, LTS' + LLL : 'YYYY MMMM D, a h:mm', + LLLL : 'YYYY MMMM D [වැනි] dddd, a h:mm:ss' }, calendar : { sameDay : '[අද] LT[ට]', diff --git a/www/lib/moment/src/locale/sk.js b/www/lib/moment/src/locale/sk.js index 4ac38c30..079725c5 100644 --- a/www/lib/moment/src/locale/sk.js +++ b/www/lib/moment/src/locale/sk.js @@ -79,11 +79,11 @@ export default moment.defineLocale('sk', { weekdaysMin : 'ne_po_ut_st_št_pi_so'.split('_'), longDateFormat : { LT: 'H:mm', - LTS : 'LT:ss', + LTS : 'H:mm:ss', L : 'DD.MM.YYYY', LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY LT', - LLLL : 'dddd D. MMMM YYYY LT' + LLL : 'D. MMMM YYYY H:mm', + LLLL : 'dddd D. MMMM YYYY H:mm' }, calendar : { sameDay: '[dnes o] LT', diff --git a/www/lib/moment/src/locale/sl.js b/www/lib/moment/src/locale/sl.js index e5723389..0cb6701e 100644 --- a/www/lib/moment/src/locale/sl.js +++ b/www/lib/moment/src/locale/sl.js @@ -83,11 +83,11 @@ export default moment.defineLocale('sl', { weekdaysMin : 'ne_po_to_sr_če_pe_so'.split('_'), longDateFormat : { LT : 'H:mm', - LTS : 'LT:ss', + LTS : 'H:mm:ss', L : 'DD. MM. YYYY', LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY LT', - LLLL : 'dddd, D. MMMM YYYY LT' + LLL : 'D. MMMM YYYY H:mm', + LLLL : 'dddd, D. MMMM YYYY H:mm' }, calendar : { sameDay : '[danes ob] LT', diff --git a/www/lib/moment/src/locale/sq.js b/www/lib/moment/src/locale/sq.js index 76172b46..d8a9c023 100644 --- a/www/lib/moment/src/locale/sq.js +++ b/www/lib/moment/src/locale/sq.js @@ -21,11 +21,11 @@ export default moment.defineLocale('sq', { }, longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd, D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd, D MMMM YYYY HH:mm' }, calendar : { sameDay : '[Sot në] LT', diff --git a/www/lib/moment/src/locale/sr-cyrl.js b/www/lib/moment/src/locale/sr-cyrl.js index 1da53e3f..2ce8eeae 100644 --- a/www/lib/moment/src/locale/sr-cyrl.js +++ b/www/lib/moment/src/locale/sr-cyrl.js @@ -35,11 +35,11 @@ export default moment.defineLocale('sr-cyrl', { weekdaysMin: ['не', 'по', 'ут', 'ср', 'че', 'пе', 'су'], longDateFormat: { LT: 'H:mm', - LTS : 'LT:ss', + LTS : 'H:mm:ss', L: 'DD. MM. YYYY', LL: 'D. MMMM YYYY', - LLL: 'D. MMMM YYYY LT', - LLLL: 'dddd, D. MMMM YYYY LT' + LLL: 'D. MMMM YYYY H:mm', + LLLL: 'dddd, D. MMMM YYYY H:mm' }, calendar: { sameDay: '[данас у] LT', diff --git a/www/lib/moment/src/locale/sr.js b/www/lib/moment/src/locale/sr.js index 210c7398..233e4677 100644 --- a/www/lib/moment/src/locale/sr.js +++ b/www/lib/moment/src/locale/sr.js @@ -35,11 +35,11 @@ export default moment.defineLocale('sr', { weekdaysMin: ['ne', 'po', 'ut', 'sr', 'če', 'pe', 'su'], longDateFormat: { LT: 'H:mm', - LTS : 'LT:ss', + LTS : 'H:mm:ss', L: 'DD. MM. YYYY', LL: 'D. MMMM YYYY', - LLL: 'D. MMMM YYYY LT', - LLLL: 'dddd, D. MMMM YYYY LT' + LLL: 'D. MMMM YYYY H:mm', + LLLL: 'dddd, D. MMMM YYYY H:mm' }, calendar: { sameDay: '[danas u] LT', diff --git a/www/lib/moment/src/locale/sv.js b/www/lib/moment/src/locale/sv.js index 6fc1c268..1e841f60 100644 --- a/www/lib/moment/src/locale/sv.js +++ b/www/lib/moment/src/locale/sv.js @@ -12,11 +12,11 @@ export default moment.defineLocale('sv', { weekdaysMin : 'sö_må_ti_on_to_fr_lö'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'YYYY-MM-DD', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd D MMMM YYYY HH:mm' }, calendar : { sameDay: '[Idag] LT', diff --git a/www/lib/moment/src/locale/ta.js b/www/lib/moment/src/locale/ta.js index 4341c3e7..6879be48 100644 --- a/www/lib/moment/src/locale/ta.js +++ b/www/lib/moment/src/locale/ta.js @@ -12,11 +12,11 @@ export default moment.defineLocale('ta', { weekdaysMin : 'ஞா_தி_செ_பு_வி_வெ_ச'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY, LT', - LLLL : 'dddd, D MMMM YYYY, LT' + LLL : 'D MMMM YYYY, HH:mm', + LLLL : 'dddd, D MMMM YYYY, HH:mm' }, calendar : { sameDay : '[இன்று] LT', diff --git a/www/lib/moment/src/locale/th.js b/www/lib/moment/src/locale/th.js index 2382d254..265680c9 100644 --- a/www/lib/moment/src/locale/th.js +++ b/www/lib/moment/src/locale/th.js @@ -12,11 +12,11 @@ export default moment.defineLocale('th', { weekdaysMin : 'อา._จ._อ._พ._พฤ._ศ._ส.'.split('_'), longDateFormat : { LT : 'H นาฬิกา m นาที', - LTS : 'LT s วินาที', + LTS : 'H นาฬิกา m นาที s วินาที', L : 'YYYY/MM/DD', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY เวลา LT', - LLLL : 'วันddddที่ D MMMM YYYY เวลา LT' + LLL : 'D MMMM YYYY เวลา H นาฬิกา m นาที', + LLLL : 'วันddddที่ D MMMM YYYY เวลา H นาฬิกา m นาที' }, meridiemParse: /ก่อนเที่ยง|หลังเที่ยง/, isPM: function (input) { diff --git a/www/lib/moment/src/locale/tl-ph.js b/www/lib/moment/src/locale/tl-ph.js index a1b24a71..1cd4842c 100644 --- a/www/lib/moment/src/locale/tl-ph.js +++ b/www/lib/moment/src/locale/tl-ph.js @@ -12,11 +12,11 @@ export default moment.defineLocale('tl-ph', { weekdaysMin : 'Li_Lu_Ma_Mi_Hu_Bi_Sab'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'MM/D/YYYY', LL : 'MMMM D, YYYY', - LLL : 'MMMM D, YYYY LT', - LLLL : 'dddd, MMMM DD, YYYY LT' + LLL : 'MMMM D, YYYY HH:mm', + LLLL : 'dddd, MMMM DD, YYYY HH:mm' }, calendar : { sameDay: '[Ngayon sa] LT', diff --git a/www/lib/moment/src/locale/tr.js b/www/lib/moment/src/locale/tr.js index 78f2b697..e908bc03 100644 --- a/www/lib/moment/src/locale/tr.js +++ b/www/lib/moment/src/locale/tr.js @@ -34,11 +34,11 @@ export default moment.defineLocale('tr', { weekdaysMin : 'Pz_Pt_Sa_Ça_Pe_Cu_Ct'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD.MM.YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd, D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd, D MMMM YYYY HH:mm' }, calendar : { sameDay : '[bugün saat] LT', diff --git a/www/lib/moment/src/locale/tzl.js b/www/lib/moment/src/locale/tzl.js new file mode 100644 index 00000000..cae85342 --- /dev/null +++ b/www/lib/moment/src/locale/tzl.js @@ -0,0 +1,78 @@ +//! moment.js locale configuration +//! locale : talossan (tzl) +//! author : Robin van der Vliet : https://github.com/robin0van0der0v with the help of Iustì Canun + + +import moment from '../moment'; + +// After the year there should be a slash and the amount of years since December 26, 1979 in Roman numerals. +// This is currently too difficult (maybe even impossible) to add. +export default moment.defineLocale('tzl', { + months : 'Januar_Fevraglh_Març_Avrïu_Mai_Gün_Julia_Guscht_Setemvar_Listopäts_Noemvar_Zecemvar'.split('_'), + monthsShort : 'Jan_Fev_Mar_Avr_Mai_Gün_Jul_Gus_Set_Lis_Noe_Zec'.split('_'), + weekdays : 'Súladi_Lúneçi_Maitzi_Márcuri_Xhúadi_Viénerçi_Sáturi'.split('_'), + weekdaysShort : 'Súl_Lún_Mai_Már_Xhú_Vié_Sát'.split('_'), + weekdaysMin : 'Sú_Lú_Ma_Má_Xh_Vi_Sá'.split('_'), + longDateFormat : { + LT : 'HH.mm', + LTS : 'LT.ss', + L : 'DD.MM.YYYY', + LL : 'D. MMMM [dallas] YYYY', + LLL : 'D. MMMM [dallas] YYYY LT', + LLLL : 'dddd, [li] D. MMMM [dallas] YYYY LT' + }, + meridiem : function (hours, minutes, isLower) { + if (hours > 11) { + return isLower ? 'd\'o' : 'D\'O'; + } else { + return isLower ? 'd\'a' : 'D\'A'; + } + }, + calendar : { + sameDay : '[oxhi à] LT', + nextDay : '[demà à] LT', + nextWeek : 'dddd [à] LT', + lastDay : '[ieiri à] LT', + lastWeek : '[sür el] dddd [lasteu à] LT', + sameElse : 'L' + }, + relativeTime : { + future : 'osprei %s', + past : 'ja%s', + s : processRelativeTime, + m : processRelativeTime, + mm : processRelativeTime, + h : processRelativeTime, + hh : processRelativeTime, + d : processRelativeTime, + dd : processRelativeTime, + M : processRelativeTime, + MM : processRelativeTime, + y : processRelativeTime, + yy : processRelativeTime + }, + ordinalParse: /\d{1,2}\./, + ordinal : '%d.', + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } +}); + +function processRelativeTime(number, withoutSuffix, key, isFuture) { + var format = { + 's': ['viensas secunds', '\'iensas secunds'], + 'm': ['\'n míut', '\'iens míut'], + 'mm': [number + ' míuts', ' ' + number + ' míuts'], + 'h': ['\'n þora', '\'iensa þora'], + 'hh': [number + ' þoras', ' ' + number + ' þoras'], + 'd': ['\'n ziua', '\'iensa ziua'], + 'dd': [number + ' ziuas', ' ' + number + ' ziuas'], + 'M': ['\'n mes', '\'iens mes'], + 'MM': [number + ' mesen', ' ' + number + ' mesen'], + 'y': ['\'n ar', '\'iens ar'], + 'yy': [number + ' ars', ' ' + number + ' ars'] + }; + return isFuture ? format[key][0] : (withoutSuffix ? format[key][0] : format[key][1].trim()); +} + diff --git a/www/lib/moment/src/locale/tzm-latn.js b/www/lib/moment/src/locale/tzm-latn.js index 153e51f9..e2631d97 100644 --- a/www/lib/moment/src/locale/tzm-latn.js +++ b/www/lib/moment/src/locale/tzm-latn.js @@ -12,11 +12,11 @@ export default moment.defineLocale('tzm-latn', { weekdaysMin : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd D MMMM YYYY HH:mm' }, calendar : { sameDay: '[asdkh g] LT', diff --git a/www/lib/moment/src/locale/tzm.js b/www/lib/moment/src/locale/tzm.js index b53adb06..a06a27d9 100644 --- a/www/lib/moment/src/locale/tzm.js +++ b/www/lib/moment/src/locale/tzm.js @@ -12,11 +12,11 @@ export default moment.defineLocale('tzm', { weekdaysMin : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS: 'LT:ss', + LTS: 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'dddd D MMMM YYYY LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'dddd D MMMM YYYY HH:mm' }, calendar : { sameDay: '[ⴰⵙⴷⵅ ⴴ] LT', diff --git a/www/lib/moment/src/locale/uk.js b/www/lib/moment/src/locale/uk.js index 6fd7a1ef..fe1f7d2a 100644 --- a/www/lib/moment/src/locale/uk.js +++ b/www/lib/moment/src/locale/uk.js @@ -64,11 +64,11 @@ export default moment.defineLocale('uk', { weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD.MM.YYYY', LL : 'D MMMM YYYY р.', - LLL : 'D MMMM YYYY р., LT', - LLLL : 'dddd, D MMMM YYYY р., LT' + LLL : 'D MMMM YYYY р., HH:mm', + LLLL : 'dddd, D MMMM YYYY р., HH:mm' }, calendar : { sameDay: processHoursFunction('[Сьогодні '), diff --git a/www/lib/moment/src/locale/uz.js b/www/lib/moment/src/locale/uz.js index 3732bfd8..646b5e61 100644 --- a/www/lib/moment/src/locale/uz.js +++ b/www/lib/moment/src/locale/uz.js @@ -12,11 +12,11 @@ export default moment.defineLocale('uz', { weekdaysMin : 'Як_Ду_Се_Чо_Па_Жу_Ша'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY LT', - LLLL : 'D MMMM YYYY, dddd LT' + LLL : 'D MMMM YYYY HH:mm', + LLLL : 'D MMMM YYYY, dddd HH:mm' }, calendar : { sameDay : '[Бугун соат] LT [да]', diff --git a/www/lib/moment/src/locale/vi.js b/www/lib/moment/src/locale/vi.js index 18ca9f3e..0fafda76 100644 --- a/www/lib/moment/src/locale/vi.js +++ b/www/lib/moment/src/locale/vi.js @@ -12,15 +12,15 @@ export default moment.defineLocale('vi', { weekdaysMin : 'CN_T2_T3_T4_T5_T6_T7'.split('_'), longDateFormat : { LT : 'HH:mm', - LTS : 'LT:ss', + LTS : 'HH:mm:ss', L : 'DD/MM/YYYY', LL : 'D MMMM [năm] YYYY', - LLL : 'D MMMM [năm] YYYY LT', - LLLL : 'dddd, D MMMM [năm] YYYY LT', + LLL : 'D MMMM [năm] YYYY HH:mm', + LLLL : 'dddd, D MMMM [năm] YYYY HH:mm', l : 'DD/M/YYYY', ll : 'D MMM YYYY', - lll : 'D MMM YYYY LT', - llll : 'ddd, D MMM YYYY LT' + lll : 'D MMM YYYY HH:mm', + llll : 'ddd, D MMM YYYY HH:mm' }, calendar : { sameDay: '[Hôm nay lúc] LT', diff --git a/www/lib/moment/src/locale/zh-cn.js b/www/lib/moment/src/locale/zh-cn.js index dfc0d049..790ea8bc 100644 --- a/www/lib/moment/src/locale/zh-cn.js +++ b/www/lib/moment/src/locale/zh-cn.js @@ -16,12 +16,12 @@ export default moment.defineLocale('zh-cn', { LTS : 'Ah点m分s秒', L : 'YYYY-MM-DD', LL : 'YYYY年MMMD日', - LLL : 'YYYY年MMMD日LT', - LLLL : 'YYYY年MMMD日ddddLT', + LLL : 'YYYY年MMMD日Ah点mm分', + LLLL : 'YYYY年MMMD日ddddAh点mm分', l : 'YYYY-MM-DD', ll : 'YYYY年MMMD日', - lll : 'YYYY年MMMD日LT', - llll : 'YYYY年MMMD日ddddLT' + lll : 'YYYY年MMMD日Ah点mm分', + llll : 'YYYY年MMMD日ddddAh点mm分' }, meridiemParse: /凌晨|早上|上午|中午|下午|晚上/, meridiemHour: function (hour, meridiem) { diff --git a/www/lib/moment/src/locale/zh-tw.js b/www/lib/moment/src/locale/zh-tw.js index 918700ae..4ff48f84 100644 --- a/www/lib/moment/src/locale/zh-tw.js +++ b/www/lib/moment/src/locale/zh-tw.js @@ -15,12 +15,12 @@ export default moment.defineLocale('zh-tw', { LTS : 'Ah點m分s秒', L : 'YYYY年MMMD日', LL : 'YYYY年MMMD日', - LLL : 'YYYY年MMMD日LT', - LLLL : 'YYYY年MMMD日ddddLT', + LLL : 'YYYY年MMMD日Ah點mm分', + LLLL : 'YYYY年MMMD日ddddAh點mm分', l : 'YYYY年MMMD日', ll : 'YYYY年MMMD日', - lll : 'YYYY年MMMD日LT', - llll : 'YYYY年MMMD日ddddLT' + lll : 'YYYY年MMMD日Ah點mm分', + llll : 'YYYY年MMMD日ddddAh點mm分' }, meridiemParse: /早上|上午|中午|下午|晚上/, meridiemHour : function (hour, meridiem) { diff --git a/www/lib/moment/src/moment.js b/www/lib/moment/src/moment.js index 4407eb97..15fe0e6a 100644 --- a/www/lib/moment/src/moment.js +++ b/www/lib/moment/src/moment.js @@ -1,12 +1,12 @@ //! moment.js -//! version : 2.10.3 +//! version : 2.10.6 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors //! license : MIT //! momentjs.com import { hooks as moment, setHookCallback } from './lib/utils/hooks'; -moment.version = '2.10.3'; +moment.version = '2.10.6'; import { min, -- cgit v1.2.3