[locale] tr: Add meridiem support (#4701)

diff --git a/src/locale/tr.js b/src/locale/tr.js
index 087f337386c5488e0222fa21ef812fcfc34a56a1..a5cf34377aad28fed47c327c31b8b55b8288b3df 100644 (file)
--- a/src/locale/tr.js
+++ b/src/locale/tr.js
@@ -36,6 +36,17 @@ export default moment.defineLocale('tr', {
     ),
     weekdaysShort: 'Paz_Pts_Sal_Çar_Per_Cum_Cts'.split('_'),
     weekdaysMin: 'Pz_Pt_Sa_Ça_Pe_Cu_Ct'.split('_'),
+    meridiem: function (hours, minutes, isLower) {
+        if (hours < 12) {
+            return isLower ? 'öö' : 'ÖÖ';
+        } else {
+            return isLower ? 'ös' : 'ÖS';
+        }
+    },
+    meridiemParse: /öö|ÖÖ|ös|ÖS/,
+    isPM: function (input) {
+        return input === 'ös' || input === 'ÖS';
+    },
     longDateFormat: {
         LT: 'HH:mm',
         LTS: 'HH:mm:ss',

diff --git a/src/test/locale/tr.js b/src/test/locale/tr.js
index 20455ca85f4ec08c81cfe6f8e7895cfdaa2653cb..44df29960cddc1dc0c1d80be13b343f47fc6b4c3 100644 (file)
--- a/src/test/locale/tr.js
+++ b/src/test/locale/tr.js
@@ -49,9 +49,9 @@ test('format', function (assert) {
     var a = [
             [
                 'dddd, MMMM Do YYYY, h:mm:ss a',
-                'Pazar, Şubat 14 2010, 3:25:50 pm',
+                'Pazar, Şubat 14 2010, 3:25:50 ös',
             ],
-            ['ddd, hA', 'Paz, 3PM'],
+            ['ddd, hA', 'Paz, 3ÖS'],
             ['M Mo MM MMMM MMM', "2 2'nci 02 Şubat Şub"],
             ['YYYY YY', '2010 10'],
             ['D Do DD', '14 14 14'],
@@ -62,7 +62,7 @@ test('format', function (assert) {
             ['H HH', '15 15'],
             ['m mm', '25 25'],
             ['s ss', '50 50'],
-            ['a A', 'pm PM'],
+            ['a A', 'ös ÖS'],
             ['[yılın] DDDo [günü]', "yılın 45'inci günü"],
             ['LTS', '15:25:50'],
             ['L', '14.02.2010'],