diff --git a/src/Carbon/Lang/id.php b/src/Carbon/Lang/id.php index 7111786242..3e6adbc1b0 100644 --- a/src/Carbon/Lang/id.php +++ b/src/Carbon/Lang/id.php @@ -16,6 +16,8 @@ * - JD Isaacks * - Nafies Luthfi * - Raymundus Jati Primanda (mundusjp) + * - diankur313 + * - a-wip0 */ return [ 'year' => ':count tahun', @@ -40,7 +42,7 @@ 'a_second' => '{1}beberapa detik|]1,Inf[:count detik', 's' => ':countdt', 'ago' => ':time yang lalu', - 'from_now' => 'dalam :time', + 'from_now' => ':time dari sekarang', 'after' => ':time setelahnya', 'before' => ':time sebelumnya', 'formats' => [ diff --git a/src/Carbon/Lang/in.php b/src/Carbon/Lang/in.php index bf08ace911..406112af8b 100644 --- a/src/Carbon/Lang/in.php +++ b/src/Carbon/Lang/in.php @@ -8,49 +8,4 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -return array_replace_recursive(require __DIR__.'/en.php', [ - 'months' => ['Januari', 'Februari', 'Maret', 'April', 'Mei', 'Juni', 'Juli', 'Agustus', 'September', 'Oktober', 'November', 'Desember'], - 'months_short' => ['Jan', 'Feb', 'Mar', 'Apr', 'Mei', 'Jun', 'Jul', 'Agu', 'Sep', 'Okt', 'Nov', 'Des'], - 'weekdays' => ['Minggu', 'Senin', 'Selasa', 'Rabu', 'Kamis', 'Jumat', 'Sabtu'], - 'weekdays_short' => ['Min', 'Sen', 'Sel', 'Rab', 'Kam', 'Jum', 'Sab'], - 'weekdays_min' => ['M', 'S', 'S', 'R', 'K', 'J', 'S'], - 'formats' => [ - 'LT' => 'HH.mm', - 'LTS' => 'HH.mm.ss', - 'L' => 'DD/MM/YYYY', - 'LL' => 'D MMM YYYY', - 'LLL' => 'D MMMM YYYY HH.mm', - 'LLLL' => 'dddd, DD MMMM YYYY HH.mm', - ], - - 'year' => 'tahun :count', - 'y' => 'tahun :count', - 'a_year' => 'tahun :count', - - 'month' => ':count bulan', - 'm' => ':count bulan', - 'a_month' => ':count bulan', - - 'week' => ':count minggu', - 'w' => ':count minggu', - 'a_week' => ':count minggu', - - 'day' => ':count hari', - 'd' => ':count hari', - 'a_day' => ':count hari', - - 'hour' => ':count jam', - 'h' => ':count jam', - 'a_hour' => ':count jam', - - 'minute' => ':count menit', - 'min' => ':count menit', - 'a_minute' => ':count menit', - - 'second' => ':count detik', - 's' => ':count detik', - 'a_second' => ':count detik', - - 'ago' => ':time yang lalu', - 'from_now' => 'dalam :time', -]); +return require __DIR__.'/id.php'; diff --git a/src/Carbon/Lang/ms.php b/src/Carbon/Lang/ms.php index 6a3749e489..7a5c493f1a 100644 --- a/src/Carbon/Lang/ms.php +++ b/src/Carbon/Lang/ms.php @@ -34,7 +34,7 @@ 'second' => '{1}beberapa saat|]1,Inf[:count saat', 's' => ':count saat', 'ago' => ':time yang lepas', - 'from_now' => 'dalam :time', + 'from_now' => ':time dari sekarang', 'after' => ':time selepas', 'before' => ':time sebelum', 'formats' => [ diff --git a/src/Carbon/Lang/ru.php b/src/Carbon/Lang/ru.php index caf9b7a12d..ee03503491 100644 --- a/src/Carbon/Lang/ru.php +++ b/src/Carbon/Lang/ru.php @@ -33,6 +33,7 @@ * - Pavel Skripkin (psxx) * - AlexWalkerson * - Vladislav UnsealedOne + * - dima-bzz */ $transformDiff = function ($input) { return strtr($input, [ diff --git a/tests/Localization/IdIdTest.php b/tests/Localization/IdIdTest.php index 8fe0bd43a0..80fb9856f9 100644 --- a/tests/Localization/IdIdTest.php +++ b/tests/Localization/IdIdTest.php @@ -175,9 +175,9 @@ class IdIdTest extends LocalizationTestCase // Carbon::now()->subYears(2)->diffForHumans(null, false, true) '2thn yang lalu', // Carbon::now()->addSecond()->diffForHumans() - 'dalam 1 detik', + '1 detik dari sekarang', // Carbon::now()->addSecond()->diffForHumans(null, false, true) - 'dalam 1dt', + '1dt dari sekarang', // Carbon::now()->addSecond()->diffForHumans(Carbon::now()) '1 detik setelahnya', // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), false, true) @@ -195,13 +195,13 @@ class IdIdTest extends LocalizationTestCase // Carbon::now()->diffForHumans(Carbon::now()->addSecond()->addSecond(), true, true) '2dt', // Carbon::now()->addSecond()->diffForHumans(null, false, true, 1) - 'dalam 1dt', + '1dt dari sekarang', // Carbon::now()->addMinute()->addSecond()->diffForHumans(null, true, false, 2) '1 menit 1 detik', // Carbon::now()->addYears(2)->addMonths(3)->addDay()->addSecond()->diffForHumans(null, true, true, 4) '2thn 3bln 1hr 1dt', // Carbon::now()->addYears(3)->diffForHumans(null, null, false, 4) - 'dalam 3 tahun', + '3 tahun dari sekarang', // Carbon::now()->subMonths(5)->diffForHumans(null, null, true, 4) '5bln yang lalu', // Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4) @@ -213,11 +213,11 @@ class IdIdTest extends LocalizationTestCase // Carbon::now()->addWeek()->addDays(6)->diffForHumans(null, true, false, 2) '1 minggu 6 hari', // Carbon::now()->addWeek()->addDays(6)->diffForHumans(["join" => true, "parts" => 2]) - 'dalam 1 minggu dan 6 hari', + '1 minggu dan 6 hari dari sekarang', // Carbon::now()->addWeeks(2)->addHour()->diffForHumans(null, true, false, 2) '2 minggu 1 jam', // Carbon::now()->addHour()->diffForHumans(["aUnit" => true]) - 'dalam sejam', + 'sejam dari sekarang', // CarbonInterval::days(2)->forHumans() '2 hari', // CarbonInterval::create('P1DT3H')->forHumans(true) diff --git a/tests/Localization/IdTest.php b/tests/Localization/IdTest.php index 978bbc9cb9..809d8f8f18 100644 --- a/tests/Localization/IdTest.php +++ b/tests/Localization/IdTest.php @@ -175,9 +175,9 @@ class IdTest extends LocalizationTestCase // Carbon::now()->subYears(2)->diffForHumans(null, false, true) '2thn yang lalu', // Carbon::now()->addSecond()->diffForHumans() - 'dalam 1 detik', + '1 detik dari sekarang', // Carbon::now()->addSecond()->diffForHumans(null, false, true) - 'dalam 1dt', + '1dt dari sekarang', // Carbon::now()->addSecond()->diffForHumans(Carbon::now()) '1 detik setelahnya', // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), false, true) @@ -195,13 +195,13 @@ class IdTest extends LocalizationTestCase // Carbon::now()->diffForHumans(Carbon::now()->addSecond()->addSecond(), true, true) '2dt', // Carbon::now()->addSecond()->diffForHumans(null, false, true, 1) - 'dalam 1dt', + '1dt dari sekarang', // Carbon::now()->addMinute()->addSecond()->diffForHumans(null, true, false, 2) '1 menit 1 detik', // Carbon::now()->addYears(2)->addMonths(3)->addDay()->addSecond()->diffForHumans(null, true, true, 4) '2thn 3bln 1hr 1dt', // Carbon::now()->addYears(3)->diffForHumans(null, null, false, 4) - 'dalam 3 tahun', + '3 tahun dari sekarang', // Carbon::now()->subMonths(5)->diffForHumans(null, null, true, 4) '5bln yang lalu', // Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4) @@ -213,11 +213,11 @@ class IdTest extends LocalizationTestCase // Carbon::now()->addWeek()->addDays(6)->diffForHumans(null, true, false, 2) '1 minggu 6 hari', // Carbon::now()->addWeek()->addDays(6)->diffForHumans(["join" => true, "parts" => 2]) - 'dalam 1 minggu dan 6 hari', + '1 minggu dan 6 hari dari sekarang', // Carbon::now()->addWeeks(2)->addHour()->diffForHumans(null, true, false, 2) '2 minggu 1 jam', // Carbon::now()->addHour()->diffForHumans(["aUnit" => true]) - 'dalam sejam', + 'sejam dari sekarang', // CarbonInterval::days(2)->forHumans() '2 hari', // CarbonInterval::create('P1DT3H')->forHumans(true) diff --git a/tests/Localization/InTest.php b/tests/Localization/InTest.php index 794c23bbf3..383d930e7a 100644 --- a/tests/Localization/InTest.php +++ b/tests/Localization/InTest.php @@ -17,195 +17,195 @@ class InTest extends LocalizationTestCase const CASES = [ // Carbon::parse('2018-01-04 00:00:00')->addDays(1)->calendar(Carbon::parse('2018-01-04 00:00:00')) - 'Tomorrow at 00.00', + 'Besok pukul 00.00', // Carbon::parse('2018-01-04 00:00:00')->addDays(2)->calendar(Carbon::parse('2018-01-04 00:00:00')) - 'Sabtu at 00.00', + 'Sabtu pukul 00.00', // Carbon::parse('2018-01-04 00:00:00')->addDays(3)->calendar(Carbon::parse('2018-01-04 00:00:00')) - 'Minggu at 00.00', + 'Minggu pukul 00.00', // Carbon::parse('2018-01-04 00:00:00')->addDays(4)->calendar(Carbon::parse('2018-01-04 00:00:00')) - 'Senin at 00.00', + 'Senin pukul 00.00', // Carbon::parse('2018-01-04 00:00:00')->addDays(5)->calendar(Carbon::parse('2018-01-04 00:00:00')) - 'Selasa at 00.00', + 'Selasa pukul 00.00', // Carbon::parse('2018-01-04 00:00:00')->addDays(6)->calendar(Carbon::parse('2018-01-04 00:00:00')) - 'Rabu at 00.00', + 'Rabu pukul 00.00', // Carbon::parse('2018-01-05 00:00:00')->addDays(6)->calendar(Carbon::parse('2018-01-05 00:00:00')) - 'Kamis at 00.00', + 'Kamis pukul 00.00', // Carbon::parse('2018-01-06 00:00:00')->addDays(6)->calendar(Carbon::parse('2018-01-06 00:00:00')) - 'Jumat at 00.00', + 'Jumat pukul 00.00', // Carbon::parse('2018-01-07 00:00:00')->addDays(2)->calendar(Carbon::parse('2018-01-07 00:00:00')) - 'Selasa at 00.00', + 'Selasa pukul 00.00', // Carbon::parse('2018-01-07 00:00:00')->addDays(3)->calendar(Carbon::parse('2018-01-07 00:00:00')) - 'Rabu at 00.00', + 'Rabu pukul 00.00', // Carbon::parse('2018-01-07 00:00:00')->addDays(4)->calendar(Carbon::parse('2018-01-07 00:00:00')) - 'Kamis at 00.00', + 'Kamis pukul 00.00', // Carbon::parse('2018-01-07 00:00:00')->addDays(5)->calendar(Carbon::parse('2018-01-07 00:00:00')) - 'Jumat at 00.00', + 'Jumat pukul 00.00', // Carbon::parse('2018-01-07 00:00:00')->addDays(6)->calendar(Carbon::parse('2018-01-07 00:00:00')) - 'Sabtu at 00.00', + 'Sabtu pukul 00.00', // Carbon::now()->subDays(2)->calendar() - 'Last Minggu at 20.49', + 'Minggu lalu pukul 20.49', // Carbon::parse('2018-01-04 00:00:00')->subHours(2)->calendar(Carbon::parse('2018-01-04 00:00:00')) - 'Yesterday at 22.00', + 'Kemarin pukul 22.00', // Carbon::parse('2018-01-04 12:00:00')->subHours(2)->calendar(Carbon::parse('2018-01-04 12:00:00')) - 'Today at 10.00', + 'Hari ini pukul 10.00', // Carbon::parse('2018-01-04 00:00:00')->addHours(2)->calendar(Carbon::parse('2018-01-04 00:00:00')) - 'Today at 02.00', + 'Hari ini pukul 02.00', // Carbon::parse('2018-01-04 23:00:00')->addHours(2)->calendar(Carbon::parse('2018-01-04 23:00:00')) - 'Tomorrow at 01.00', + 'Besok pukul 01.00', // Carbon::parse('2018-01-07 00:00:00')->addDays(2)->calendar(Carbon::parse('2018-01-07 00:00:00')) - 'Selasa at 00.00', + 'Selasa pukul 00.00', // Carbon::parse('2018-01-08 00:00:00')->subDay()->calendar(Carbon::parse('2018-01-08 00:00:00')) - 'Yesterday at 00.00', + 'Kemarin pukul 00.00', // Carbon::parse('2018-01-04 00:00:00')->subDays(1)->calendar(Carbon::parse('2018-01-04 00:00:00')) - 'Yesterday at 00.00', + 'Kemarin pukul 00.00', // Carbon::parse('2018-01-04 00:00:00')->subDays(2)->calendar(Carbon::parse('2018-01-04 00:00:00')) - 'Last Selasa at 00.00', + 'Selasa lalu pukul 00.00', // Carbon::parse('2018-01-04 00:00:00')->subDays(3)->calendar(Carbon::parse('2018-01-04 00:00:00')) - 'Last Senin at 00.00', + 'Senin lalu pukul 00.00', // Carbon::parse('2018-01-04 00:00:00')->subDays(4)->calendar(Carbon::parse('2018-01-04 00:00:00')) - 'Last Minggu at 00.00', + 'Minggu lalu pukul 00.00', // Carbon::parse('2018-01-04 00:00:00')->subDays(5)->calendar(Carbon::parse('2018-01-04 00:00:00')) - 'Last Sabtu at 00.00', + 'Sabtu lalu pukul 00.00', // Carbon::parse('2018-01-04 00:00:00')->subDays(6)->calendar(Carbon::parse('2018-01-04 00:00:00')) - 'Last Jumat at 00.00', + 'Jumat lalu pukul 00.00', // Carbon::parse('2018-01-03 00:00:00')->subDays(6)->calendar(Carbon::parse('2018-01-03 00:00:00')) - 'Last Kamis at 00.00', + 'Kamis lalu pukul 00.00', // Carbon::parse('2018-01-02 00:00:00')->subDays(6)->calendar(Carbon::parse('2018-01-02 00:00:00')) - 'Last Rabu at 00.00', + 'Rabu lalu pukul 00.00', // Carbon::parse('2018-01-07 00:00:00')->subDays(2)->calendar(Carbon::parse('2018-01-07 00:00:00')) - 'Last Jumat at 00.00', + 'Jumat lalu pukul 00.00', // Carbon::parse('2018-01-01 00:00:00')->isoFormat('Qo Mo Do Wo wo') - '1st 1st 1st 1st 1st', + '1 1 1 1 1', // Carbon::parse('2018-01-02 00:00:00')->isoFormat('Do wo') - '2nd 1st', + '2 1', // Carbon::parse('2018-01-03 00:00:00')->isoFormat('Do wo') - '3rd 1st', + '3 1', // Carbon::parse('2018-01-04 00:00:00')->isoFormat('Do wo') - '4th 1st', + '4 1', // Carbon::parse('2018-01-05 00:00:00')->isoFormat('Do wo') - '5th 1st', + '5 1', // Carbon::parse('2018-01-06 00:00:00')->isoFormat('Do wo') - '6th 1st', + '6 1', // Carbon::parse('2018-01-07 00:00:00')->isoFormat('Do wo') - '7th 2nd', + '7 1', // Carbon::parse('2018-01-11 00:00:00')->isoFormat('Do wo') - '11th 2nd', + '11 2', // Carbon::parse('2018-02-09 00:00:00')->isoFormat('DDDo') - '40th', + '40', // Carbon::parse('2018-02-10 00:00:00')->isoFormat('DDDo') - '41st', + '41', // Carbon::parse('2018-04-10 00:00:00')->isoFormat('DDDo') - '100th', + '100', // Carbon::parse('2018-02-10 00:00:00', 'Europe/Paris')->isoFormat('h:mm a z') - '12:00 am cet', + '12:00 pagi cet', // Carbon::parse('2018-02-10 00:00:00')->isoFormat('h:mm A, h:mm a') - '12:00 AM, 12:00 am', + '12:00 pagi, 12:00 pagi', // Carbon::parse('2018-02-10 01:30:00')->isoFormat('h:mm A, h:mm a') - '1:30 AM, 1:30 am', + '1:30 pagi, 1:30 pagi', // Carbon::parse('2018-02-10 02:00:00')->isoFormat('h:mm A, h:mm a') - '2:00 AM, 2:00 am', + '2:00 pagi, 2:00 pagi', // Carbon::parse('2018-02-10 06:00:00')->isoFormat('h:mm A, h:mm a') - '6:00 AM, 6:00 am', + '6:00 pagi, 6:00 pagi', // Carbon::parse('2018-02-10 10:00:00')->isoFormat('h:mm A, h:mm a') - '10:00 AM, 10:00 am', + '10:00 pagi, 10:00 pagi', // Carbon::parse('2018-02-10 12:00:00')->isoFormat('h:mm A, h:mm a') - '12:00 PM, 12:00 pm', + '12:00 siang, 12:00 siang', // Carbon::parse('2018-02-10 17:00:00')->isoFormat('h:mm A, h:mm a') - '5:00 PM, 5:00 pm', + '5:00 sore, 5:00 sore', // Carbon::parse('2018-02-10 21:30:00')->isoFormat('h:mm A, h:mm a') - '9:30 PM, 9:30 pm', + '9:30 malam, 9:30 malam', // Carbon::parse('2018-02-10 23:00:00')->isoFormat('h:mm A, h:mm a') - '11:00 PM, 11:00 pm', + '11:00 malam, 11:00 malam', // Carbon::parse('2018-01-01 00:00:00')->ordinal('hour') - '0th', + '0', // Carbon::now()->subSeconds(1)->diffForHumans() '1 detik yang lalu', // Carbon::now()->subSeconds(1)->diffForHumans(null, false, true) - '1 detik yang lalu', + '1dt yang lalu', // Carbon::now()->subSeconds(2)->diffForHumans() '2 detik yang lalu', // Carbon::now()->subSeconds(2)->diffForHumans(null, false, true) - '2 detik yang lalu', + '2dt yang lalu', // Carbon::now()->subMinutes(1)->diffForHumans() '1 menit yang lalu', // Carbon::now()->subMinutes(1)->diffForHumans(null, false, true) - '1 menit yang lalu', + '1mnt yang lalu', // Carbon::now()->subMinutes(2)->diffForHumans() '2 menit yang lalu', // Carbon::now()->subMinutes(2)->diffForHumans(null, false, true) - '2 menit yang lalu', + '2mnt yang lalu', // Carbon::now()->subHours(1)->diffForHumans() '1 jam yang lalu', // Carbon::now()->subHours(1)->diffForHumans(null, false, true) - '1 jam yang lalu', + '1j yang lalu', // Carbon::now()->subHours(2)->diffForHumans() '2 jam yang lalu', // Carbon::now()->subHours(2)->diffForHumans(null, false, true) - '2 jam yang lalu', + '2j yang lalu', // Carbon::now()->subDays(1)->diffForHumans() '1 hari yang lalu', // Carbon::now()->subDays(1)->diffForHumans(null, false, true) - '1 hari yang lalu', + '1hr yang lalu', // Carbon::now()->subDays(2)->diffForHumans() '2 hari yang lalu', // Carbon::now()->subDays(2)->diffForHumans(null, false, true) - '2 hari yang lalu', + '2hr yang lalu', // Carbon::now()->subWeeks(1)->diffForHumans() '1 minggu yang lalu', // Carbon::now()->subWeeks(1)->diffForHumans(null, false, true) - '1 minggu yang lalu', + '1mgg yang lalu', // Carbon::now()->subWeeks(2)->diffForHumans() '2 minggu yang lalu', // Carbon::now()->subWeeks(2)->diffForHumans(null, false, true) - '2 minggu yang lalu', + '2mgg yang lalu', // Carbon::now()->subMonths(1)->diffForHumans() '1 bulan yang lalu', // Carbon::now()->subMonths(1)->diffForHumans(null, false, true) - '1 bulan yang lalu', + '1bln yang lalu', // Carbon::now()->subMonths(2)->diffForHumans() '2 bulan yang lalu', // Carbon::now()->subMonths(2)->diffForHumans(null, false, true) - '2 bulan yang lalu', + '2bln yang lalu', // Carbon::now()->subYears(1)->diffForHumans() - 'tahun 1 yang lalu', + '1 tahun yang lalu', // Carbon::now()->subYears(1)->diffForHumans(null, false, true) - 'tahun 1 yang lalu', + '1thn yang lalu', // Carbon::now()->subYears(2)->diffForHumans() - 'tahun 2 yang lalu', + '2 tahun yang lalu', // Carbon::now()->subYears(2)->diffForHumans(null, false, true) - 'tahun 2 yang lalu', + '2thn yang lalu', // Carbon::now()->addSecond()->diffForHumans() - 'dalam 1 detik', + '1 detik dari sekarang', // Carbon::now()->addSecond()->diffForHumans(null, false, true) - 'dalam 1 detik', + '1dt dari sekarang', // Carbon::now()->addSecond()->diffForHumans(Carbon::now()) - '1 detik after', + '1 detik setelahnya', // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), false, true) - '1 detik after', + '1dt setelahnya', // Carbon::now()->diffForHumans(Carbon::now()->addSecond()) - '1 detik before', + '1 detik sebelumnya', // Carbon::now()->diffForHumans(Carbon::now()->addSecond(), false, true) - '1 detik before', + '1dt sebelumnya', // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), true) '1 detik', // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), true, true) - '1 detik', + '1dt', // Carbon::now()->diffForHumans(Carbon::now()->addSecond()->addSecond(), true) '2 detik', // Carbon::now()->diffForHumans(Carbon::now()->addSecond()->addSecond(), true, true) - '2 detik', + '2dt', // Carbon::now()->addSecond()->diffForHumans(null, false, true, 1) - 'dalam 1 detik', + '1dt dari sekarang', // Carbon::now()->addMinute()->addSecond()->diffForHumans(null, true, false, 2) '1 menit 1 detik', // Carbon::now()->addYears(2)->addMonths(3)->addDay()->addSecond()->diffForHumans(null, true, true, 4) - 'tahun 2 3 bulan 1 hari 1 detik', + '2thn 3bln 1hr 1dt', // Carbon::now()->addYears(3)->diffForHumans(null, null, false, 4) - 'dalam tahun 3', + '3 tahun dari sekarang', // Carbon::now()->subMonths(5)->diffForHumans(null, null, true, 4) - '5 bulan yang lalu', + '5bln yang lalu', // Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4) - 'tahun 2 3 bulan 1 hari 1 detik yang lalu', + '2thn 3bln 1hr 1dt yang lalu', // Carbon::now()->addWeek()->addHours(10)->diffForHumans(null, true, false, 2) '1 minggu 10 jam', // Carbon::now()->addWeek()->addDays(6)->diffForHumans(null, true, false, 2) @@ -213,14 +213,14 @@ class InTest extends LocalizationTestCase // Carbon::now()->addWeek()->addDays(6)->diffForHumans(null, true, false, 2) '1 minggu 6 hari', // Carbon::now()->addWeek()->addDays(6)->diffForHumans(["join" => true, "parts" => 2]) - 'dalam 1 minggu and 6 hari', + '1 minggu dan 6 hari dari sekarang', // Carbon::now()->addWeeks(2)->addHour()->diffForHumans(null, true, false, 2) '2 minggu 1 jam', // Carbon::now()->addHour()->diffForHumans(["aUnit" => true]) - 'dalam 1 jam', + 'sejam dari sekarang', // CarbonInterval::days(2)->forHumans() '2 hari', // CarbonInterval::create('P1DT3H')->forHumans(true) - '1 hari 3 jam', + '1hr 3j', ]; } diff --git a/tests/Localization/MsBnTest.php b/tests/Localization/MsBnTest.php index 103bbcb748..c9f2446266 100644 --- a/tests/Localization/MsBnTest.php +++ b/tests/Localization/MsBnTest.php @@ -175,9 +175,9 @@ class MsBnTest extends LocalizationTestCase // Carbon::now()->subYears(2)->diffForHumans(null, false, true) '2 tahun yang lepas', // Carbon::now()->addSecond()->diffForHumans() - 'dalam beberapa saat', + 'beberapa saat dari sekarang', // Carbon::now()->addSecond()->diffForHumans(null, false, true) - 'dalam 1 saat', + '1 saat dari sekarang', // Carbon::now()->addSecond()->diffForHumans(Carbon::now()) 'beberapa saat selepas', // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), false, true) @@ -195,13 +195,13 @@ class MsBnTest extends LocalizationTestCase // Carbon::now()->diffForHumans(Carbon::now()->addSecond()->addSecond(), true, true) '2 saat', // Carbon::now()->addSecond()->diffForHumans(null, false, true, 1) - 'dalam 1 saat', + '1 saat dari sekarang', // Carbon::now()->addMinute()->addSecond()->diffForHumans(null, true, false, 2) 'seminit beberapa saat', // Carbon::now()->addYears(2)->addMonths(3)->addDay()->addSecond()->diffForHumans(null, true, true, 4) '2 tahun 3 bulan 1 hari 1 saat', // Carbon::now()->addYears(3)->diffForHumans(null, null, false, 4) - 'dalam 3 tahun', + '3 tahun dari sekarang', // Carbon::now()->subMonths(5)->diffForHumans(null, null, true, 4) '5 bulan yang lepas', // Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4) @@ -213,11 +213,11 @@ class MsBnTest extends LocalizationTestCase // Carbon::now()->addWeek()->addDays(6)->diffForHumans(null, true, false, 2) 'seminggu 6 hari', // Carbon::now()->addWeek()->addDays(6)->diffForHumans(["join" => true, "parts" => 2]) - 'dalam seminggu dan 6 hari', + 'seminggu dan 6 hari dari sekarang', // Carbon::now()->addWeeks(2)->addHour()->diffForHumans(null, true, false, 2) '2 minggu sejam', // Carbon::now()->addHour()->diffForHumans(["aUnit" => true]) - 'dalam sejam', + 'sejam dari sekarang', // CarbonInterval::days(2)->forHumans() '2 hari', // CarbonInterval::create('P1DT3H')->forHumans(true) diff --git a/tests/Localization/MsMyTest.php b/tests/Localization/MsMyTest.php index 7bba484338..a910670432 100644 --- a/tests/Localization/MsMyTest.php +++ b/tests/Localization/MsMyTest.php @@ -175,9 +175,9 @@ class MsMyTest extends LocalizationTestCase // Carbon::now()->subYears(2)->diffForHumans(null, false, true) '2 tahun yang lepas', // Carbon::now()->addSecond()->diffForHumans() - 'dalam beberapa saat', + 'beberapa saat dari sekarang', // Carbon::now()->addSecond()->diffForHumans(null, false, true) - 'dalam 1 saat', + '1 saat dari sekarang', // Carbon::now()->addSecond()->diffForHumans(Carbon::now()) 'beberapa saat selepas', // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), false, true) @@ -195,13 +195,13 @@ class MsMyTest extends LocalizationTestCase // Carbon::now()->diffForHumans(Carbon::now()->addSecond()->addSecond(), true, true) '2 saat', // Carbon::now()->addSecond()->diffForHumans(null, false, true, 1) - 'dalam 1 saat', + '1 saat dari sekarang', // Carbon::now()->addMinute()->addSecond()->diffForHumans(null, true, false, 2) 'seminit beberapa saat', // Carbon::now()->addYears(2)->addMonths(3)->addDay()->addSecond()->diffForHumans(null, true, true, 4) '2 tahun 3 bulan 1 hari 1 saat', // Carbon::now()->addYears(3)->diffForHumans(null, null, false, 4) - 'dalam 3 tahun', + '3 tahun dari sekarang', // Carbon::now()->subMonths(5)->diffForHumans(null, null, true, 4) '5 bulan yang lepas', // Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4) @@ -213,11 +213,11 @@ class MsMyTest extends LocalizationTestCase // Carbon::now()->addWeek()->addDays(6)->diffForHumans(null, true, false, 2) 'seminggu 6 hari', // Carbon::now()->addWeek()->addDays(6)->diffForHumans(["join" => true, "parts" => 2]) - 'dalam seminggu dan 6 hari', + 'seminggu dan 6 hari dari sekarang', // Carbon::now()->addWeeks(2)->addHour()->diffForHumans(null, true, false, 2) '2 minggu sejam', // Carbon::now()->addHour()->diffForHumans(["aUnit" => true]) - 'dalam sejam', + 'sejam dari sekarang', // CarbonInterval::days(2)->forHumans() '2 hari', // CarbonInterval::create('P1DT3H')->forHumans(true) diff --git a/tests/Localization/MsSgTest.php b/tests/Localization/MsSgTest.php index b5731dd84e..995a419132 100644 --- a/tests/Localization/MsSgTest.php +++ b/tests/Localization/MsSgTest.php @@ -175,9 +175,9 @@ class MsSgTest extends LocalizationTestCase // Carbon::now()->subYears(2)->diffForHumans(null, false, true) '2 tahun yang lepas', // Carbon::now()->addSecond()->diffForHumans() - 'dalam beberapa saat', + 'beberapa saat dari sekarang', // Carbon::now()->addSecond()->diffForHumans(null, false, true) - 'dalam 1 saat', + '1 saat dari sekarang', // Carbon::now()->addSecond()->diffForHumans(Carbon::now()) 'beberapa saat selepas', // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), false, true) @@ -195,13 +195,13 @@ class MsSgTest extends LocalizationTestCase // Carbon::now()->diffForHumans(Carbon::now()->addSecond()->addSecond(), true, true) '2 saat', // Carbon::now()->addSecond()->diffForHumans(null, false, true, 1) - 'dalam 1 saat', + '1 saat dari sekarang', // Carbon::now()->addMinute()->addSecond()->diffForHumans(null, true, false, 2) 'seminit beberapa saat', // Carbon::now()->addYears(2)->addMonths(3)->addDay()->addSecond()->diffForHumans(null, true, true, 4) '2 tahun 3 bulan 1 hari 1 saat', // Carbon::now()->addYears(3)->diffForHumans(null, null, false, 4) - 'dalam 3 tahun', + '3 tahun dari sekarang', // Carbon::now()->subMonths(5)->diffForHumans(null, null, true, 4) '5 bulan yang lepas', // Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4) @@ -213,11 +213,11 @@ class MsSgTest extends LocalizationTestCase // Carbon::now()->addWeek()->addDays(6)->diffForHumans(null, true, false, 2) 'seminggu 6 hari', // Carbon::now()->addWeek()->addDays(6)->diffForHumans(["join" => true, "parts" => 2]) - 'dalam seminggu dan 6 hari', + 'seminggu dan 6 hari dari sekarang', // Carbon::now()->addWeeks(2)->addHour()->diffForHumans(null, true, false, 2) '2 minggu sejam', // Carbon::now()->addHour()->diffForHumans(["aUnit" => true]) - 'dalam sejam', + 'sejam dari sekarang', // CarbonInterval::days(2)->forHumans() '2 hari', // CarbonInterval::create('P1DT3H')->forHumans(true) diff --git a/tests/Localization/MsTest.php b/tests/Localization/MsTest.php index e5804aec77..e77f6ec4b9 100644 --- a/tests/Localization/MsTest.php +++ b/tests/Localization/MsTest.php @@ -175,9 +175,9 @@ class MsTest extends LocalizationTestCase // Carbon::now()->subYears(2)->diffForHumans(null, false, true) '2 tahun yang lepas', // Carbon::now()->addSecond()->diffForHumans() - 'dalam beberapa saat', + 'beberapa saat dari sekarang', // Carbon::now()->addSecond()->diffForHumans(null, false, true) - 'dalam 1 saat', + '1 saat dari sekarang', // Carbon::now()->addSecond()->diffForHumans(Carbon::now()) 'beberapa saat selepas', // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), false, true) @@ -195,13 +195,13 @@ class MsTest extends LocalizationTestCase // Carbon::now()->diffForHumans(Carbon::now()->addSecond()->addSecond(), true, true) '2 saat', // Carbon::now()->addSecond()->diffForHumans(null, false, true, 1) - 'dalam 1 saat', + '1 saat dari sekarang', // Carbon::now()->addMinute()->addSecond()->diffForHumans(null, true, false, 2) 'seminit beberapa saat', // Carbon::now()->addYears(2)->addMonths(3)->addDay()->addSecond()->diffForHumans(null, true, true, 4) '2 tahun 3 bulan 1 hari 1 saat', // Carbon::now()->addYears(3)->diffForHumans(null, null, false, 4) - 'dalam 3 tahun', + '3 tahun dari sekarang', // Carbon::now()->subMonths(5)->diffForHumans(null, null, true, 4) '5 bulan yang lepas', // Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4) @@ -213,11 +213,11 @@ class MsTest extends LocalizationTestCase // Carbon::now()->addWeek()->addDays(6)->diffForHumans(null, true, false, 2) 'seminggu 6 hari', // Carbon::now()->addWeek()->addDays(6)->diffForHumans(["join" => true, "parts" => 2]) - 'dalam seminggu dan 6 hari', + 'seminggu dan 6 hari dari sekarang', // Carbon::now()->addWeeks(2)->addHour()->diffForHumans(null, true, false, 2) '2 minggu sejam', // Carbon::now()->addHour()->diffForHumans(["aUnit" => true]) - 'dalam sejam', + 'sejam dari sekarang', // CarbonInterval::days(2)->forHumans() '2 hari', // CarbonInterval::create('P1DT3H')->forHumans(true)