Fix issue for bs locale

diff --git a/src/locale/bs.js b/src/locale/bs.js
index 89865a33586b972234936a973099687dcad9f700..1b26f8a08d9f81f9ba3d2ca5aff6b7be3ca149c4 100644 (file)
--- a/src/locale/bs.js
+++ b/src/locale/bs.js
@@ -6,6 +6,17 @@
 
 import moment from '../moment';
 
+function processRelativeTime(number, withoutSuffix, key, isFuture) {
+    switch (key) {
+        case 'm':
+            return withoutSuffix
+                ? 'jedna minuta'
+                : isFuture
+                ? 'jednu minutu'
+                : 'jedne minute';
+    }
+}
+
 function translate(number, withoutSuffix, key) {
     var result = number + ' ';
     switch (key) {
@@ -18,8 +29,6 @@ function translate(number, withoutSuffix, key) {
                 result += 'sekundi';
             }
             return result;
-        case 'm':
-            return withoutSuffix ? 'jedna minuta' : 'jedne minute';
         case 'mm':
             if (number === 1) {
                 result += 'minuta';
@@ -30,7 +39,7 @@ function translate(number, withoutSuffix, key) {
             }
             return result;
         case 'h':
-            return withoutSuffix ? 'jedan sat' : 'jednog sata';
+            return withoutSuffix ? 'jedan sat' : 'jedan sat';
         case 'hh':
             if (number === 1) {
                 result += 'sat';
@@ -131,7 +140,7 @@ export default moment.defineLocale('bs', {
         past: 'prije %s',
         s: 'par sekundi',
         ss: translate,
-        m: translate,
+        m: processRelativeTime,
         mm: translate,
         h: translate,
         hh: translate,

diff --git a/src/test/locale/bs.js b/src/test/locale/bs.js
index 1e29d8619d4970cafe9b61496bb4ceef003be749..5049b7092b6322a509059ab4a439e68fe994bdeb 100644 (file)
--- a/src/test/locale/bs.js
+++ b/src/test/locale/bs.js
@@ -303,6 +303,11 @@ test('now from now', function (assert) {
         'prije par sekundi',
         'now from now should display as in the past'
     );
+    assert.equal(
+        moment().subtract({ h: 1 }).fromNow(),
+        'prije jedan sat',
+        '1 hour ago'
+    );
 });
 
 test('fromNow', function (assert) {
@@ -311,6 +316,12 @@ test('fromNow', function (assert) {
         'za par sekundi',
         'in a few seconds'
     );
+    assert.equal(
+        moment().add({ m: 1 }).fromNow(),
+        'za jednu minutu',
+        'in 1 minute'
+    );
+    assert.equal(moment().add({ h: 1 }).fromNow(), 'za jedan sat', 'in 1 hour');
     assert.equal(moment().add({ d: 5 }).fromNow(), 'za 5 dana', 'in 5 days');
 });