[locale] fi: fix ss not returning the number of seconds (#5595)

diff --git a/src/locale/fi.js b/src/locale/fi.js
index 68f14e4d02b213d2aeac80dbc2678e75f358c157..b40e3d3197a847a36b70bb4524363eee842d8199 100644 (file)
--- a/src/locale/fi.js
+++ b/src/locale/fi.js
@@ -25,7 +25,8 @@ function translate(number, withoutSuffix, key, isFuture) {
         case 's':
             return isFuture ? 'muutaman sekunnin' : 'muutama sekunti';
         case 'ss':
-            return isFuture ? 'sekunnin' : 'sekuntia';
+            result = isFuture ? 'sekunnin' : 'sekuntia';
+            break;
         case 'm':
             return isFuture ? 'minuutin' : 'minuutti';
         case 'mm':

diff --git a/src/test/locale/fi.js b/src/test/locale/fi.js
index 9853924142548e78d2414032b394697e07195beb..b4341257c304c3500f26e408719c1fb016eb9a5a 100644 (file)
--- a/src/test/locale/fi.js
+++ b/src/test/locale/fi.js
@@ -289,6 +289,37 @@ test('from', function (assert) {
     );
 });
 
+test('from ss threshold set', function (assert) {
+    var start = moment([2007, 1, 28]),
+        s = moment.relativeTimeThreshold('s'),
+        ss = moment.relativeTimeThreshold('ss');
+    moment.relativeTimeThreshold('s', 45);
+    moment.relativeTimeThreshold('ss', 10);
+
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({ s: 10 }), true),
+        'muutama sekunti',
+        '10 seconds = few seconds'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({ s: 11 }), true),
+        '11 sekuntia',
+        '11 seconds = 11 seconds'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({ s: 44 }), true),
+        '44 sekuntia',
+        '44 seconds = 44 seconds'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({ s: 45 }), true),
+        'minuutti',
+        '45 seconds = a minute'
+    );
+    moment.relativeTimeThreshold('s', s);
+    moment.relativeTimeThreshold('ss', ss);
+});
+
 test('suffix', function (assert) {
     assert.equal(moment(30000).from(0), 'muutaman sekunnin päästä', 'prefix');
     assert.equal(moment(0).from(30000), 'muutama sekunti sitten', 'suffix');