[locale] improve mk translation (#4958)

* Update mk.js

* Update mk.js

* Update mk.js

* Update mk.js

* [locale] improve mk translation

diff --git a/src/locale/mk.js b/src/locale/mk.js
index 701ab6554a6ac10aa3b72e76d9e12fe71497d4c3..afd728a6e1f9e017027696ee9659325d99f67c14 100644 (file)
--- a/src/locale/mk.js
+++ b/src/locale/mk.js
@@ -1,7 +1,7 @@
 //! moment.js locale configuration
 //! locale : Macedonian [mk]
 //! author : Borislav Mickov : https://github.com/B0k0
-
+//! author : Sashko Todorov : https://github.com/bkyceh
 import moment from '../moment';
 
 export default moment.defineLocale('mk', {
@@ -39,19 +39,19 @@ export default moment.defineLocale('mk', {
         sameElse : 'L'
     },
     relativeTime : {
-        future : 'поÑ\81ле %s',
+        future : 'за %s',
         past : 'пред %s',
         s : 'неколку секунди',
         ss : '%d секунди',
-        m : 'минута',
+        m : 'една минÑ\83Ñ\82а',
         mm : '%d минути',
-        h : 'час',
+        h : 'еден час',
         hh : '%d часа',
-        d : 'ден',
+        d : 'еден ден',
         dd : '%d дена',
-        M : 'месец',
+        M : 'еден меÑ\81еÑ\86',
         MM : '%d месеци',
-        y : 'година',
+        y : 'една година',
         yy : '%d години'
     },
     dayOfMonthOrdinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,

diff --git a/src/test/locale/mk.js b/src/test/locale/mk.js
index f56b053d69725bedc4b3d234600ba3b6ddf0e3e6..e3add2cd2a9663ba636d086faaa09242c6899080 100644 (file)
--- a/src/test/locale/mk.js
+++ b/src/test/locale/mk.js
@@ -108,37 +108,37 @@ test('format week', function (assert) {
 test('from', function (assert) {
     var start = moment([2007, 1, 28]);
     assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'неколку секунди', '44 seconds = a few seconds');
-    assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'минÑ\83Ñ\82а',          '45 seconds = a minute');
-    assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'минÑ\83Ñ\82а',          '89 seconds = a minute');
+    assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'една минÑ\83Ñ\82а',     '45 seconds = a minute');
+    assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'една минÑ\83Ñ\82а',     '89 seconds = a minute');
     assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 минути',        '90 seconds = 2 minutes');
     assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 минути',       '44 minutes = 44 minutes');
-    assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'час',             '45 minutes = an hour');
-    assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'час',             '89 minutes = an hour');
+    assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'еден час',        '45 minutes = an hour');
+    assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'еден час',        '89 minutes = an hour');
     assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 часа',          '90 minutes = 2 hours');
     assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 часа',          '5 hours = 5 hours');
     assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 часа',         '21 hours = 21 hours');
-    assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'ден',             '22 hours = a day');
-    assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'ден',             '35 hours = a day');
+    assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'еден ден',        '22 hours = a day');
+    assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'еден ден',        '35 hours = a day');
     assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 дена',          '36 hours = 2 days');
-    assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'ден',             '1 day = a day');
+    assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'еден ден',        '1 day = a day');
     assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 дена',          '5 days = 5 days');
     assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 дена',         '25 days = 25 days');
-    assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'меÑ\81еÑ\86',           '26 days = a month');
-    assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'меÑ\81еÑ\86',           '30 days = a month');
-    assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'меÑ\81еÑ\86',           '43 days = a month');
+    assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'еден меÑ\81еÑ\86',      '26 days = a month');
+    assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'еден меÑ\81еÑ\86',      '30 days = a month');
+    assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'еден меÑ\81еÑ\86',      '43 days = a month');
     assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 месеци',        '46 days = 2 months');
     assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 месеци',        '75 days = 2 months');
     assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 месеци',        '76 days = 3 months');
-    assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'меÑ\81еÑ\86',           '1 month = a month');
+    assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'еден меÑ\81еÑ\86',      '1 month = a month');
     assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 месеци',        '5 months = 5 months');
-    assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'година',          '345 days = a year');
+    assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'една година',     '345 days = a year');
     assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 години',        '548 days = 2 years');
-    assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'година',          '1 year = a year');
+    assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'една година',     '1 year = a year');
     assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 години',        '5 years = 5 years');
 });
 
 test('suffix', function (assert) {
-    assert.equal(moment(30000).from(0), 'поÑ\81ле неколку секунди', 'prefix');
+    assert.equal(moment(30000).from(0), 'за неколку секунди', 'prefix');
     assert.equal(moment(0).from(30000), 'пред неколку секунди',  'suffix');
 });
 
@@ -147,8 +147,8 @@ test('now from now', function (assert) {
 });
 
 test('fromNow', function (assert) {
-    assert.equal(moment().add({s: 30}).fromNow(), 'поÑ\81ле неколку секунди', 'in a few seconds');
-    assert.equal(moment().add({d: 5}).fromNow(),  'поÑ\81ле 5 дена', 'in 5 days');
+    assert.equal(moment().add({s: 30}).fromNow(), 'за неколку секунди', 'in a few seconds');
+    assert.equal(moment().add({d: 5}).fromNow(),  'за 5 дена', 'in 5 days');
 });
 
 test('calendar day', function (assert) {