Repository: briannesbitt/Carbon (php)

Issue:
[Translation tool] bs
|English|bs|comments|
|--|--|--|
|2 weeks|2 sedmicu|This should rather be 2 sedmice because that is plural of sedmica|
|2w|2 sedmicu|This should rather be 2 sedmice because that is plural of sedmica|
|1 week|1 sedmice|This should rather be 1 sedmica because that is singular of sedmica|
|a week|1 sedmice|This should rather be 1 sedmica because that is singular of sedmica|


----
Above fix suggestions are for week singular and plural
It follows the same rules as Serbian, which is correct here
2 nedelje = 2 sedmice
1 nedelja = 1 sedmica

Pull request:
Update Bosnian translations
Fix #2990

Patch:
diff --git a/src/Carbon/Lang/bs.php b/src/Carbon/Lang/bs.php
index ca7952c1..52b6d12a 100644
--- a/src/Carbon/Lang/bs.php
+++ b/src/Carbon/Lang/bs.php
@@ -17,6 +17,7 @@
  * - shaishavgandhi05
  * - Serhan Apaydın
  * - JD Isaacks
+ * - Ademir Šehić
  */
 
 use Carbon\CarbonInterface;
@@ -26,8 +27,8 @@ return [
     'y' => ':count godina|:count godine|:count godina',
     'month' => ':count mjesec|:count mjeseca|:count mjeseci',
     'm' => ':count mjesec|:count mjeseca|:count mjeseci',
-    'week' => ':count sedmice|:count sedmicu|:count sedmica',
-    'w' => ':count sedmice|:count sedmicu|:count sedmica',
+    'week' => ':count sedmica|:count sedmice|:count sedmica',
+    'w' => ':count sedmica|:count sedmice|:count sedmica',
     'day' => ':count dan|:count dana|:count dana',
     'd' => ':count dan|:count dana|:count dana',
     'hour' => ':count sat|:count sata|:count sati',
@@ -36,10 +37,17 @@ return [
     'min' => ':count minut|:count minuta|:count minuta',
     'second' => ':count sekund|:count sekunda|:count sekundi',
     's' => ':count sekund|:count sekunda|:count sekundi',
+
     'ago' => 'prije :time',
     'from_now' => 'za :time',
     'after' => 'nakon :time',
     'before' => ':time ranije',
+
+    'year_ago' => ':count godinu|:count godine|:count godina',
+    'year_from_now' => ':count godinu|:count godine|:count godina',
+    'week_ago' => ':count sedmicu|:count sedmice|:count sedmica',
+    'week_from_now' => ':count sedmicu|:count sedmice|:count sedmica',
+
     'diff_now' => 'sada',
     'diff_today' => 'danas',
     'diff_today_regexp' => 'danas(?:\\s+u)?',
diff --git a/src/Carbon/Lang/sr.php b/src/Carbon/Lang/sr.php
index b38be407..faa9fbd1 100644
--- a/src/Carbon/Lang/sr.php
+++ b/src/Carbon/Lang/sr.php
@@ -37,15 +37,16 @@ return [
     'min' => ':count min.',
     'second' => ':count sekundu|:count sekunde|:count sekundi',
     's' => ':count sek.',
+
     'ago' => 'pre :time',
     'from_now' => 'za :time',
     'after' => 'nakon :time',
     'before' => 'pre :time',
 
-    'year_from_now' => ':count godinu|:count godine|:count godina',
     'year_ago' => ':count godinu|:count godine|:count godina',
-    'week_from_now' => ':count nedelju|:count nedelje|:count nedelja',
+    'year_from_now' => ':count godinu|:count godine|:count godina',
     'week_ago' => ':count nedelju|:count nedelje|:count nedelja',
+    'week_from_now' => ':count nedelju|:count nedelje|:count nedelja',
 
     'diff_now' => 'upravo sada',
     'diff_today' => 'danas',


Test patch:
diff --git a/tests/Localization/BsBaTest.php b/tests/Localization/BsBaTest.php
index 611f7410..07116c35 100644
--- a/tests/Localization/BsBaTest.php
+++ b/tests/Localization/BsBaTest.php
@@ -156,13 +156,13 @@ class BsBaTest extends LocalizationTestCase
         // Carbon::now()->subDays(2)->diffForHumans(null, false, true)
         'prije 2 dana',
         // Carbon::now()->subWeeks(1)->diffForHumans()
-        'prije 1 sedmice',
+        'prije 1 sedmicu',
         // Carbon::now()->subWeeks(1)->diffForHumans(null, false, true)
-        'prije 1 sedmice',
+        'prije 1 sedmica',
         // Carbon::now()->subWeeks(2)->diffForHumans()
-        'prije 2 sedmicu',
+        'prije 2 sedmice',
         // Carbon::now()->subWeeks(2)->diffForHumans(null, false, true)
-        'prije 2 sedmicu',
+        'prije 2 sedmice',
         // Carbon::now()->subMonths(1)->diffForHumans()
         'prije 1 mjesec',
         // Carbon::now()->subMonths(1)->diffForHumans(null, false, true)
@@ -172,7 +172,7 @@ class BsBaTest extends LocalizationTestCase
         // Carbon::now()->subMonths(2)->diffForHumans(null, false, true)
         'prije 2 mjeseca',
         // Carbon::now()->subYears(1)->diffForHumans()
-        'prije 1 godina',
+        'prije 1 godinu',
         // Carbon::now()->subYears(1)->diffForHumans(null, false, true)
         'prije 1 godina',
         // Carbon::now()->subYears(2)->diffForHumans()
@@ -212,15 +212,15 @@ class BsBaTest extends LocalizationTestCase
         // Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4)
         'prije 2 godine 3 mjeseca 1 dan 1 sekund',
         // Carbon::now()->addWeek()->addHours(10)->diffForHumans(null, true, false, 2)
-        '1 sedmice 10 sati',
+        '1 sedmica 10 sati',
         // Carbon::now()->addWeek()->addDays(6)->diffForHumans(null, true, false, 2)
-        '1 sedmice 6 dana',
+        '1 sedmica 6 dana',
         // Carbon::now()->addWeek()->addDays(6)->diffForHumans(null, true, false, 2)
-        '1 sedmice 6 dana',
+        '1 sedmica 6 dana',
         // Carbon::now()->addWeek()->addDays(6)->diffForHumans(["join" => true, "parts" => 2])
-        'za 1 sedmice i 6 dana',
+        'za 1 sedmicu i 6 dana',
         // Carbon::now()->addWeeks(2)->addHour()->diffForHumans(null, true, false, 2)
-        '2 sedmicu 1 sat',
+        '2 sedmice 1 sat',
         // Carbon::now()->addHour()->diffForHumans(["aUnit" => true])
         'za 1 sat',
         // CarbonInterval::days(2)->forHumans()
diff --git a/tests/Localization/BsCyrlTest.php b/tests/Localization/BsCyrlTest.php
index f2c44796..72d54896 100644
--- a/tests/Localization/BsCyrlTest.php
+++ b/tests/Localization/BsCyrlTest.php
@@ -156,13 +156,13 @@ class BsCyrlTest extends LocalizationTestCase
         // Carbon::now()->subDays(2)->diffForHumans(null, false, true)
         'prije 2 dana',
         // Carbon::now()->subWeeks(1)->diffForHumans()
-        'prije 1 sedmice',
+        'prije 1 sedmicu',
         // Carbon::now()->subWeeks(1)->diffForHumans(null, false, true)
-        'prije 1 sedmice',
+        'prije 1 sedmica',
         // Carbon::now()->subWeeks(2)->diffForHumans()
-        'prije 2 sedmicu',
+        'prije 2 sedmice',
         // Carbon::now()->subWeeks(2)->diffForHumans(null, false, true)
-        'prije 2 sedmicu',
+        'prije 2 sedmice',
         // Carbon::now()->subMonths(1)->diffForHumans()
         'prije 1 mjesec',
         // Carbon::now()->subMonths(1)->diffForHumans(null, false, true)
@@ -172,7 +172,7 @@ class BsCyrlTest extends LocalizationTestCase
         // Carbon::now()->subMonths(2)->diffForHumans(null, false, true)
         'prije 2 mjeseca',
         // Carbon::now()->subYears(1)->diffForHumans()
-        'prije 1 godina',
+        'prije 1 godinu',
         // Carbon::now()->subYears(1)->diffForHumans(null, false, true)
         'prije 1 godina',
         // Carbon::now()->subYears(2)->diffForHumans()
@@ -212,15 +212,15 @@ class BsCyrlTest extends LocalizationTestCase
         // Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4)
         'prije 2 godine 3 mjeseca 1 dan 1 sekund',
         // Carbon::now()->addWeek()->addHours(10)->diffForHumans(null, true, false, 2)
-        '1 sedmice 10 sati',
+        '1 sedmica 10 sati',
         // Carbon::now()->addWeek()->addDays(6)->diffForHumans(null, true, false, 2)
-        '1 sedmice 6 dana',
+        '1 sedmica 6 dana',
         // Carbon::now()->addWeek()->addDays(6)->diffForHumans(null, true, false, 2)
-        '1 sedmice 6 dana',
+        '1 sedmica 6 dana',
         // Carbon::now()->addWeek()->addDays(6)->diffForHumans(["join" => true, "parts" => 2])
-        'za 1 sedmice i 6 dana',
+        'za 1 sedmicu i 6 dana',
         // Carbon::now()->addWeeks(2)->addHour()->diffForHumans(null, true, false, 2)
-        '2 sedmicu 1 sat',
+        '2 sedmice 1 sat',
         // Carbon::now()->addHour()->diffForHumans(["aUnit" => true])
         'za 1 sat',
         // CarbonInterval::days(2)->forHumans()
diff --git a/tests/Localization/BsLatnTest.php b/tests/Localization/BsLatnTest.php
index 595bc162..a54c9eca 100644
--- a/tests/Localization/BsLatnTest.php
+++ b/tests/Localization/BsLatnTest.php
@@ -156,13 +156,13 @@ class BsLatnTest extends LocalizationTestCase
         // Carbon::now()->subDays(2)->diffForHumans(null, false, true)
         'prije 2 dana',
         // Carbon::now()->subWeeks(1)->diffForHumans()
-        'prije 1 sedmice',
+        'prije 1 sedmicu',
         // Carbon::now()->subWeeks(1)->diffForHumans(null, false, true)
-        'prije 1 sedmice',
+        'prije 1 sedmica',
         // Carbon::now()->subWeeks(2)->diffForHumans()
-        'prije 2 sedmicu',
+        'prije 2 sedmice',
         // Carbon::now()->subWeeks(2)->diffForHumans(null, false, true)
-        'prije 2 sedmicu',
+        'prije 2 sedmice',
         // Carbon::now()->subMonths(1)->diffForHumans()
         'prije 1 mjesec',
         // Carbon::now()->subMonths(1)->diffForHumans(null, false, true)
@@ -172,7 +172,7 @@ class BsLatnTest extends LocalizationTestCase
         // Carbon::now()->subMonths(2)->diffForHumans(null, false, true)
         'prije 2 mjeseca',
         // Carbon::now()->subYears(1)->diffForHumans()
-        'prije 1 godina',
+        'prije 1 godinu',
         // Carbon::now()->subYears(1)->diffForHumans(null, false, true)
         'prije 1 godina',
         // Carbon::now()->subYears(2)->diffForHumans()
@@ -212,15 +212,15 @@ class BsLatnTest extends LocalizationTestCase
         // Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4)
         'prije 2 godine 3 mjeseca 1 dan 1 sekund',
         // Carbon::now()->addWeek()->addHours(10)->diffForHumans(null, true, false, 2)
-        '1 sedmice 10 sati',
+        '1 sedmica 10 sati',
         // Carbon::now()->addWeek()->addDays(6)->diffForHumans(null, true, false, 2)
-        '1 sedmice 6 dana',
+        '1 sedmica 6 dana',
         // Carbon::now()->addWeek()->addDays(6)->diffForHumans(null, true, false, 2)
-        '1 sedmice 6 dana',
+        '1 sedmica 6 dana',
         // Carbon::now()->addWeek()->addDays(6)->diffForHumans(["join" => true, "parts" => 2])
-        'za 1 sedmice i 6 dana',
+        'za 1 sedmicu i 6 dana',
         // Carbon::now()->addWeeks(2)->addHour()->diffForHumans(null, true, false, 2)
-        '2 sedmicu 1 sat',
+        '2 sedmice 1 sat',
         // Carbon::now()->addHour()->diffForHumans(["aUnit" => true])
         'za 1 sat',
         // CarbonInterval::days(2)->forHumans()
diff --git a/tests/Localization/BsTest.php b/tests/Localization/BsTest.php
index cc21400b..9221ef6c 100644
--- a/tests/Localization/BsTest.php
+++ b/tests/Localization/BsTest.php
@@ -156,13 +156,13 @@ class BsTest extends LocalizationTestCase
         // Carbon::now()->subDays(2)->diffForHumans(null, false, true)
         'prije 2 dana',
         // Carbon::now()->subWeeks(1)->diffForHumans()
-        'prije 1 sedmice',
+        'prije 1 sedmicu',
         // Carbon::now()->subWeeks(1)->diffForHumans(null, false, true)
-        'prije 1 sedmice',
+        'prije 1 sedmica',
         // Carbon::now()->subWeeks(2)->diffForHumans()
-        'prije 2 sedmicu',
+        'prije 2 sedmice',
         // Carbon::now()->subWeeks(2)->diffForHumans(null, false, true)
-        'prije 2 sedmicu',
+        'prije 2 sedmice',
         // Carbon::now()->subMonths(1)->diffForHumans()
         'prije 1 mjesec',
         // Carbon::now()->subMonths(1)->diffForHumans(null, false, true)
@@ -172,7 +172,7 @@ class BsTest extends LocalizationTestCase
         // Carbon::now()->subMonths(2)->diffForHumans(null, false, true)
         'prije 2 mjeseca',
         // Carbon::now()->subYears(1)->diffForHumans()
-        'prije 1 godina',
+        'prije 1 godinu',
         // Carbon::now()->subYears(1)->diffForHumans(null, false, true)
         'prije 1 godina',
         // Carbon::now()->subYears(2)->diffForHumans()
@@ -212,15 +212,15 @@ class BsTest extends LocalizationTestCase
         // Carbon::now()->subYears(2)->subMonths(3)->subDay()->subSecond()->diffForHumans(null, null, true, 4)
         'prije 2 godine 3 mjeseca 1 dan 1 sekund',
         // Carbon::now()->addWeek()->addHours(10)->diffForHumans(null, true, false, 2)
-        '1 sedmice 10 sati',
+        '1 sedmica 10 sati',
         // Carbon::now()->addWeek()->addDays(6)->diffForHumans(null, true, false, 2)
-        '1 sedmice 6 dana',
+        '1 sedmica 6 dana',
         // Carbon::now()->addWeek()->addDays(6)->diffForHumans(null, true, false, 2)
-        '1 sedmice 6 dana',
+        '1 sedmica 6 dana',
         // Carbon::now()->addWeek()->addDays(6)->diffForHumans(["join" => true, "parts" => 2])
-        'za 1 sedmice i 6 dana',
+        'za 1 sedmicu i 6 dana',
         // Carbon::now()->addWeeks(2)->addHour()->diffForHumans(null, true, false, 2)
-        '2 sedmicu 1 sat',
+        '2 sedmice 1 sat',
         // Carbon::now()->addHour()->diffForHumans(["aUnit" => true])
         'za 1 sat',
         // CarbonInterval::days(2)->forHumans()
diff --git a/tests/Localization/SrCyrlBaTest.php b/tests/Localization/SrCyrlBaTest.php
index e215b70d..6c871a14 100644
--- a/tests/Localization/SrCyrlBaTest.php
+++ b/tests/Localization/SrCyrlBaTest.php
@@ -162,7 +162,7 @@ class SrCyrlBaTest extends LocalizationTestCase
         '6. 1.',
 
         // Carbon::parse('2018-01-07 00:00:00')->isoFormat('Do wo')
-        // '7th 2nd'
+        // '7th 1st'
         '7. 1.',
 
         // Carbon::parse('2018-01-11 00:00:00')->isoFormat('Do wo')
diff --git a/tests/Localization/SrCyrlMeTest.php b/tests/Localization/SrCyrlMeTest.php
index 95fa5d22..7949ee8c 100644
--- a/tests/Localization/SrCyrlMeTest.php
+++ b/tests/Localization/SrCyrlMeTest.php
@@ -162,7 +162,7 @@ class SrCyrlMeTest extends LocalizationTestCase
         '6. 1.',
 
         // Carbon::parse('2018-01-07 00:00:00')->isoFormat('Do wo')
-        // '7th 2nd'
+        // '7th 1st'
         '7. 1.',
 
         // Carbon::parse('2018-01-11 00:00:00')->isoFormat('Do wo')
diff --git a/tests/Localization/SrCyrlTest.php b/tests/Localization/SrCyrlTest.php
index a64eea93..12ba0117 100644
--- a/tests/Localization/SrCyrlTest.php
+++ b/tests/Localization/SrCyrlTest.php
@@ -162,7 +162,7 @@ class SrCyrlTest extends LocalizationTestCase
         '6. 1.',
 
         // Carbon::parse('2018-01-07 00:00:00')->isoFormat('Do wo')
-        // '7th 2nd'
+        // '7th 1st'
         '7. 1.',
 
         // Carbon::parse('2018-01-11 00:00:00')->isoFormat('Do wo')
diff --git a/tests/Localization/SrCyrlXkTest.php b/tests/Localization/SrCyrlXkTest.php
index cdfca818..df10ca39 100644
--- a/tests/Localization/SrCyrlXkTest.php
+++ b/tests/Localization/SrCyrlXkTest.php
@@ -162,7 +162,7 @@ class SrCyrlXkTest extends LocalizationTestCase
         '6. 1.',
 
         // Carbon::parse('2018-01-07 00:00:00')->isoFormat('Do wo')
-        // '7th 2nd'
+        // '7th 1st'
         '7. 1.',
 
         // Carbon::parse('2018-01-11 00:00:00')->isoFormat('Do wo')
diff --git a/tests/Localization/SrLatnBaTest.php b/tests/Localization/SrLatnBaTest.php
index 8cd81a66..4890394e 100644
--- a/tests/Localization/SrLatnBaTest.php
+++ b/tests/Localization/SrLatnBaTest.php
@@ -162,7 +162,7 @@ class SrLatnBaTest extends LocalizationTestCase
         '6. 1.',
 
         // Carbon::parse('2018-01-07 00:00:00')->isoFormat('Do wo')
-        // '7th 2nd'
+        // '7th 1st'
         '7. 1.',
 
         // Carbon::parse('2018-01-11 00:00:00')->isoFormat('Do wo')
diff --git a/tests/Localization/SrLatnMeTest.php b/tests/Localization/SrLatnMeTest.php
index 95489337..e7a38ff4 100644
--- a/tests/Localization/SrLatnMeTest.php
+++ b/tests/Localization/SrLatnMeTest.php
@@ -162,7 +162,7 @@ class SrLatnMeTest extends LocalizationTestCase
         '6. 1.',
 
         // Carbon::parse('2018-01-07 00:00:00')->isoFormat('Do wo')
-        // '7th 2nd'
+        // '7th 1st'
         '7. 1.',
 
         // Carbon::parse('2018-01-11 00:00:00')->isoFormat('Do wo')
diff --git a/tests/Localization/SrLatnTest.php b/tests/Localization/SrLatnTest.php
index aee81073..65295804 100644
--- a/tests/Localization/SrLatnTest.php
+++ b/tests/Localization/SrLatnTest.php
@@ -162,7 +162,7 @@ class SrLatnTest extends LocalizationTestCase
         '6. 1.',
 
         // Carbon::parse('2018-01-07 00:00:00')->isoFormat('Do wo')
-        // '7th 2nd'
+        // '7th 1st'
         '7. 1.',
 
         // Carbon::parse('2018-01-11 00:00:00')->isoFormat('Do wo')
diff --git a/tests/Localization/SrLatnXkTest.php b/tests/Localization/SrLatnXkTest.php
index 15c2d10a..7aababaa 100644
--- a/tests/Localization/SrLatnXkTest.php
+++ b/tests/Localization/SrLatnXkTest.php
@@ -162,7 +162,7 @@ class SrLatnXkTest extends LocalizationTestCase
         '6. 1.',
 
         // Carbon::parse('2018-01-07 00:00:00')->isoFormat('Do wo')
-        // '7th 2nd'
+        // '7th 1st'
         '7. 1.',
 
         // Carbon::parse('2018-01-11 00:00:00')->isoFormat('Do wo')
diff --git a/tests/Localization/SrMeTest.php b/tests/Localization/SrMeTest.php
index d82370b0..87a1b282 100644
--- a/tests/Localization/SrMeTest.php
+++ b/tests/Localization/SrMeTest.php
@@ -162,7 +162,7 @@ class SrMeTest extends LocalizationTestCase
         '6. 1.',
 
         // Carbon::parse('2018-01-07 00:00:00')->isoFormat('Do wo')
-        // '7th 2nd'
+        // '7th 1st'
         '7. 1.',
 
         // Carbon::parse('2018-01-11 00:00:00')->isoFormat('Do wo')
diff --git a/tests/Localization/SrRsLatinTest.php b/tests/Localization/SrRsLatinTest.php
index 09784842..5da5730c 100644
--- a/tests/Localization/SrRsLatinTest.php
+++ b/tests/Localization/SrRsLatinTest.php
@@ -162,7 +162,7 @@ class SrRsLatinTest extends LocalizationTestCase
         '6. 1.',
 
         // Carbon::parse('2018-01-07 00:00:00')->isoFormat('Do wo')
-        // '7th 2nd'
+        // '7th 1st'
         '7. 1.',
 
         // Carbon::parse('2018-01-11 00:00:00')->isoFormat('Do wo')
diff --git a/tests/Localization/SrRsTest.php b/tests/Localization/SrRsTest.php
index 0b06a505..6d858613 100644
--- a/tests/Localization/SrRsTest.php
+++ b/tests/Localization/SrRsTest.php
@@ -162,7 +162,7 @@ class SrRsTest extends LocalizationTestCase
         '6. 1.',
 
         // Carbon::parse('2018-01-07 00:00:00')->isoFormat('Do wo')
-        // '7th 2nd'
+        // '7th 1st'
         '7. 1.',
 
         // Carbon::parse('2018-01-11 00:00:00')->isoFormat('Do wo')
diff --git a/tests/Localization/SrTest.php b/tests/Localization/SrTest.php
index 5c155706..2b867e10 100644
--- a/tests/Localization/SrTest.php
+++ b/tests/Localization/SrTest.php
@@ -162,7 +162,7 @@ class SrTest extends LocalizationTestCase
         '6. 1.',
 
         // Carbon::parse('2018-01-07 00:00:00')->isoFormat('Do wo')
-        // '7th 2nd'
+        // '7th 1st'
         '7. 1.',
 
         // Carbon::parse('2018-01-11 00:00:00')->isoFormat('Do wo')