Revert "Changed translation and test case"

This reverts commit 5cf6ed9e05dd1476cb2247c2c6fb7ab843bb428b.

diff --git a/src/locale/mr.js b/src/locale/mr.js
index 5029f1adefb038eb82e7f45f7afe262dfeaed5d2..7a2b8e09923971ea165b4c8ba2ad27c5f1ab73d3 100644 (file)
--- a/src/locale/mr.js
+++ b/src/locale/mr.js
@@ -1,7 +1,6 @@
 //! moment.js locale configuration
 //! locale : Marathi (mr)
 //! author : Harshad Kale : https://github.com/kalehv
-//! author : Vivek Athalye : https://github.com/vnathalye
 
 import moment from '../moment';
 
@@ -30,42 +29,6 @@ numberMap = {
     '०': '0'
 };
 
-function relativeTimeMr(number, withoutSuffix, string, isFuture)
-{
-    var output = "";
-    if (withoutSuffix) {
-        switch(string) {
-            case "s": output = 'काही सेकंद'; break;
-            case "m": output = 'एक मिनिट'; break;
-            case "mm": output = '%d मिनिटे'; break;
-            case "h": output = 'एक तास'; break;
-            case "hh": output = '%d तास'; break;
-            case "d": output = 'एक दिवस'; break;
-            case "dd": output = '%d दिवस'; break;
-            case "M": output = 'एक महिना'; break;
-            case "MM": output = '%d महिने'; break;
-            case "y": output = 'एक वर्ष'; break;
-            case "yy": output = '%d वर्षे'; break;
-        }
-    }
-    else {
-        switch (string) {
-            case "s": output = 'काही सेकंदां'; break;
-            case "m": output = 'एका मिनिटा'; break;
-            case "mm": output = '%d मिनिटां'; break;
-            case "h": output = 'एका तासा'; break;
-            case "hh": output = '%d तासां'; break;
-            case "d": output = 'एका दिवसा'; break;
-            case "dd": output = '%d दिवसां'; break;
-            case "M": output = 'एका महिन्या'; break;
-            case "MM": output = '%d महिन्यां'; break;
-            case "y": output = 'एका वर्षा'; break;
-            case "yy": output = '%d वर्षां'; break;
-        }
-    }
-    return output.replace(/%d/i, number);
-}
-
 export default moment.defineLocale('mr', {
     months : 'जानेवारी_फेब्रुवारी_मार्च_एप्रिल_मे_जून_जुलै_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर'.split('_'),
     monthsShort: 'जाने._फेब्रु._मार्च._एप्रि._मे._जून._जुलै._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.'.split('_'),
@@ -89,19 +52,19 @@ export default moment.defineLocale('mr', {
         sameElse : 'L'
     },
     relativeTime : {
-        future: '%sमध्ये',
-        past: '%sपूर्वी',
-        s: relativeTimeMr,
-        m: relativeTimeMr,
-        mm: relativeTimeMr,
-        h: relativeTimeMr,
-        hh: relativeTimeMr,
-        d: relativeTimeMr,
-        dd: relativeTimeMr,
-        M: relativeTimeMr,
-        MM: relativeTimeMr,
-        y: relativeTimeMr,
-        yy: relativeTimeMr
+        future : '%s नंतर',
+        past : '%s पूर्वी',
+        s : 'सेकंद',
+        m: 'एक मिनिट',
+        mm: '%d मिनिटे',
+        h : 'एक तास',
+        hh : '%d तास',
+        d : 'एक दिवस',
+        dd : '%d दिवस',
+        M : 'एक महिना',
+        MM : '%d महिने',
+        y : 'एक वर्ष',
+        yy : '%d वर्षे'
     },
     preparse: function (string) {
         return string.replace(/[१२३४५६७८९०]/g, function (match) {

diff --git a/src/test/locale/mr.js b/src/test/locale/mr.js
index 4a7186be8855b892653ff2d4c21c4c9c5a1d7a4a..d2a378c3c730d8f5cfc708c761498a30e7a5cbd0 100644 (file)
--- a/src/test/locale/mr.js
+++ b/src/test/locale/mr.js
@@ -105,7 +105,7 @@ 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),  'à¤\95ाहà¥\80 सà¥\87à¤\95à¤\82द', '44 seconds = a few seconds');
+    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),  'एक मिनिट',      '45 seconds = a minute');
     assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'एक मिनिट',      '89 seconds = a minute');
     assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '२ मिनिटे',     '90 seconds = 2 minutes');
@@ -136,17 +136,17 @@ test('from', function (assert) {
 });
 
 test('suffix', function (assert) {
-    assert.equal(moment(30000).from(0), 'à¤\95ाहà¥\80 सà¥\87à¤\95à¤\82दाà¤\82मधà¥\8dयà¥\87', 'prefix');
-    assert.equal(moment(0).from(30000), 'à¤\95ाहà¥\80 सà¥\87à¤\95à¤\82दाà¤\82पूर्वी', 'suffix');
+    assert.equal(moment(30000).from(0), 'सà¥\87à¤\95à¤\82द नà¤\82तर', 'prefix');
+    assert.equal(moment(0).from(30000), 'सà¥\87à¤\95à¤\82द पूर्वी', 'suffix');
 });
 
 test('now from now', function (assert) {
-    assert.equal(moment().fromNow(), 'à¤\95ाहà¥\80 सà¥\87à¤\95à¤\82दाà¤\82पूर्वी',  'now from now should display as in the past');
+    assert.equal(moment().fromNow(), 'सà¥\87à¤\95à¤\82द पूर्वी',  'now from now should display as in the past');
 });
 
 test('fromNow', function (assert) {
-    assert.equal(moment().add({s: 30}).fromNow(), 'à¤\95ाहà¥\80 सà¥\87à¤\95à¤\82दाà¤\82मधà¥\8dयà¥\87', 'in a few seconds');
-    assert.equal(moment().add({d: 5}).fromNow(), '५ दिवसांमध्ये', 'in 5 days');
+    assert.equal(moment().add({s: 30}).fromNow(), 'सà¥\87à¤\95à¤\82द नà¤\82तर', 'सà¥\87à¤\95à¤\82द नà¤\82तर');
+    assert.equal(moment().add({d: 5}).fromNow(), '५ दिवस नंतर', '५ दिवस नंतर');
 });
 
 test('calendar day', function (assert) {