fixing #612 #523 #516

diff --git a/lang/fr-ca.js b/lang/fr-ca.js
index 7a7afa63b739e299351cd06b475faea8e6a0ca0d..d3dc524e83c5a75053fcc116c461beb2a62e15e4 100644 (file)
--- 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 19264f14170fe08151fe959258a034399389107f..f0b569d3340ef656c32ee7563eeda7d6d727a92e 100644 (file)
--- 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 28edfaa28a6037064dfc6eb19ce853ecbc7f372d..477aa3983e78586d302a3ae450e1927d38c711dc 100644 (file)
--- 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 9a9a5ef9823170c61edad9f503ed1355ef52d15b..a8987c4d26806bd8ec327b01a67e3964f843c961 100644 (file)
--- 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();
     },