From: Irakli Janiashvili <irakli.janiashvili@gmail.com>
Date: Fri, 24 Apr 2020 18:17:22 +0000 (+0400)
Subject: [locale] ka: Standalone/format/longformat improvements (#5279)
X-Git-Tag: 2.25.0~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48b5ef705ab3b679b424d29762179552f336e6be;p=thirdparty%2Fmoment.git

[locale] ka: Standalone/format/longformat improvements (#5279)

* Fixed typo in the Georgian locale

* fixed month formatting

* removed am/pm from longDateFormat

* fix ka locale tests

* updated author username
---

diff --git a/src/locale/ka.js b/src/locale/ka.js
index 169734b13..d381bcc36 100644
--- a/src/locale/ka.js
+++ b/src/locale/ka.js
@@ -1,14 +1,11 @@
 //! moment.js locale configuration
 //! locale : Georgian [ka]
-//! author : Irakli Janiashvili : https://github.com/irakli-janiashvili
+//! author : Irakli Janiashvili : https://github.com/IrakliJani
 
 import moment from '../moment';
 
 export default moment.defineLocale('ka', {
-    months : {
-        standalone: 'áááááá á_ááááá áááá_ááá á¢á_ááá ááá_áááá¡á_ááááá¡á_ááááá¡á_ááááá¡á¢á_á¡áá¥á¢ááááá á_áá¥á¢ááááá á_ááááááá á_áááááááá á'.split('_'),
-        format: 'áááááá á¡_ááááá áááá¡_ááá á¢á¡_ááá áááá¡_áááá¡á¡_ááááá¡á¡_ááááá¡á¡_ááááá¡á¢á¡_á¡áá¥á¢ááááá á¡_áá¥á¢ááááá á¡_ááááááá á¡_áááááááá á¡'.split('_')
-    },
+    months : 'áááááá á_ááááá áááá_ááá á¢á_ááá ááá_áááá¡á_ááááá¡á_ááááá¡á_ááááá¡á¢á_á¡áá¥á¢ááááá á_áá¥á¢ááááá á_ááááááá á_áááááááá á'.split('_'),
     monthsShort : 'ááá_ááá_ááá _ááá _ááá_ááá_ááá_ááá_á¡áá¥_áá¥á¢_ááá_ááá'.split('_'),
     weekdays : {
         standalone: 'áááá á_áá á¨ááááá_á¡ááá¨ááááá_ááá®á¨ááááá_á®á£áá¨ááááá_ááá áá¡áááá_á¨ááááá'.split('_'),
@@ -18,12 +15,12 @@ export default moment.defineLocale('ka', {
     weekdaysShort : 'ááá_áá á¨_á¡áá_ááá®_á®á£á_ááá _á¨áá'.split('_'),
     weekdaysMin : 'áá_áá _á¡á_áá_á®á£_áá_á¨á'.split('_'),
     longDateFormat : {
-        LT : 'h:mm A',
-        LTS : 'h:mm:ss A',
+        LT : 'HH:mm',
+        LTS : 'HH:mm:ss',
         L : 'DD/MM/YYYY',
         LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY h:mm A',
-        LLLL : 'dddd, D MMMM YYYY h:mm A'
+        LLL : 'D MMMM YYYY HH:mm',
+        LLLL : 'dddd, D MMMM YYYY HH:mm'
     },
     calendar : {
         sameDay : '[áá¦áá¡] LT[-áá]',
diff --git a/src/test/locale/ka.js b/src/test/locale/ka.js
index 159224fa4..b27e30bfc 100644
--- a/src/test/locale/ka.js
+++ b/src/test/locale/ka.js
@@ -41,15 +41,15 @@ test('format', function (assert) {
             ['s ss',                          '50 50'],
             ['a A',                           'pm PM'],
             ['á¬ááá¡ DDDo áá¦á',                 'á¬ááá¡ 45-á áá¦á'],
-            ['LTS',                           '3:25:50 PM'],
+            ['LTS',                           '15:25:50'],
             ['L',                             '14/02/2010'],
-            ['LL',                            '14 ááááá áááá¡ 2010'],
-            ['LLL',                           '14 ááááá áááá¡ 2010 3:25 PM'],
-            ['LLLL',                          'áááá á, 14 ááááá áááá¡ 2010 3:25 PM'],
+            ['LL',                            '14 ááááá áááá 2010'],
+            ['LLL',                           '14 ááááá áááá 2010 15:25'],
+            ['LLLL',                          'áááá á, 14 ááááá áááá 2010 15:25'],
             ['l',                             '14/2/2010'],
             ['ll',                            '14 ááá 2010'],
-            ['lll',                           '14 ááá 2010 3:25 PM'],
-            ['llll',                          'ááá, 14 ááá 2010 3:25 PM']
+            ['lll',                           '14 ááá 2010 15:25'],
+            ['llll',                          'ááá, 14 ááá 2010 15:25']
         ],
         b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
         i;
@@ -162,18 +162,18 @@ test('now from now', function (assert) {
 
 test('fromNow', function (assert) {
     assert.equal(moment().add({s: 30}).fromNow(), 'á áááááááá á¬ááá¨á', 'á áááááááá á¬ááá¨á');
-    assert.equal(moment().add({d: 5}).fromNow(), '5 áá¦áá¨á', '5 áá¦áá¨á');
+    assert.equal(moment().add({d: 5}).fromNow(),  '5 áá¦áá¨á',         '5 áá¦áá¨á');
 });
 
 test('calendar day', function (assert) {
     var a = moment().hours(12).minutes(0).seconds(0);
 
-    assert.equal(moment(a).calendar(),                   'áá¦áá¡ 12:00 PM-áá',  'áá¦áá¡ ááááá áá áá¡');
-    assert.equal(moment(a).add({m: 25}).calendar(),      'áá¦áá¡ 12:25 PM-áá',  'áá®áááááá áá áá¡ ááááá¢ááá£áá 25 á¬á£áá');
-    assert.equal(moment(a).add({h: 1}).calendar(),       'áá¦áá¡ 1:00 PM-áá',   'áá®áááááá áá áá¡ ááááá¢ááá£áá 1 á¡áááá');
-    assert.equal(moment(a).add({d: 1}).calendar(),       'á®ááá 12:00 PM-áá',  'á®ááá ááááá áá áá¡');
-    assert.equal(moment(a).subtract({h: 1}).calendar(),  'áá¦áá¡ 11:00 AM-áá',  'áá®áááááá áá áá¡ ááááááááá£áá 1 á¡áááá');
-    assert.equal(moment(a).subtract({d: 1}).calendar(),  'áá£á¨áá 12:00 PM-áá', 'áá£á¨áá ááááá áá áá¡');
+    assert.equal(moment(a).calendar(),                   'áá¦áá¡ 12:00-áá',    'áá¦áá¡ ááááá áá áá¡');
+    assert.equal(moment(a).add({m: 25}).calendar(),      'áá¦áá¡ 12:25-áá',    'áá®áááááá áá áá¡ ááááá¢ááá£áá 25 á¬á£áá');
+    assert.equal(moment(a).add({h: 1}).calendar(),       'áá¦áá¡ 13:00-áá',    'áá®áááááá áá áá¡ ááááá¢ááá£áá 1 á¡áááá');
+    assert.equal(moment(a).add({d: 1}).calendar(),       'á®ááá 12:00-áá',    'á®ááá ááááá áá áá¡');
+    assert.equal(moment(a).subtract({h: 1}).calendar(),  'áá¦áá¡ 11:00-áá', 'áá®áááááá áá áá¡ ááááááááá£áá 1 á¡áááá');
+    assert.equal(moment(a).subtract({d: 1}).calendar(),  'áá£á¨áá 12:00-áá',   'áá£á¨áá ááááá áá áá¡');
 });
 
 test('calendar next week', function (assert) {
@@ -204,13 +204,13 @@ test('calendar all else', function (assert) {
     var weeksAgo = moment().subtract({w: 1}),
         weeksFromNow = moment().add({w: 1});
 
-    assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 áááá áá¡ á¬áá');
+    assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),      '1 áááá áá¡ á¬áá');
     assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  '1 áááá áá¨á');
 
     weeksAgo = moment().subtract({w: 2});
     weeksFromNow = moment().add({w: 2});
 
-    assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 áááá áá¡ á¬áá');
+    assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),      '2 áááá áá¡ á¬áá');
     assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  '2 áááá áá¨á');
 });