From 6b5e80a8196bab18c82875722dbb77386f47f632 Mon Sep 17 00:00:00 2001 From: kylekatarnls Date: Wed, 24 Jan 2024 11:55:44 +0100 Subject: [PATCH 1/2] Fix short year Ukrainian plural --- src/Carbon/Lang/uk.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Carbon/Lang/uk.php b/src/Carbon/Lang/uk.php index 1d5ba703f1..4217d16edb 100644 --- a/src/Carbon/Lang/uk.php +++ b/src/Carbon/Lang/uk.php @@ -55,7 +55,7 @@ */ return [ 'year' => ':count рік|:count роки|:count років', - 'y' => ':countр', + 'y' => ':countр|:countрр|:countрр', 'a_year' => '{1}рік|:count рік|:count роки|:count років', 'month' => ':count місяць|:count місяці|:count місяців', 'm' => ':countм', From 4be89962a2a4fbf9385453aabf1bb2c0752f0d36 Mon Sep 17 00:00:00 2001 From: kylekatarnls Date: Thu, 25 Jan 2024 11:14:51 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Update=20tests=20for=20=D1=80=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Localization/UkTest.php | 6 +++--- tests/Localization/UkUaTest.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Localization/UkTest.php b/tests/Localization/UkTest.php index 8f1f57cc26..6c485a2d48 100644 --- a/tests/Localization/UkTest.php +++ b/tests/Localization/UkTest.php @@ -178,7 +178,7 @@ class UkTest extends LocalizationTestCase // Carbon::now()->subYears(2)->diffForHumans() '2 роки тому', // Carbon::now()->subYears(2)->diffForHumans(null, false, true) - '2р тому', + '2рр тому', // Carbon::now()->addSecond()->diffForHumans() 'за 1 секунду', // Carbon::now()->addSecond()->diffForHumans(null, false, true) @@ -204,13 +204,13 @@ class UkTest extends LocalizationTestCase // Carbon::now()->addMinute()->addSecond()->diffForHumans(null, true, false, 2) '1 хвилина 1 секунда', // Carbon::now()->addYears(2)->addMonths(3)->addDay()->addSecond()->diffForHumans(null, true, true, 4) - '2р 3м 1д 1сек', + '2рр 3м 1д 1сек', // Carbon::now()->addYears(3)->diffForHumans(null, null, false, 4) 'за 3 роки', // Carbon::now()->subMonths(5)->diffForHumans(null, null, true, 4) '5м тому', // Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4) - '2р 3м 1д 1сек тому', + '2рр 3м 1д 1сек тому', // Carbon::now()->addWeek()->addHours(10)->diffForHumans(null, true, false, 2) '1 тиждень 10 годин', // Carbon::now()->addWeek()->addDays(6)->diffForHumans(null, true, false, 2) diff --git a/tests/Localization/UkUaTest.php b/tests/Localization/UkUaTest.php index 2aa824ebbe..f6f0daf66f 100644 --- a/tests/Localization/UkUaTest.php +++ b/tests/Localization/UkUaTest.php @@ -178,7 +178,7 @@ class UkUaTest extends LocalizationTestCase // Carbon::now()->subYears(2)->diffForHumans() '2 роки тому', // Carbon::now()->subYears(2)->diffForHumans(null, false, true) - '2р тому', + '2рр тому', // Carbon::now()->addSecond()->diffForHumans() 'за 1 секунду', // Carbon::now()->addSecond()->diffForHumans(null, false, true) @@ -204,13 +204,13 @@ class UkUaTest extends LocalizationTestCase // Carbon::now()->addMinute()->addSecond()->diffForHumans(null, true, false, 2) '1 хвилина 1 секунда', // Carbon::now()->addYears(2)->addMonths(3)->addDay()->addSecond()->diffForHumans(null, true, true, 4) - '2р 3м 1д 1сек', + '2рр 3м 1д 1сек', // Carbon::now()->addYears(3)->diffForHumans(null, null, false, 4) 'за 3 роки', // Carbon::now()->subMonths(5)->diffForHumans(null, null, true, 4) '5м тому', // Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4) - '2р 3м 1д 1сек тому', + '2рр 3м 1д 1сек тому', // Carbon::now()->addWeek()->addHours(10)->diffForHumans(null, true, false, 2) '1 тиждень 10 годин', // Carbon::now()->addWeek()->addDays(6)->diffForHumans(null, true, false, 2)