Fixed invalid ordinal function for lang=tr and added more tests to cover edge cases...

diff --git a/lang/tr.js b/lang/tr.js
index 84c04ad6f444e0c49df5f3c4239602e1614358e6..746899e73ee712f594fca9edd77a8a8e47bbe48d 100644 (file)
--- a/lang/tr.js
+++ b/lang/tr.js
@@ -1,7 +1,33 @@
 // moment.js language configuration
 // language : turkish (tr)
-// author : Erhan Gundogan : https://github.com/erhangundogan
+// authors : Erhan Gundogan : https://github.com/erhangundogan,
+//           Burak Yiğit Kaya: https://github.com/BYK
 (function () {
+    var suffixes = {
+        1: "'inci",
+        5: "'inci",
+        8: "'inci",
+        70: "'inci",
+        80: "'inci",
+
+        2: "'nci",
+        7: "'nci",
+        20: "'nci",
+        50: "'nci",
+
+        3: "'üncü",
+        4: "'üncü",
+        100: "'üncü",
+
+        6: "'ncı",
+
+        9: "'uncu",
+        10: "'uncu",
+        30: "'uncu",
+
+        60: "'ıncı",
+        90: "'ıncı"
+    };
     var lang = {
             months : "Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık".split("_"),
             monthsShort : "Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara".split("_"),
@@ -39,11 +65,15 @@
                 yy : "%d yıl"
             },
             ordinal : function (number) {
-                var b = number % 10;
-                return (~~ (number % 100 / 10) === 1) ? 'th' :
-                    (b === 1) ? 'st' :
-                    (b === 2) ? 'nd' :
-                    (b === 3) ? 'rd' : 'th';
+                if (number === 0) {  // special case for zero
+                    return "'ıncı";
+                }
+
+                var a = number % 10;
+                var b = number % 100 - a;
+                var c = number >= 100 ? 100 : null;
+
+                return suffixes[a] || suffixes[b] || suffixes[c];
             }
         };
 

diff --git a/test/lang/tr.js b/test/lang/tr.js
index b8f79e2c7942a974815e7c541bc75510eb525e3f..2fce8a3a2576e563cfe3f89503de5871d5f0969f 100644 (file)
--- a/test/lang/tr.js
+++ b/test/lang/tr.js
@@ -29,32 +29,43 @@ exports["lang:tr"] = {
     },
 
     "format" : function(test) {
-        test.expect(18);
         moment.lang('tr');
         var a = [
-                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Pazar, Şubat 14th 2010, 3:25:50 pm'],
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Pazar, Şubat 14\'üncü 2010, 3:25:50 pm'],
                 ['ddd, hA',                            'Paz, 3PM'],
-                ['M Mo MM MMMM MMM',                   '2 2nd 02 Şubat Şub'],
+                ['M Mo MM MMMM MMM',                   '2 2\'nci 02 Şubat Şub'],
                 ['YYYY YY',                            '2010 10'],
-                ['D Do DD',                            '14 14th 14'],
-                ['d do dddd ddd dd',                   '0 0th Pazar Paz Pz'],
-                ['DDD DDDo DDDD',                      '45 45th 045'],
-                ['w wo ww',                            '8 8th 08'],
+                ['D Do DD',                            '14 14\'üncü 14'],
+                ['d do dddd ddd dd',                   '0 0\'ıncı Pazar Paz Pz'],
+                ['DDD DDDo DDDD',                      '45 45\'inci 045'],
+                ['w wo ww',                            '8 8\'inci 08'],
                 ['h hh',                               '3 03'],
                 ['H HH',                               '15 15'],
                 ['m mm',                               '25 25'],
                 ['s ss',                               '50 50'],
                 ['a A',                                'pm PM'],
-                ['t\\he DDDo \\d\\ay of t\\he ye\\ar', 'the 45th day of the year'],
+                ['yılın DDDo günü',                    'yılın 45\'inci günü'],
                 ['L',                                  '14.02.2010'],
                 ['LL',                                 '14 Şubat 2010'],
                 ['LLL',                                '14 Şubat 2010 15:25'],
                 ['LLLL',                               'Pazar, 14 Şubat 2010 15:25']
             ],
-            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            DDDo = [
+                [359, '360\'ıncı'],
+                [199, '200\'üncü'],
+                [149, '150\'nci']
+            ],
+            dt = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            DDDoDt,
             i;
+        test.expect(a.length + DDDo.length);
+
         for (i = 0; i < a.length; i++) {
-            test.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+            test.equal(dt.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+        for (i = 0; i < DDDo.length; i++) {
+            DDDoDt = moment([2010]);
+            test.equal(DDDoDt.add('days', DDDo[i][0]).format('DDDo'), DDDo[i][1], DDDo[i][0] + ' ---> ' + DDDo[i][1]);
         }
         test.done();
     },
@@ -62,40 +73,40 @@ exports["lang:tr"] = {
     "format ordinal" : function(test) {
         test.expect(31);
         moment.lang('tr');
-        test.equal(moment([2011, 0, 1]).format('DDDo'), '1st', '1st');
-        test.equal(moment([2011, 0, 2]).format('DDDo'), '2nd', '2nd');
-        test.equal(moment([2011, 0, 3]).format('DDDo'), '3rd', '3rd');
-        test.equal(moment([2011, 0, 4]).format('DDDo'), '4th', '4th');
-        test.equal(moment([2011, 0, 5]).format('DDDo'), '5th', '5th');
-        test.equal(moment([2011, 0, 6]).format('DDDo'), '6th', '6th');
-        test.equal(moment([2011, 0, 7]).format('DDDo'), '7th', '7th');
-        test.equal(moment([2011, 0, 8]).format('DDDo'), '8th', '8th');
-        test.equal(moment([2011, 0, 9]).format('DDDo'), '9th', '9th');
-        test.equal(moment([2011, 0, 10]).format('DDDo'), '10th', '10th');
+        test.equal(moment([2011, 0, 1]).format('DDDo'), '1\'inci', '1st');
+        test.equal(moment([2011, 0, 2]).format('DDDo'), '2\'nci', '2nd');
+        test.equal(moment([2011, 0, 3]).format('DDDo'), '3\'üncü', '3rd');
+        test.equal(moment([2011, 0, 4]).format('DDDo'), '4\'üncü', '4th');
+        test.equal(moment([2011, 0, 5]).format('DDDo'), '5\'inci', '5th');
+        test.equal(moment([2011, 0, 6]).format('DDDo'), '6\'ncı', '6th');
+        test.equal(moment([2011, 0, 7]).format('DDDo'), '7\'nci', '7th');
+        test.equal(moment([2011, 0, 8]).format('DDDo'), '8\'inci', '8th');
+        test.equal(moment([2011, 0, 9]).format('DDDo'), '9\'uncu', '9th');
+        test.equal(moment([2011, 0, 10]).format('DDDo'), '10\'uncu', '10th');
     
-        test.equal(moment([2011, 0, 11]).format('DDDo'), '11th', '11th');
-        test.equal(moment([2011, 0, 12]).format('DDDo'), '12th', '12th');
-        test.equal(moment([2011, 0, 13]).format('DDDo'), '13th', '13th');
-        test.equal(moment([2011, 0, 14]).format('DDDo'), '14th', '14th');
-        test.equal(moment([2011, 0, 15]).format('DDDo'), '15th', '15th');
-        test.equal(moment([2011, 0, 16]).format('DDDo'), '16th', '16th');
-        test.equal(moment([2011, 0, 17]).format('DDDo'), '17th', '17th');
-        test.equal(moment([2011, 0, 18]).format('DDDo'), '18th', '18th');
-        test.equal(moment([2011, 0, 19]).format('DDDo'), '19th', '19th');
-        test.equal(moment([2011, 0, 20]).format('DDDo'), '20th', '20th');
-    
-        test.equal(moment([2011, 0, 21]).format('DDDo'), '21st', '21st');
-        test.equal(moment([2011, 0, 22]).format('DDDo'), '22nd', '22nd');
-        test.equal(moment([2011, 0, 23]).format('DDDo'), '23rd', '23rd');
-        test.equal(moment([2011, 0, 24]).format('DDDo'), '24th', '24th');
-        test.equal(moment([2011, 0, 25]).format('DDDo'), '25th', '25th');
-        test.equal(moment([2011, 0, 26]).format('DDDo'), '26th', '26th');
-        test.equal(moment([2011, 0, 27]).format('DDDo'), '27th', '27th');
-        test.equal(moment([2011, 0, 28]).format('DDDo'), '28th', '28th');
-        test.equal(moment([2011, 0, 29]).format('DDDo'), '29th', '29th');
-        test.equal(moment([2011, 0, 30]).format('DDDo'), '30th', '30th');
+        test.equal(moment([2011, 0, 11]).format('DDDo'), '11\'inci', '11th');
+        test.equal(moment([2011, 0, 12]).format('DDDo'), '12\'nci', '12th');
+        test.equal(moment([2011, 0, 13]).format('DDDo'), '13\'üncü', '13th');
+        test.equal(moment([2011, 0, 14]).format('DDDo'), '14\'üncü', '14th');
+        test.equal(moment([2011, 0, 15]).format('DDDo'), '15\'inci', '15th');
+        test.equal(moment([2011, 0, 16]).format('DDDo'), '16\'ncı', '16th');
+        test.equal(moment([2011, 0, 17]).format('DDDo'), '17\'nci', '17th');
+        test.equal(moment([2011, 0, 18]).format('DDDo'), '18\'inci', '18th');
+        test.equal(moment([2011, 0, 19]).format('DDDo'), '19\'uncu', '19th');
+        test.equal(moment([2011, 0, 20]).format('DDDo'), '20\'nci', '20th');
+
+        test.equal(moment([2011, 0, 21]).format('DDDo'), '21\'inci', '21th');
+        test.equal(moment([2011, 0, 22]).format('DDDo'), '22\'nci', '22th');
+        test.equal(moment([2011, 0, 23]).format('DDDo'), '23\'üncü', '23th');
+        test.equal(moment([2011, 0, 24]).format('DDDo'), '24\'üncü', '24th');
+        test.equal(moment([2011, 0, 25]).format('DDDo'), '25\'inci', '25th');
+        test.equal(moment([2011, 0, 26]).format('DDDo'), '26\'ncı', '26th');
+        test.equal(moment([2011, 0, 27]).format('DDDo'), '27\'nci', '27th');
+        test.equal(moment([2011, 0, 28]).format('DDDo'), '28\'inci', '28th');
+        test.equal(moment([2011, 0, 29]).format('DDDo'), '29\'uncu', '29th');
+        test.equal(moment([2011, 0, 30]).format('DDDo'), '30\'uncu', '30th');
     
-        test.equal(moment([2011, 0, 31]).format('DDDo'), '31st', '31st');
+        test.equal(moment([2011, 0, 31]).format('DDDo'), '31\'inci', '31st');
         test.done();
     },