Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix short year Ukrainian plural #2923

Merged
merged 2 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Carbon/Lang/uk.php
Original file line number Diff line number Diff line change
Expand Up @@ -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м',
Expand Down
6 changes: 3 additions & 3 deletions tests/Localization/UkTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class UkTest extends LocalizationTestCase
// Carbon::now()->subYears(2)->diffForHumans()
'2 роки тому',
// Carbon::now()->subYears(2)->diffForHumans(null, false, true)
' тому',
'2рр тому',
// Carbon::now()->addSecond()->diffForHumans()
'за 1 секунду',
// Carbon::now()->addSecond()->diffForHumans(null, false, true)
Expand All @@ -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)
' 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)
' 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)
Expand Down
6 changes: 3 additions & 3 deletions tests/Localization/UkUaTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class UkUaTest extends LocalizationTestCase
// Carbon::now()->subYears(2)->diffForHumans()
'2 роки тому',
// Carbon::now()->subYears(2)->diffForHumans(null, false, true)
' тому',
'2рр тому',
// Carbon::now()->addSecond()->diffForHumans()
'за 1 секунду',
// Carbon::now()->addSecond()->diffForHumans(null, false, true)
Expand All @@ -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)
' 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)
' 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)
Expand Down
Loading