From: Kruy Vanna <kruyvanna@gmail.com>
Date: Sun, 4 Mar 2018 07:28:29 +0000 (+0700)
Subject: [locale] Cambodian Locale: Translate AM/PM, change weekdaysShort and weekdaysMin... 
X-Git-Tag: 2.22.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35b17e382df6aeb12131e272ab2f3e0cd09c134c;p=thirdparty%2Fmoment.git

[locale] Cambodian Locale: Translate AM/PM, change weekdaysShort and weekdaysMin (#4392)

* translated am/pm

* change weekdaysShort, and weekdaysMin

* fix missing semi colons

* fix more missing semi colons

* fix missing spaces

* add Khmer script number and use ordinal

* fix trailing white space
---

diff --git a/src/locale/km.js b/src/locale/km.js
index e5e0a8f3d..b364ffeb1 100644
--- a/src/locale/km.js
+++ b/src/locale/km.js
@@ -4,20 +4,60 @@
 
 import moment from '../moment';
 
+var symbolMap = {
+    '1': 'á¡',
+    '2': 'á¢',
+    '3': 'á£',
+    '4': 'á¤',
+    '5': 'á¥',
+    '6': 'á¦',
+    '7': 'á§',
+    '8': 'á¨',
+    '9': 'á©',
+    '0': 'á '
+}, numberMap = {
+    'á¡': '1',
+    'á¢': '2',
+    'á£': '3',
+    'á¤': '4',
+    'á¥': '5',
+    'á¦': '6',
+    'á§': '7',
+    'á¨': '8',
+    'á©': '9',
+    'á ': '0'
+};
+
 export default moment.defineLocale('km', {
-    months: 'áááá¶_áá»áááá_áá¸áá¶_áááá¶_á§ááá¶_áá·áá»áá¶_áááááá¶_áá¸á á¶_ááááá¶_áá»áá¶_áá·áááá·áá¶_áááá¼'.split('_'),
-    monthsShort: 'áááá¶_áá»áááá_áá¸áá¶_áááá¶_á§ááá¶_áá·áá»áá¶_áááááá¶_áá¸á á¶_ááááá¶_áá»áá¶_áá·áááá·áá¶_áááá¼'.split('_'),
+    months: 'áááá¶_áá»áááá_áá¸áá¶_áááá¶_á§ááá¶_áá·áá»áá¶_áááááá¶_áá¸á á¶_ááááá¶_áá»áá¶_áá·áááá·áá¶_áááá¼'.split(
+        '_'
+    ),
+    monthsShort: 'áááá¶_áá»áááá_áá¸áá¶_áááá¶_á§ááá¶_áá·áá»áá¶_áááááá¶_áá¸á á¶_ááááá¶_áá»áá¶_áá·áááá·áá¶_áááá¼'.split(
+        '_'
+    ),
     weekdays: 'á¢á¶áá·ááá_ááááá_á¢áááá¶á_áá»á_áááá ááááá·á_áá»ááá_áááá'.split('_'),
-    weekdaysShort: 'á¢á¶áá·ááá_ááááá_á¢áááá¶á_áá»á_áááá ááááá·á_áá»ááá_áááá'.split('_'),
-    weekdaysMin: 'á¢á¶áá·ááá_ááááá_á¢áááá¶á_áá»á_áááá ááááá·á_áá»ááá_áááá'.split('_'),
+    weekdaysShort: 'á¢á¶_á_á¢_á_ááá_áá»_á'.split('_'),
+    weekdaysMin: 'á¢á¶_á_á¢_á_ááá_áá»_á'.split('_'),
+    weekdaysParseExact: true,
     longDateFormat: {
         LT: 'HH:mm',
-        LTS : 'HH:mm:ss',
+        LTS: 'HH:mm:ss',
         L: 'DD/MM/YYYY',
         LL: 'D MMMM YYYY',
         LLL: 'D MMMM YYYY HH:mm',
         LLLL: 'dddd, D MMMM YYYY HH:mm'
     },
+    meridiemParse: /áááá¹á|áááá¶á/,
+    isPM: function (input) {
+        return input === 'áááá¶á';
+    },
+    meridiem: function (hour, minute, isLower) {
+        if (hour < 12) {
+            return 'áááá¹á';
+        } else {
+            return 'áááá¶á';
+        }
+    },
     calendar: {
         sameDay: '[ááááááá áááá] LT',
         nextDay: '[ááá¢áá áááá] LT',
@@ -42,9 +82,20 @@ export default moment.defineLocale('km', {
         y: 'áá½ááááá¶á',
         yy: '%d áááá¶á'
     },
+    dayOfMonthOrdinalParse : /áá¸\d{1,2}/,
+    ordinal : 'áá¸%d',
+    preparse: function (string) {
+        return string.replace(/[á¡á¢á£á¤á¥á¦á§á¨á©á ]/g, function (match) {
+            return numberMap[match];
+        });
+    },
+    postformat: function (string) {
+        return string.replace(/\d/g, function (match) {
+            return symbolMap[match];
+        });
+    },
     week: {
         dow: 1, // Monday is the first day of the week.
         doy: 4 // The week that contains Jan 4th is the first week of the year.
     }
 });
-
diff --git a/src/test/locale/km.js b/src/test/locale/km.js
index 556c68c4a..76f5e61e5 100644
--- a/src/test/locale/km.js
+++ b/src/test/locale/km.js
@@ -3,11 +3,17 @@ import moment from '../../moment';
 localeModule('km');
 
 test('parse', function (assert) {
-    var tests = 'áááá¶ áááá¶_áá»áááá áá»áááá_áá¸áá¶ áá¸áá¶_áááá¶ áááá¶_á§ááá¶ á§ááá¶_áá·áá»áá¶ áá·áá»áá¶_áááááá¶ áááááá¶_áá¸á á¶ áá¸á á¶_ááááá¶ ááááá¶_áá»áá¶ áá»áá¶_áá·áááá·áá¶ áá·áááá·áá¶_áááá¼ áááá¼'.split('_'),
+    var tests = 'áááá¶ áááá¶_áá»áááá áá»áááá_áá¸áá¶ áá¸áá¶_áááá¶ áááá¶_á§ááá¶ á§ááá¶_áá·áá»áá¶ áá·áá»áá¶_áááááá¶ áááááá¶_áá¸á á¶ áá¸á á¶_ááááá¶ ááááá¶_áá»áá¶ áá»áá¶_áá·áááá·áá¶ áá·áááá·áá¶_áááá¼ áááá¼'.split(
+            '_'
+        ),
         i;
 
     function equalTest(input, mmm, i) {
-        assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        assert.equal(
+            moment(input, mmm).month(),
+            i,
+            input + ' should be month ' + (i + 1)
+        );
     }
     for (i = 0; i < 12; i++) {
         tests[i] = tests[i].split(' ');
@@ -24,29 +30,32 @@ test('parse', function (assert) {
 
 test('format', function (assert) {
     var a = [
-            ['dddd, MMMM Do YYYY, h:mm:ss a', 'á¢á¶áá·ááá, áá»áááá 14 2010, 3:25:50 pm'],
-            ['ddd, hA', 'á¢á¶áá·ááá, 3PM'],
-            ['M Mo MM MMMM MMM', '2 2 02 áá»áááá áá»áááá'],
-            ['YYYY YY', '2010 10'],
-            ['D Do DD', '14 14 14'],
-            ['d do dddd ddd dd', '0 0 á¢á¶áá·ááá á¢á¶áá·ááá á¢á¶áá·ááá'],
-            ['DDD DDDo DDDD', '45 45 045'],
-            ['w wo ww', '6 6 06'],
-            ['h hh', '3 03'],
-            ['H HH', '15 15'],
-            ['m mm', '25 25'],
-            ['s ss', '50 50'],
-            ['a A', 'pm PM'],
-            ['[the] DDDo [day of the year]', 'the 45 day of the year'],
-            ['LTS', '15:25:50'],
-            ['L', '14/02/2010'],
-            ['LL', '14 áá»áááá 2010'],
-            ['LLL', '14 áá»áááá 2010 15:25'],
-            ['LLLL', 'á¢á¶áá·ááá, 14 áá»áááá 2010 15:25'],
-            ['l', '14/2/2010'],
-            ['ll', '14 áá»áááá 2010'],
-            ['lll', '14 áá»áááá 2010 15:25'],
-            ['llll', 'á¢á¶áá·ááá, 14 áá»áááá 2010 15:25']
+            [
+                'dddd, MMMM Do YYYY, h:mm:ss a',
+                'á¢á¶áá·ááá, áá»áááá áá¸á¡á¤ á¢á á¡á , á£:á¢á¥:á¥á  áááá¶á'
+            ],
+            ['ddd, hA', 'á¢á¶, á£áááá¶á'],
+            ['M Mo MM MMMM MMM', 'á¢ áá¸á¢ á á¢ áá»áááá áá»áááá'],
+            ['YYYY YY', 'á¢á á¡á  á¡á '],
+            ['D Do DD', 'á¡á¤ áá¸á¡á¤ á¡á¤'],
+            ['d do dddd ddd dd', 'á  áá¸á  á¢á¶áá·ááá á¢á¶ á¢á¶'],
+            ['DDD DDDo DDDD', 'á¤á¥ áá¸á¤á¥ á á¤á¥'],
+            ['w wo ww', 'á¦ áá¸á¦ á á¦'],
+            ['h hh', 'á£ á á£'],
+            ['H HH', 'á¡á¥ á¡á¥'],
+            ['m mm', 'á¢á¥ á¢á¥'],
+            ['s ss', 'á¥á  á¥á '],
+            ['a A', 'áááá¶á áááá¶á'],
+            ['[the] DDDo [day of the year]', 'the áá¸á¤á¥ day of the year'],
+            ['LTS', 'á¡á¥:á¢á¥:á¥á '],
+            ['L', 'á¡á¤/á á¢/á¢á á¡á '],
+            ['LL', 'á¡á¤ áá»áááá á¢á á¡á '],
+            ['LLL', 'á¡á¤ áá»áááá á¢á á¡á  á¡á¥:á¢á¥'],
+            ['LLLL', 'á¢á¶áá·ááá, á¡á¤ áá»áááá á¢á á¡á  á¡á¥:á¢á¥'],
+            ['l', 'á¡á¤/á¢/á¢á á¡á '],
+            ['ll', 'á¡á¤ áá»áááá á¢á á¡á '],
+            ['lll', 'á¡á¤ áá»áááá á¢á á¡á  á¡á¥:á¢á¥'],
+            ['llll', 'á¢á¶, á¡á¤ áá»áááá á¢á á¡á  á¡á¥:á¢á¥']
         ],
         b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
         i;
@@ -56,88 +65,212 @@ test('format', function (assert) {
 });
 
 test('format ordinal', function (assert) {
-    assert.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1st');
-    assert.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2nd');
-    assert.equal(moment([2011, 0, 3]).format('DDDo'), '3', '3rd');
-    assert.equal(moment([2011, 0, 4]).format('DDDo'), '4', '4th');
-    assert.equal(moment([2011, 0, 5]).format('DDDo'), '5', '5th');
-    assert.equal(moment([2011, 0, 6]).format('DDDo'), '6', '6th');
-    assert.equal(moment([2011, 0, 7]).format('DDDo'), '7', '7th');
-    assert.equal(moment([2011, 0, 8]).format('DDDo'), '8', '8th');
-    assert.equal(moment([2011, 0, 9]).format('DDDo'), '9', '9th');
-    assert.equal(moment([2011, 0, 10]).format('DDDo'), '10', '10th');
-
-    assert.equal(moment([2011, 0, 11]).format('DDDo'), '11', '11th');
-    assert.equal(moment([2011, 0, 12]).format('DDDo'), '12', '12th');
-    assert.equal(moment([2011, 0, 13]).format('DDDo'), '13', '13th');
-    assert.equal(moment([2011, 0, 14]).format('DDDo'), '14', '14th');
-    assert.equal(moment([2011, 0, 15]).format('DDDo'), '15', '15th');
-    assert.equal(moment([2011, 0, 16]).format('DDDo'), '16', '16th');
-    assert.equal(moment([2011, 0, 17]).format('DDDo'), '17', '17th');
-    assert.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18th');
-    assert.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19th');
-    assert.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20th');
-
-    assert.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21st');
-    assert.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22nd');
-    assert.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23rd');
-    assert.equal(moment([2011, 0, 24]).format('DDDo'), '24', '24th');
-    assert.equal(moment([2011, 0, 25]).format('DDDo'), '25', '25th');
-    assert.equal(moment([2011, 0, 26]).format('DDDo'), '26', '26th');
-    assert.equal(moment([2011, 0, 27]).format('DDDo'), '27', '27th');
-    assert.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28th');
-    assert.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29th');
-    assert.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30th');
-
-    assert.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31st');
+    assert.equal(moment([2011, 0, 1]).format('DDDo'), 'áá¸á¡', '1st');
+    assert.equal(moment([2011, 0, 2]).format('DDDo'), 'áá¸á¢', '2nd');
+    assert.equal(moment([2011, 0, 3]).format('DDDo'), 'áá¸á£', '3rd');
+    assert.equal(moment([2011, 0, 4]).format('DDDo'), 'áá¸á¤', '4th');
+    assert.equal(moment([2011, 0, 5]).format('DDDo'), 'áá¸á¥', '5th');
+    assert.equal(moment([2011, 0, 6]).format('DDDo'), 'áá¸á¦', '6th');
+    assert.equal(moment([2011, 0, 7]).format('DDDo'), 'áá¸á§', '7th');
+    assert.equal(moment([2011, 0, 8]).format('DDDo'), 'áá¸á¨', '8th');
+    assert.equal(moment([2011, 0, 9]).format('DDDo'), 'áá¸á©', '9th');
+    assert.equal(moment([2011, 0, 10]).format('DDDo'), 'áá¸á¡á ', '10th');
+
+    assert.equal(moment([2011, 0, 11]).format('DDDo'), 'áá¸á¡á¡', '11st');
+    assert.equal(moment([2011, 0, 12]).format('DDDo'), 'áá¸á¡á¢', '12nd');
+    assert.equal(moment([2011, 0, 13]).format('DDDo'), 'áá¸á¡á£', '13rd');
+    assert.equal(moment([2011, 0, 14]).format('DDDo'), 'áá¸á¡á¤', '14th');
+    assert.equal(moment([2011, 0, 15]).format('DDDo'), 'áá¸á¡á¥', '15th');
+    assert.equal(moment([2011, 0, 16]).format('DDDo'), 'áá¸á¡á¦', '16th');
+    assert.equal(moment([2011, 0, 17]).format('DDDo'), 'áá¸á¡á§', '17th');
+    assert.equal(moment([2011, 0, 18]).format('DDDo'), 'áá¸á¡á¨', '18th');
+    assert.equal(moment([2011, 0, 19]).format('DDDo'), 'áá¸á¡á©', '19th');
+    assert.equal(moment([2011, 0, 20]).format('DDDo'), 'áá¸á¢á ', '20th');
+
+    assert.equal(moment([2011, 0, 21]).format('DDDo'), 'áá¸á¢á¡', '21st');
+    assert.equal(moment([2011, 0, 22]).format('DDDo'), 'áá¸á¢á¢', '22nd');
+    assert.equal(moment([2011, 0, 23]).format('DDDo'), 'áá¸á¢á£', '23rd');
+    assert.equal(moment([2011, 0, 24]).format('DDDo'), 'áá¸á¢á¤', '24th');
+    assert.equal(moment([2011, 0, 25]).format('DDDo'), 'áá¸á¢á¥', '25th');
+    assert.equal(moment([2011, 0, 26]).format('DDDo'), 'áá¸á¢á¦', '26th');
+    assert.equal(moment([2011, 0, 27]).format('DDDo'), 'áá¸á¢á§', '27th');
+    assert.equal(moment([2011, 0, 28]).format('DDDo'), 'áá¸á¢á¨', '28th');
+    assert.equal(moment([2011, 0, 29]).format('DDDo'), 'áá¸á¢á©', '29th');
+    assert.equal(moment([2011, 0, 30]).format('DDDo'), 'áá¸á£á ', '30th');
+
+    assert.equal(moment([2011, 0, 31]).format('DDDo'), 'áá¸á£á¡', '31st');
 });
 
 test('format month', function (assert) {
-    var expected = 'áááá¶ áááá¶_áá»áááá áá»áááá_áá¸áá¶ áá¸áá¶_áááá¶ áááá¶_á§ááá¶ á§ááá¶_áá·áá»áá¶ áá·áá»áá¶_áááááá¶ áááááá¶_áá¸á á¶ áá¸á á¶_ááááá¶ ááááá¶_áá»áá¶ áá»áá¶_áá·áááá·áá¶ áá·áááá·áá¶_áááá¼ áááá¼'.split('_'),
+    var expected = 'áááá¶ áááá¶_áá»áááá áá»áááá_áá¸áá¶ áá¸áá¶_áááá¶ áááá¶_á§ááá¶ á§ááá¶_áá·áá»áá¶ áá·áá»áá¶_áááááá¶ áááááá¶_áá¸á á¶ áá¸á á¶_ááááá¶ ááááá¶_áá»áá¶ áá»áá¶_áá·áááá·áá¶ áá·áááá·áá¶_áááá¼ áááá¼'.split(
+            '_'
+        ),
         i;
     for (i = 0; i < expected.length; i++) {
-        assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        assert.equal(
+            moment([2011, i, 1]).format('MMMM MMM'),
+            expected[i],
+            expected[i]
+        );
     }
 });
 
 test('format week', function (assert) {
-    var expected = 'á¢á¶áá·ááá á¢á¶áá·ááá á¢á¶áá·ááá_ááááá ááááá ááááá_á¢áááá¶á á¢áááá¶á á¢áááá¶á_áá»á áá»á áá»á_áááá ááááá·á áááá ááááá·á áááá ááááá·á_áá»ááá áá»ááá áá»ááá_áááá áááá áááá'.split('_'),
+    var expected = 'á¢á¶áá·ááá á¢á¶ á¢á¶_ááááá á á_á¢áááá¶á á¢ á¢_áá»á á á_áááá ááááá·á ááá ááá_áá»ááá áá» áá»_áááá á á'.split(
+            '_'
+        ),
         i;
     for (i = 0; i < expected.length; i++) {
-        assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        assert.equal(
+            moment([2011, 0, 2 + i]).format('dddd ddd dd'),
+            expected[i],
+            expected[i]
+        );
     }
 });
 
 test('from', function (assert) {
     var start = moment([2007, 1, 28]);
-    assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), 'ááá»áááá¶ááá·áá¶áá¸', '44 seconds = ááá»áááá¶ááá·áá¶áá¸');
-    assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), 'áá½ááá¶áá¸', '45 seconds = áá½ááá¶áá¸');
-    assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true), 'áá½ááá¶áá¸', '89 seconds = áá½ááá¶áá¸');
-    assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true), '2 áá¶áá¸', '90 seconds = 2 áá¶áá¸');
-    assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true), '44 áá¶áá¸', '44 minutes = 44 áá¶áá¸');
-    assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true), 'áá½ááááá', '45 minutes = áá½ááááá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true), 'áá½ááááá', '89 minutes = áá½ááááá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true), '2 áááá', '90 minutes = 2 áááá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true), '5 áááá', '5 hours = 5 áááá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true), '21 áááá', '21 hours = 21 áááá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true), 'áá½ááááá', '22 hours = áá½ááááá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true), 'áá½ááááá', '35 hours = áá½ááááá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true), '2 áááá', '36 hours = 2 áááá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true), 'áá½ááááá', '1 day = áá½ááááá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true), '5 áááá', '5 days = 5 áááá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), '25 áááá', '25 days = 25 áááá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), 'áá½ááá', '26 days = áá½ááá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), 'áá½ááá', '30 days = áá½ááá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), 'áá½ááá', '43 days = áá½ááá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), '2 áá', '46 days = 2 áá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), '2 áá', '75 days = 2 áá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), '3 áá', '76 days = 3 áá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), 'áá½ááá', '1 month = áá½ááá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), '5 áá', '5 months = 5 áá');
-    assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'áá½ááááá¶á', '345 days = áá½ááááá¶á');
-    assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 áááá¶á', '548 days = 2 áááá¶á');
-    assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), 'áá½ááááá¶á', '1 year = áá½ááááá¶á');
-    assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), '5 áááá¶á', '5 years = 5 áááá¶á');
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({s: 44}), true),
+        'ááá»áááá¶ááá·áá¶áá¸',
+        '44 seconds = ááá»áááá¶ááá·áá¶áá¸'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({s: 45}), true),
+        'áá½ááá¶áá¸',
+        '45 seconds = áá½ááá¶áá¸'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({s: 89}), true),
+        'áá½ááá¶áá¸',
+        '89 seconds = áá½ááá¶áá¸'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({s: 90}), true),
+        'á¢ áá¶áá¸',
+        '90 seconds = 2 áá¶áá¸'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({m: 44}), true),
+        'á¤á¤ áá¶áá¸',
+        '44 minutes = 44 áá¶áá¸'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({m: 45}), true),
+        'áá½ááááá',
+        '45 minutes = áá½ááááá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({m: 89}), true),
+        'áá½ááááá',
+        '89 minutes = áá½ááááá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({m: 90}), true),
+        'á¢ áááá',
+        '90 minutes = 2 áááá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({h: 5}), true),
+        'á¥ áááá',
+        '5 hours = 5 áááá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({h: 21}), true),
+        'á¢á¡ áááá',
+        '21 hours = 21 áááá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({h: 22}), true),
+        'áá½ááááá',
+        '22 hours = áá½ááááá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({h: 35}), true),
+        'áá½ááááá',
+        '35 hours = áá½ááááá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({h: 36}), true),
+        'á¢ áááá',
+        '36 hours = 2 áááá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({d: 1}), true),
+        'áá½ááááá',
+        '1 day = áá½ááááá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({d: 5}), true),
+        'á¥ áááá',
+        '5 days = 5 áááá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({d: 25}), true),
+        'á¢á¥ áááá',
+        '25 days = 25 áááá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({d: 26}), true),
+        'áá½ááá',
+        '26 days = áá½ááá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({d: 30}), true),
+        'áá½ááá',
+        '30 days = áá½ááá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({d: 43}), true),
+        'áá½ááá',
+        '43 days = áá½ááá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({d: 46}), true),
+        'á¢ áá',
+        '46 days = 2 áá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({d: 74}), true),
+        'á¢ áá',
+        '75 days = 2 áá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({d: 76}), true),
+        'á£ áá',
+        '76 days = 3 áá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({M: 1}), true),
+        'áá½ááá',
+        '1 month = áá½ááá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({M: 5}), true),
+        'á¥ áá',
+        '5 months = 5 áá'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({d: 345}), true),
+        'áá½ááááá¶á',
+        '345 days = áá½ááááá¶á'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({d: 548}), true),
+        'á¢ áááá¶á',
+        '548 days = 2 áááá¶á'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({y: 1}), true),
+        'áá½ááááá¶á',
+        '1 year = áá½ááááá¶á'
+    );
+    assert.equal(
+        start.from(moment([2007, 1, 28]).add({y: 5}), true),
+        'á¥ áááá¶á',
+        '5 years = 5 áááá¶á'
+    );
 });
 
 test('suffix', function (assert) {
@@ -146,27 +279,80 @@ test('suffix', function (assert) {
 });
 
 test('now from now', function (assert) {
-    assert.equal(moment().fromNow(), 'ááá»áááá¶ááá·áá¶áá¸áá»á', 'now from now should display as in the past');
+    assert.equal(
+        moment().fromNow(),
+        'ááá»áááá¶ááá·áá¶áá¸áá»á',
+        'now from now should display as in the past'
+    );
 });
 
 test('fromNow', function (assert) {
-    assert.equal(moment().add({
-        s: 30
-    }).fromNow(), 'ááá»áááá¶ááá·áá¶áá¸ááá', 'in a few seconds');
-    assert.equal(moment().add({
-        d: 5
-    }).fromNow(), '5 ááááááá', 'in 5 days');
+    assert.equal(
+        moment()
+            .add({
+                s: 30
+            })
+            .fromNow(),
+        'ááá»áááá¶ááá·áá¶áá¸ááá',
+        'in a few seconds'
+    );
+    assert.equal(
+        moment()
+            .add({
+                d: 5
+            })
+            .fromNow(),
+        'á¥ ááááááá',
+        'in 5 days'
+    );
 });
 
 test('calendar day', function (assert) {
-    var a = moment().hours(12).minutes(0).seconds(0);
-
-    assert.equal(moment(a).calendar(),                  'ááááááá áááá 12:00',  'today at the same time');
-    assert.equal(moment(a).add({m: 25}).calendar(),     'ááááááá áááá 12:25',  'Now plus 25 min');
-    assert.equal(moment(a).add({h: 1}).calendar(),      'ááááááá áááá 13:00',  'Now plus 1 hour');
-    assert.equal(moment(a).add({d: 1}).calendar(),      'ááá¢áá áááá 12:00',    'tomorrow at the same time');
-    assert.equal(moment(a).subtract({h: 1}).calendar(), 'ááááááá áááá 11:00',  'Now minus 1 hour');
-    assert.equal(moment(a).subtract({d: 1}).calendar(), 'áááá·ááá·á áááá 12:00', 'yesterday at the same time');
+    var a = moment()
+        .hours(12)
+        .minutes(0)
+        .seconds(0);
+
+    assert.equal(
+        moment(a).calendar(),
+        'ááááááá áááá á¡á¢:á á ',
+        'today at the same time'
+    );
+    assert.equal(
+        moment(a)
+            .add({m: 25})
+            .calendar(),
+        'ááááááá áááá á¡á¢:á¢á¥',
+        'Now plus 25 min'
+    );
+    assert.equal(
+        moment(a)
+            .add({h: 1})
+            .calendar(),
+        'ááááááá áááá á¡á£:á á ',
+        'Now plus 1 hour'
+    );
+    assert.equal(
+        moment(a)
+            .add({d: 1})
+            .calendar(),
+        'ááá¢áá áááá á¡á¢:á á ',
+        'tomorrow at the same time'
+    );
+    assert.equal(
+        moment(a)
+            .subtract({h: 1})
+            .calendar(),
+        'ááááááá áááá á¡á¡:á á ',
+        'Now minus 1 hour'
+    );
+    assert.equal(
+        moment(a)
+            .subtract({d: 1})
+            .calendar(),
+        'áááá·ááá·á áááá á¡á¢:á á ',
+        'yesterday at the same time'
+    );
 });
 
 test('calendar next week', function (assert) {
@@ -175,11 +361,31 @@ test('calendar next week', function (assert) {
         m = moment().add({
             d: i
         });
-        assert.equal(m.calendar(), m.format('dddd [áááá] LT'), 'Today + ' + i + ' days current time');
-        m.hours(0).minutes(0).seconds(0).milliseconds(0);
-        assert.equal(m.calendar(), m.format('dddd [áááá] LT'), 'Today + ' + i + ' days beginning of day');
-        m.hours(23).minutes(59).seconds(59).milliseconds(999);
-        assert.equal(m.calendar(), m.format('dddd [áááá] LT'), 'Today + ' + i + ' days end of day');
+        assert.equal(
+            m.calendar(),
+            m.format('dddd [áááá] LT'),
+            'Today + ' + i + ' days current time'
+        );
+        m
+            .hours(0)
+            .minutes(0)
+            .seconds(0)
+            .milliseconds(0);
+        assert.equal(
+            m.calendar(),
+            m.format('dddd [áááá] LT'),
+            'Today + ' + i + ' days beginning of day'
+        );
+        m
+            .hours(23)
+            .minutes(59)
+            .seconds(59)
+            .milliseconds(999);
+        assert.equal(
+            m.calendar(),
+            m.format('dddd [áááá] LT'),
+            'Today + ' + i + ' days end of day'
+        );
     }
 });
 
@@ -190,11 +396,31 @@ test('calendar last week', function (assert) {
         m = moment().subtract({
             d: i
         });
-        assert.equal(m.calendar(), m.format('dddd [ááááá¶á ááá»á] [áááá] LT'), 'Today - ' + i + ' days current time');
-        m.hours(0).minutes(0).seconds(0).milliseconds(0);
-        assert.equal(m.calendar(), m.format('dddd [ááááá¶á ááá»á] [áááá] LT'), 'Today - ' + i + ' days beginning of day');
-        m.hours(23).minutes(59).seconds(59).milliseconds(999);
-        assert.equal(m.calendar(), m.format('dddd [ááááá¶á ááá»á] [áááá] LT'), 'Today - ' + i + ' days end of day');
+        assert.equal(
+            m.calendar(),
+            m.format('dddd [ááááá¶á ááá»á] [áááá] LT'),
+            'Today - ' + i + ' days current time'
+        );
+        m
+            .hours(0)
+            .minutes(0)
+            .seconds(0)
+            .milliseconds(0);
+        assert.equal(
+            m.calendar(),
+            m.format('dddd [ááááá¶á ááá»á] [áááá] LT'),
+            'Today - ' + i + ' days beginning of day'
+        );
+        m
+            .hours(23)
+            .minutes(59)
+            .seconds(59)
+            .milliseconds(999);
+        assert.equal(
+            m.calendar(),
+            m.format('dddd [ááááá¶á ááá»á] [áááá] LT'),
+            'Today - ' + i + ' days end of day'
+        );
     }
 });
 
@@ -207,7 +433,11 @@ test('calendar all else', function (assert) {
         });
 
     assert.equal(weeksAgo.calendar(), weeksAgo.format('L'), '1 week ago');
-    assert.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), 'in 1 week');
+    assert.equal(
+        weeksFromNow.calendar(),
+        weeksFromNow.format('L'),
+        'in 1 week'
+    );
 
     weeksAgo = moment().subtract({
         w: 2
@@ -217,14 +447,37 @@ test('calendar all else', function (assert) {
     });
 
     assert.equal(weeksAgo.calendar(), weeksAgo.format('L'), '2 weeks ago');
-    assert.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), 'in 2 weeks');
+    assert.equal(
+        weeksFromNow.calendar(),
+        weeksFromNow.format('L'),
+        'in 2 weeks'
+    );
 });
 
 test('weeks year starting sunday formatted', function (assert) {
-    assert.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52', 'Jan  1 2012 should be week 52');
-    assert.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1', 'Jan  2 2012 should be week 1');
-    assert.equal(moment([2012, 0, 8]).format('w ww wo'), '1 01 1', 'Jan  8 2012 should be week 1');
-    assert.equal(moment([2012, 0, 9]).format('w ww wo'), '2 02 2', 'Jan  9 2012 should be week 2');
-    assert.equal(moment([2012, 0, 15]).format('w ww wo'), '2 02 2', 'Jan 15 2012 should be week 2');
+    assert.equal(
+        moment([2012, 0, 1]).format('w ww wo'),
+        'á¥á¢ á¥á¢ áá¸á¥á¢',
+        'Jan  1 2012 should be week 52'
+    );
+    assert.equal(
+        moment([2012, 0, 2]).format('w ww wo'),
+        'á¡ á á¡ áá¸á¡',
+        'Jan  2 2012 should be week 1'
+    );
+    assert.equal(
+        moment([2012, 0, 8]).format('w ww wo'),
+        'á¡ á á¡ áá¸á¡',
+        'Jan  8 2012 should be week 1'
+    );
+    assert.equal(
+        moment([2012, 0, 9]).format('w ww wo'),
+        'á¢ á á¢ áá¸á¢',
+        'Jan  9 2012 should be week 2'
+    );
+    assert.equal(
+        moment([2012, 0, 15]).format('w ww wo'),
+        'á¢ á á¢ áá¸á¢',
+        'Jan 15 2012 should be week 2'
+    );
 });
-