diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /resources/lib/moment/locale/en-gb.js | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'resources/lib/moment/locale/en-gb.js')
| -rw-r--r-- | resources/lib/moment/locale/en-gb.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/resources/lib/moment/locale/en-gb.js b/resources/lib/moment/locale/en-gb.js index 4491d4a1..4ea2b29e 100644 --- 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 { - factory(window.moment); // Browser global + factory((typeof global !== 'undefined' ? global : this).moment); // node or other global } }(function (moment) { return moment.defineLocale('en-gb', { @@ -19,6 +19,7 @@ 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', @@ -47,6 +48,7 @@ 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' : |