From: Davit Barbakadze <jayarjo@gmail.com>
Date: Tue, 24 Apr 2018 15:05:30 +0000 (+0400)
Subject: [locale] ka: fix future relativeTime altering unrelated strings
X-Git-Tag: 2.25.0~30^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=303882604f988a47080838c3e5d16bc6b5ac5456;p=thirdparty%2Fmoment.git

[locale] ka: fix future relativeTime altering unrelated strings
---

diff --git a/src/locale/ka.js b/src/locale/ka.js
index 35227629c..31ae6a4f4 100644
--- a/src/locale/ka.js
+++ b/src/locale/ka.js
@@ -38,9 +38,13 @@ export default moment.defineLocale('ka', {
     },
     relativeTime: {
         future: function (s) {
-            return /(წამი|წუთი|საათი|წელი)/.test(s)
-                ? s.replace(/ი$/, 'ში')
-                : s + 'ში';
+            return s.replace(/(წამ|წუთ|საათ|წელ|დღ|თვ)(ი|ე)/, function (
+                $0,
+                $1,
+                $2
+            ) {
+                return $2 === 'ი' ? $1 + 'ში' : $1 + $2 + 'ში';
+            });
         },
         past: function (s) {
             if (/(წამი|წუთი|საათი|დღე|თვე)/.test(s)) {
@@ -49,6 +53,7 @@ export default moment.defineLocale('ka', {
             if (/წელი/.test(s)) {
                 return s.replace(/წელი$/, 'წლის წინ');
             }
+            return s;
         },
         s: 'რამდენიმე წამი',
         ss: '%d წამი',