dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "More debug diagnostics for upload by URL"
[lhc/web/wiklou.git]
/
resources
/
lib
/
moment
/
locale
/
en-gb.js
diff --git
a/resources/lib/moment/locale/en-gb.js
b/resources/lib/moment/locale/en-gb.js
index
4491d4a
..
4ea2b29
100644
(file)
--- a/
resources/lib/moment/locale/en-gb.js
+++ b/
resources/lib/moment/locale/en-gb.js
@@
-8,7
+8,7
@@
} else if (typeof exports === 'object') {
module.exports = factory(require('../moment')); // Node
} else {
} else if (typeof exports === 'object') {
module.exports = factory(require('../moment')); // Node
} else {
- factory(
window.moment); // Brows
er global
+ factory(
(typeof global !== 'undefined' ? global : this).moment); // node or oth
er global
}
}(function (moment) {
return moment.defineLocale('en-gb', {
}
}(function (moment) {
return moment.defineLocale('en-gb', {
@@
-19,6
+19,7
@@
weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
longDateFormat : {
LT : 'HH:mm',
weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
longDateFormat : {
LT : 'HH:mm',
+ LTS : 'HH:mm:ss',
L : 'DD/MM/YYYY',
LL : 'D MMMM YYYY',
LLL : 'D MMMM YYYY LT',
L : 'DD/MM/YYYY',
LL : 'D MMMM YYYY',
LLL : 'D MMMM YYYY LT',
@@
-47,6
+48,7
@@
y : 'a year',
yy : '%d years'
},
y : 'a year',
yy : '%d years'
},
+ ordinalParse: /\d{1,2}(st|nd|rd|th)/,
ordinal : function (number) {
var b = number % 10,
output = (~~(number % 100 / 10) === 1) ? 'th' :
ordinal : function (number) {
var b = number % 10,
output = (~~(number % 100 / 10) === 1) ? 'th' :