aboutsummaryrefslogtreecommitdiffstats
path: root/bower_components/moment/src/locale/fr.js
diff options
context:
space:
mode:
authorLibravatarAgustin Henze <tin@sluc.org.ar>2015-08-26 07:57:23 -0300
committerLibravatarAgustin Henze <tin@sluc.org.ar>2015-08-26 07:57:23 -0300
commit70ceb871117ca811d63cb02671dc0fefc2700883 (patch)
tree846133ea39797d2cd1101cff2ac0818167353490 /bower_components/moment/src/locale/fr.js
parent8559119e2f45b7f6508282962c0430423bfab051 (diff)
parent787b97a4cb24330b36f11297c6d3a7a473a907d0 (diff)
Merge tag 'upstream/7.6.4'
Upstream version 7.6.4
Diffstat (limited to 'bower_components/moment/src/locale/fr.js')
-rw-r--r--bower_components/moment/src/locale/fr.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/bower_components/moment/src/locale/fr.js b/bower_components/moment/src/locale/fr.js
index 7492f85..deb2f63 100644
--- a/bower_components/moment/src/locale/fr.js
+++ b/bower_components/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',