From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 2 Mar 2018 19:01:04 +0000 (+0100)
Subject: [bugfix] remove `ordinal` for `Turkish` locale as they use `cardin… (#4361)
X-Git-Tag: 2.21.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fe46e4d1b2d33a0ca7241fe1a29abe1f5846662;p=thirdparty%2Fmoment.git

[bugfix] remove `ordinal` for `Turkish` locale as they use `cardin… (#4361)

* bugfix: local remove `ordinal` for `Turkish` locale as they use `cardinal` days

Closes: #4122

* restore ordinals
---

diff --git a/src/locale/tr.js b/src/locale/tr.js
index 841eb6ccb..b5e8ad79c 100644
--- a/src/locale/tr.js
+++ b/src/locale/tr.js
@@ -1,3 +1,4 @@
+
 //! moment.js locale configuration
 //! locale : Turkish [tr]
 //! authors : Erhan Gundogan : https://github.com/erhangundogan,
@@ -64,15 +65,22 @@ export default moment.defineLocale('tr', {
         y : 'bir yıl',
         yy : '%d yıl'
     },
-    dayOfMonthOrdinalParse: /\d{1,2}'(inci|nci|üncü|ncı|uncu|ıncı)/,
-    ordinal : function (number) {
-        if (number === 0) {  // special case for zero
-            return number + '\'ıncı';
+    ordinal: function (number, period) {
+        switch (period) {
+            case 'd':
+            case 'D':
+            case 'Do':
+            case 'DD':
+                return number;
+            default:
+                if (number === 0) {  // special case for zero
+                    return number + '\'ıncı';
+                }
+                var a = number % 10,
+                    b = number % 100 - a,
+                    c = number >= 100 ? 100 : null;
+                return number + (suffixes[a] || suffixes[b] || suffixes[c]);
         }
-        var a = number % 10,
-            b = number % 100 - a,
-            c = number >= 100 ? 100 : null;
-        return number + (suffixes[a] || suffixes[b] || suffixes[c]);
     },
     week : {
         dow : 1, // Monday is the first day of the week.
diff --git a/src/test/locale/tr.js b/src/test/locale/tr.js
index 6fa83ac5d..5d96a325b 100644
--- a/src/test/locale/tr.js
+++ b/src/test/locale/tr.js
@@ -22,12 +22,12 @@ test('parse', function (assert) {
 
 test('format', function (assert) {
     var a = [
-            ['dddd, MMMM Do YYYY, h:mm:ss a',      'Pazar, Şubat 14\'üncü 2010, 3:25:50 pm'],
+            ['dddd, MMMM Do YYYY, h:mm:ss a',      'Pazar, Şubat 14 2010, 3:25:50 pm'],
             ['ddd, hA',                            'Paz, 3PM'],
             ['M Mo MM MMMM MMM',                   '2 2\'nci 02 Şubat Şub'],
             ['YYYY YY',                            '2010 10'],
-            ['D Do DD',                            '14 14\'üncü 14'],
-            ['d do dddd ddd dd',                   '0 0\'ıncı Pazar Paz Pz'],
+            ['D Do DD',                            '14 14 14'],
+            ['d do dddd ddd dd',                   '0 0 Pazar Paz Pz'],
             ['DDD DDDo DDDD',                      '45 45\'inci 045'],
             ['w wo ww',                            '7 7\'nci 07'],
             ['h hh',                               '3 03'],
@@ -217,4 +217,3 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2\'nci', 'Jan  8 2012 should be week 2');
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3\'üncü', 'Jan  9 2012 should be week 3');
 });
-