From: Tim Wood <washwithcare@gmail.com>
Date: Fri, 8 Feb 2013 17:21:48 +0000 (-0800)
Subject: fixing #612 #523 #516
X-Git-Tag: 2.0.0~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81f9ef81e6615b2e7797761cf3cc73c5c7b5da38;p=thirdparty%2Fmoment.git

fixing #612 #523 #516
---

diff --git a/lang/fr-ca.js b/lang/fr-ca.js
index 7a7afa63b..d3dc524e8 100644
--- a/lang/fr-ca.js
+++ b/lang/fr-ca.js
@@ -35,8 +35,8 @@ require('../moment').lang('fr-ca', {
         dd : "%d jours",
         M : "un mois",
         MM : "%d mois",
-        y : "une année",
-        yy : "%d années"
+        y : "une an",
+        yy : "%d ans"
     },
     ordinal : function (number) {
         return number + (number === 1 ? 'er' : 'ème');
diff --git a/lang/fr.js b/lang/fr.js
index 19264f141..f0b569d33 100644
--- a/lang/fr.js
+++ b/lang/fr.js
@@ -35,8 +35,8 @@ require('../moment').lang('fr', {
         dd : "%d jours",
         M : "un mois",
         MM : "%d mois",
-        y : "une année",
-        yy : "%d années"
+        y : "une an",
+        yy : "%d ans"
     },
     ordinal : function (number) {
         return number + (number === 1 ? 'er' : 'ème');
diff --git a/test/lang/fr-ca.js b/test/lang/fr-ca.js
index 28edfaa28..477aa3983 100644
--- a/test/lang/fr-ca.js
+++ b/test/lang/fr-ca.js
@@ -174,11 +174,11 @@ exports["lang:fr-ca"] = {
         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 année",     "345 days = a year");
-        test.equal(start.from(moment([2007, 1, 28]).add({d:547}), true), "une année",     "547 days = a year");
-        test.equal(start.from(moment([2007, 1, 28]).add({d:548}), true), "2 années",    "548 days = 2 years");
-        test.equal(start.from(moment([2007, 1, 28]).add({y:1}), true),   "une année",     "1 year = a year");
-        test.equal(start.from(moment([2007, 1, 28]).add({y:5}), true),   "5 années",    "5 years = 5 years");
+        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: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:5}), true),   "5 ans",    "5 years = 5 years");
 
         test.done();
     },
diff --git a/test/lang/fr.js b/test/lang/fr.js
index 9a9a5ef98..a8987c4d2 100644
--- a/test/lang/fr.js
+++ b/test/lang/fr.js
@@ -164,11 +164,11 @@ 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 année",     "345 days = a year");
-        test.equal(start.from(moment([2007, 1, 28]).add({d:547}), true), "une année",     "547 days = a year");
-        test.equal(start.from(moment([2007, 1, 28]).add({d:548}), true), "2 années",    "548 days = 2 years");
-        test.equal(start.from(moment([2007, 1, 28]).add({y:1}), true),   "une année",     "1 year = a year");
-        test.equal(start.from(moment([2007, 1, 28]).add({y:5}), true),   "5 années",    "5 years = 5 years");
+        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: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:5}), true),   "5 ans",    "5 years = 5 years");
         test.done();
     },