Skip to content

Commit c139739

Browse files
kylekatarnlskylekatarnls
authored
Merge pull request #49 from CarbonPHP/feature/issue-3019-update-sr-latin
Update month abbreviation for Latin Serbian
2 parents ba40575 + 080429f commit c139739

File tree

9 files changed

+41
-41
lines changed

9 files changed

+41
-41
lines changed

‎src/Carbon/Lang/sr.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
'year' => ':count godina|:count godine|:count godina',
2727
'y' => ':count g.',
2828
'month' => ':count mesec|:count meseca|:count meseci',
29-
'm' => ':count mj.',
29+
'm' => ':count mes.',
3030
'week' => ':count nedelja|:count nedelje|:count nedelja',
3131
'w' => ':count ned.',
3232
'day' => ':count dan|:count dana|:count dana',

‎tests/Localization/MeTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,15 +311,15 @@ class MeTest extends LocalizationTestCase
311311

312312
// Carbon::now()->subMonths(1)->diffForHumans(null, false, true)
313313
// '1mo ago'
314-
'prije 1 mj.',
314+
'prije 1 mes.',
315315

316316
// Carbon::now()->subMonths(2)->diffForHumans()
317317
// '2 months ago'
318318
'prije 2 mjeseca',
319319

320320
// Carbon::now()->subMonths(2)->diffForHumans(null, false, true)
321321
// '2mos ago'
322-
'prije 2 mj.',
322+
'prije 2 mes.',
323323

324324
// Carbon::now()->subYears(1)->diffForHumans()
325325
// '1 year ago'
@@ -387,19 +387,19 @@ class MeTest extends LocalizationTestCase
387387

388388
// Carbon::now()->addYears(2)->addMonths(3)->addDay()->addSecond()->diffForHumans(null, true, true, 4)
389389
// '2yrs 3mos 1d 1s'
390-
'2 g. 3 mj. 1 d. 1 sek.',
390+
'2 g. 3 mes. 1 d. 1 sek.',
391391

392392
// Carbon::now()->addYears(3)->diffForHumans(null, null, false, 4)
393393
// '3 years from now'
394394
'za 3 godine',
395395

396396
// Carbon::now()->subMonths(5)->diffForHumans(null, null, true, 4)
397397
// '5mos ago'
398-
'prije 5 mj.',
398+
'prije 5 mes.',
399399

400400
// Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4)
401401
// '2yrs 3mos 1d 1s ago'
402-
'prije 2 g. 3 mj. 1 d. 1 sek.',
402+
'prije 2 g. 3 mes. 1 d. 1 sek.',
403403

404404
// Carbon::now()->addWeek()->addHours(10)->diffForHumans(null, true, false, 2)
405405
// '1 week 10 hours'

‎tests/Localization/SrLatnBaTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,15 +311,15 @@ class SrLatnBaTest extends LocalizationTestCase
311311

312312
// Carbon::now()->subMonths(1)->diffForHumans(null, false, true)
313313
// '1mo ago'
314-
'pre 1 mj.',
314+
'pre 1 mes.',
315315

316316
// Carbon::now()->subMonths(2)->diffForHumans()
317317
// '2 months ago'
318318
'pre 2 meseca',
319319

320320
// Carbon::now()->subMonths(2)->diffForHumans(null, false, true)
321321
// '2mos ago'
322-
'pre 2 mj.',
322+
'pre 2 mes.',
323323

324324
// Carbon::now()->subYears(1)->diffForHumans()
325325
// '1 year ago'
@@ -387,19 +387,19 @@ class SrLatnBaTest extends LocalizationTestCase
387387

388388
// Carbon::now()->addYears(2)->addMonths(3)->addDay()->addSecond()->diffForHumans(null, true, true, 4)
389389
// '2yrs 3mos 1d 1s'
390-
'2 g. 3 mj. 1 d. 1 sek.',
390+
'2 g. 3 mes. 1 d. 1 sek.',
391391

392392
// Carbon::now()->addYears(3)->diffForHumans(null, null, false, 4)
393393
// '3 years from now'
394394
'za 3 godine',
395395

396396
// Carbon::now()->subMonths(5)->diffForHumans(null, null, true, 4)
397397
// '5mos ago'
398-
'pre 5 mj.',
398+
'pre 5 mes.',
399399

400400
// Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4)
401401
// '2yrs 3mos 1d 1s ago'
402-
'pre 2 g. 3 mj. 1 d. 1 sek.',
402+
'pre 2 g. 3 mes. 1 d. 1 sek.',
403403

404404
// Carbon::now()->addWeek()->addHours(10)->diffForHumans(null, true, false, 2)
405405
// '1 week 10 hours'

‎tests/Localization/SrLatnMeTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,15 +311,15 @@ class SrLatnMeTest extends LocalizationTestCase
311311

312312
// Carbon::now()->subMonths(1)->diffForHumans(null, false, true)
313313
// '1mo ago'
314-
'prije 1 mj.',
314+
'prije 1 mes.',
315315

316316
// Carbon::now()->subMonths(2)->diffForHumans()
317317
// '2 months ago'
318318
'prije 2 mjeseca',
319319

320320
// Carbon::now()->subMonths(2)->diffForHumans(null, false, true)
321321
// '2mos ago'
322-
'prije 2 mj.',
322+
'prije 2 mes.',
323323

324324
// Carbon::now()->subYears(1)->diffForHumans()
325325
// '1 year ago'
@@ -387,19 +387,19 @@ class SrLatnMeTest extends LocalizationTestCase
387387

388388
// Carbon::now()->addYears(2)->addMonths(3)->addDay()->addSecond()->diffForHumans(null, true, true, 4)
389389
// '2yrs 3mos 1d 1s'
390-
'2 g. 3 mj. 1 d. 1 sek.',
390+
'2 g. 3 mes. 1 d. 1 sek.',
391391

392392
// Carbon::now()->addYears(3)->diffForHumans(null, null, false, 4)
393393
// '3 years from now'
394394
'za 3 godine',
395395

396396
// Carbon::now()->subMonths(5)->diffForHumans(null, null, true, 4)
397397
// '5mos ago'
398-
'prije 5 mj.',
398+
'prije 5 mes.',
399399

400400
// Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4)
401401
// '2yrs 3mos 1d 1s ago'
402-
'prije 2 g. 3 mj. 1 d. 1 sek.',
402+
'prije 2 g. 3 mes. 1 d. 1 sek.',
403403

404404
// Carbon::now()->addWeek()->addHours(10)->diffForHumans(null, true, false, 2)
405405
// '1 week 10 hours'

‎tests/Localization/SrLatnTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,15 +311,15 @@ class SrLatnTest extends LocalizationTestCase
311311

312312
// Carbon::now()->subMonths(1)->diffForHumans(null, false, true)
313313
// '1mo ago'
314-
'pre 1 mj.',
314+
'pre 1 mes.',
315315

316316
// Carbon::now()->subMonths(2)->diffForHumans()
317317
// '2 months ago'
318318
'pre 2 meseca',
319319

320320
// Carbon::now()->subMonths(2)->diffForHumans(null, false, true)
321321
// '2mos ago'
322-
'pre 2 mj.',
322+
'pre 2 mes.',
323323

324324
// Carbon::now()->subYears(1)->diffForHumans()
325325
// '1 year ago'
@@ -387,19 +387,19 @@ class SrLatnTest extends LocalizationTestCase
387387

388388
// Carbon::now()->addYears(2)->addMonths(3)->addDay()->addSecond()->diffForHumans(null, true, true, 4)
389389
// '2yrs 3mos 1d 1s'
390-
'2 g. 3 mj. 1 d. 1 sek.',
390+
'2 g. 3 mes. 1 d. 1 sek.',
391391

392392
// Carbon::now()->addYears(3)->diffForHumans(null, null, false, 4)
393393
// '3 years from now'
394394
'za 3 godine',
395395

396396
// Carbon::now()->subMonths(5)->diffForHumans(null, null, true, 4)
397397
// '5mos ago'
398-
'pre 5 mj.',
398+
'pre 5 mes.',
399399

400400
// Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4)
401401
// '2yrs 3mos 1d 1s ago'
402-
'pre 2 g. 3 mj. 1 d. 1 sek.',
402+
'pre 2 g. 3 mes. 1 d. 1 sek.',
403403

404404
// Carbon::now()->addWeek()->addHours(10)->diffForHumans(null, true, false, 2)
405405
// '1 week 10 hours'

‎tests/Localization/SrLatnXkTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,15 +311,15 @@ class SrLatnXkTest extends LocalizationTestCase
311311

312312
// Carbon::now()->subMonths(1)->diffForHumans(null, false, true)
313313
// '1mo ago'
314-
'pre 1 mj.',
314+
'pre 1 mes.',
315315

316316
// Carbon::now()->subMonths(2)->diffForHumans()
317317
// '2 months ago'
318318
'pre 2 meseca',
319319

320320
// Carbon::now()->subMonths(2)->diffForHumans(null, false, true)
321321
// '2mos ago'
322-
'pre 2 mj.',
322+
'pre 2 mes.',
323323

324324
// Carbon::now()->subYears(1)->diffForHumans()
325325
// '1 year ago'
@@ -387,19 +387,19 @@ class SrLatnXkTest extends LocalizationTestCase
387387

388388
// Carbon::now()->addYears(2)->addMonths(3)->addDay()->addSecond()->diffForHumans(null, true, true, 4)
389389
// '2yrs 3mos 1d 1s'
390-
'2 g. 3 mj. 1 d. 1 sek.',
390+
'2 g. 3 mes. 1 d. 1 sek.',
391391

392392
// Carbon::now()->addYears(3)->diffForHumans(null, null, false, 4)
393393
// '3 years from now'
394394
'za 3 godine',
395395

396396
// Carbon::now()->subMonths(5)->diffForHumans(null, null, true, 4)
397397
// '5mos ago'
398-
'pre 5 mj.',
398+
'pre 5 mes.',
399399

400400
// Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4)
401401
// '2yrs 3mos 1d 1s ago'
402-
'pre 2 g. 3 mj. 1 d. 1 sek.',
402+
'pre 2 g. 3 mes. 1 d. 1 sek.',
403403

404404
// Carbon::now()->addWeek()->addHours(10)->diffForHumans(null, true, false, 2)
405405
// '1 week 10 hours'

‎tests/Localization/SrMeTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,15 +311,15 @@ class SrMeTest extends LocalizationTestCase
311311

312312
// Carbon::now()->subMonths(1)->diffForHumans(null, false, true)
313313
// '1mo ago'
314-
'prije 1 mj.',
314+
'prije 1 mes.',
315315

316316
// Carbon::now()->subMonths(2)->diffForHumans()
317317
// '2 months ago'
318318
'prije 2 mjeseca',
319319

320320
// Carbon::now()->subMonths(2)->diffForHumans(null, false, true)
321321
// '2mos ago'
322-
'prije 2 mj.',
322+
'prije 2 mes.',
323323

324324
// Carbon::now()->subYears(1)->diffForHumans()
325325
// '1 year ago'
@@ -387,19 +387,19 @@ class SrMeTest extends LocalizationTestCase
387387

388388
// Carbon::now()->addYears(2)->addMonths(3)->addDay()->addSecond()->diffForHumans(null, true, true, 4)
389389
// '2yrs 3mos 1d 1s'
390-
'2 g. 3 mj. 1 d. 1 sek.',
390+
'2 g. 3 mes. 1 d. 1 sek.',
391391

392392
// Carbon::now()->addYears(3)->diffForHumans(null, null, false, 4)
393393
// '3 years from now'
394394
'za 3 godine',
395395

396396
// Carbon::now()->subMonths(5)->diffForHumans(null, null, true, 4)
397397
// '5mos ago'
398-
'prije 5 mj.',
398+
'prije 5 mes.',
399399

400400
// Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4)
401401
// '2yrs 3mos 1d 1s ago'
402-
'prije 2 g. 3 mj. 1 d. 1 sek.',
402+
'prije 2 g. 3 mes. 1 d. 1 sek.',
403403

404404
// Carbon::now()->addWeek()->addHours(10)->diffForHumans(null, true, false, 2)
405405
// '1 week 10 hours'

‎tests/Localization/SrRsLatinTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,15 +311,15 @@ class SrRsLatinTest extends LocalizationTestCase
311311

312312
// Carbon::now()->subMonths(1)->diffForHumans(null, false, true)
313313
// '1mo ago'
314-
'pre 1 mj.',
314+
'pre 1 mes.',
315315

316316
// Carbon::now()->subMonths(2)->diffForHumans()
317317
// '2 months ago'
318318
'pre 2 meseca',
319319

320320
// Carbon::now()->subMonths(2)->diffForHumans(null, false, true)
321321
// '2mos ago'
322-
'pre 2 mj.',
322+
'pre 2 mes.',
323323

324324
// Carbon::now()->subYears(1)->diffForHumans()
325325
// '1 year ago'
@@ -387,19 +387,19 @@ class SrRsLatinTest extends LocalizationTestCase
387387

388388
// Carbon::now()->addYears(2)->addMonths(3)->addDay()->addSecond()->diffForHumans(null, true, true, 4)
389389
// '2yrs 3mos 1d 1s'
390-
'2 g. 3 mj. 1 d. 1 sek.',
390+
'2 g. 3 mes. 1 d. 1 sek.',
391391

392392
// Carbon::now()->addYears(3)->diffForHumans(null, null, false, 4)
393393
// '3 years from now'
394394
'za 3 godine',
395395

396396
// Carbon::now()->subMonths(5)->diffForHumans(null, null, true, 4)
397397
// '5mos ago'
398-
'pre 5 mj.',
398+
'pre 5 mes.',
399399

400400
// Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4)
401401
// '2yrs 3mos 1d 1s ago'
402-
'pre 2 g. 3 mj. 1 d. 1 sek.',
402+
'pre 2 g. 3 mes. 1 d. 1 sek.',
403403

404404
// Carbon::now()->addWeek()->addHours(10)->diffForHumans(null, true, false, 2)
405405
// '1 week 10 hours'

‎tests/Localization/SrTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,15 +311,15 @@ class SrTest extends LocalizationTestCase
311311

312312
// Carbon::now()->subMonths(1)->diffForHumans(null, false, true)
313313
// '1mo ago'
314-
'pre 1 mj.',
314+
'pre 1 mes.',
315315

316316
// Carbon::now()->subMonths(2)->diffForHumans()
317317
// '2 months ago'
318318
'pre 2 meseca',
319319

320320
// Carbon::now()->subMonths(2)->diffForHumans(null, false, true)
321321
// '2mos ago'
322-
'pre 2 mj.',
322+
'pre 2 mes.',
323323

324324
// Carbon::now()->subYears(1)->diffForHumans()
325325
// '1 year ago'
@@ -387,19 +387,19 @@ class SrTest extends LocalizationTestCase
387387

388388
// Carbon::now()->addYears(2)->addMonths(3)->addDay()->addSecond()->diffForHumans(null, true, true, 4)
389389
// '2yrs 3mos 1d 1s'
390-
'2 g. 3 mj. 1 d. 1 sek.',
390+
'2 g. 3 mes. 1 d. 1 sek.',
391391

392392
// Carbon::now()->addYears(3)->diffForHumans(null, null, false, 4)
393393
// '3 years from now'
394394
'za 3 godine',
395395

396396
// Carbon::now()->subMonths(5)->diffForHumans(null, null, true, 4)
397397
// '5mos ago'
398-
'pre 5 mj.',
398+
'pre 5 mes.',
399399

400400
// Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4)
401401
// '2yrs 3mos 1d 1s ago'
402-
'pre 2 g. 3 mj. 1 d. 1 sek.',
402+
'pre 2 g. 3 mes. 1 d. 1 sek.',
403403

404404
// Carbon::now()->addWeek()->addHours(10)->diffForHumans(null, true, false, 2)
405405
// '1 week 10 hours'

0 commit comments

Comments
 (0)