From: Francis Besset <francis.besset@gmail.com>
Date: Fri, 8 Feb 2013 17:36:06 +0000 (+0100)
Subject: [Lang fr] Fixed typo
X-Git-Tag: 2.0.0~4^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F614%2Fhead;p=thirdparty%2Fmoment.git

[Lang fr] Fixed typo
---

diff --git a/lang/fr.js b/lang/fr.js
index f0b569d33..1db25b586 100644
--- a/lang/fr.js
+++ b/lang/fr.js
@@ -35,7 +35,7 @@ require('../moment').lang('fr', {
         dd : "%d jours",
         M : "un mois",
         MM : "%d mois",
-        y : "une an",
+        y : "un an",
         yy : "%d ans"
     },
     ordinal : function (number) {
diff --git a/test/lang/fr.js b/test/lang/fr.js
index a8987c4d2..2951b2df9 100644
--- a/test/lang/fr.js
+++ b/test/lang/fr.js
@@ -164,10 +164,10 @@ exports["lang:fr"] = {
         test.equal(start.from(moment([2007, 1, 28]).add({M:1}), true),   "un mois",    "1 month = a month");
         test.equal(start.from(moment([2007, 1, 28]).add({M:5}), true),   "5 mois",   "5 months = 5 months");
         test.equal(start.from(moment([2007, 1, 28]).add({d:344}), true), "11 mois",  "344 days = 11 months");
-        test.equal(start.from(moment([2007, 1, 28]).add({d:345}), true), "une an",     "345 days = a year");
-        test.equal(start.from(moment([2007, 1, 28]).add({d:547}), true), "une an",     "547 days = a year");
+        test.equal(start.from(moment([2007, 1, 28]).add({d:345}), true), "un an",     "345 days = a year");
+        test.equal(start.from(moment([2007, 1, 28]).add({d:547}), true), "un an",     "547 days = a year");
         test.equal(start.from(moment([2007, 1, 28]).add({d:548}), true), "2 ans",    "548 days = 2 years");
-        test.equal(start.from(moment([2007, 1, 28]).add({y:1}), true),   "une an",     "1 year = a year");
+        test.equal(start.from(moment([2007, 1, 28]).add({y:1}), true),   "un an",     "1 year = a year");
         test.equal(start.from(moment([2007, 1, 28]).add({y:5}), true),   "5 ans",    "5 years = 5 years");
         test.done();
     },