www

commit 8a759dcae360100d7ab8851a73c5e46191792fe9
parent aa783878dee10ebb9f0649593ac52354d51947c7
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue, 17 Jan 2017 01:33:17 -0500

Merge pull request #1156 from gracile-fr/master

Amend short form of French months (continuing #64)
Diffstat:
M
resource/schema/dateFormats.json
 | 
6
+++---
M
test/tests/dateTest.js
 | 
2
+-

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/resource/schema/dateFormats.json b/resource/schema/dateFormats.json
@@ -306,13 +306,13 @@
 			"mar",
 			"avr",
 			"mai",
-			"jun",
-			"jul",
+			"juin",
+			"juil",
 			"aoû",
 			"sep",
 			"oct",
 			"nov",
-			"dec"
+			"déc"
 		],
 		"long": [
 			"janvier",
diff --git a/test/tests/dateTest.js b/test/tests/dateTest.js
@@ -9,7 +9,7 @@ describe("Zotero.Date", function() {
 			"October", "November", "December"
 		];
 		var frenchShort = [
-			"jan", "fév", "mar", "avr", "mai", "jun", "jul", "aoû", "sep", "oct", "nov", "dec"
+			"jan", "fév", "mar", "avr", "mai", "juin", "juil", "aoû", "sep", "oct", "nov", "déc"
 		];
 		var frenchLong = [
 			"janvier", "février", "mars", "avril", "mai", "juin", "juillet", "août", "septembre",