diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-09-17 12:32:47 -0400 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-09-17 12:32:47 -0400 |
| commit | 7c385a7877aa4b0163dda6206f656846db2cf039 (patch) | |
| tree | 0dd09ef3261f0eca43cda22d27ab3a431ad1cd2f /www/lib/moment/src/locale/fr-ca.js | |
| parent | a0b74399c4f1a7754029e1fd7f4be3b20836404a (diff) | |
iOS9 fixes (which includes ionic updates to 1.1.0)
Diffstat (limited to 'www/lib/moment/src/locale/fr-ca.js')
| -rw-r--r-- | www/lib/moment/src/locale/fr-ca.js | 10 |
1 files changed, 5 insertions, 5 deletions
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'); } }); |
