Merge pull request #2825 from briannesbitt/fix/issue-2824-ms-before

Change before Malay translation to "sebelum"
briannesbitt · Jul 23, 2023 · 0dfb27d · 0dfb27d
2 parents eeb761b + f4df5c0
commit 0dfb27d
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 14 deletions.
diff --git a/src/Carbon/Lang/ms.php b/src/Carbon/Lang/ms.php
@@ -48,7 +48,7 @@
     'ago' => ':time yang lepas',
     'from_now' => ':time dari sekarang',
     'after' => ':time kemudian',
-    'before' => ':time lepas',
+    'before' => ':time sebelum',
     'diff_now' => 'sekarang',
     'diff_today' => 'Hari',
     'diff_today_regexp' => 'Hari(?:\\s+ini)?(?:\\s+pukul)?',

diff --git a/tests/CarbonPeriod/MacroTest.php b/tests/CarbonPeriod/MacroTest.php
@@ -25,14 +25,25 @@
 
 class MacroTest extends AbstractTestCase
 {
-    protected function tearDown(): void
+    private function setStaticProperty(string $class, string $property, $value): void
     {
-        $reflection = new ReflectionClass($this->periodClass);
+        $reflection = new ReflectionClass($class);
+
+        if (PHP_VERSION >= 7.4) {
+            $reflection->setStaticPropertyValue($property, $value);
 
-        $macrosProperty = $reflection->getProperty('macros');
+            return;
+        }
 
-        $macrosProperty->setAccessible(true);
-        $macrosProperty->setValue([]);
+        $property = $reflection->getProperty($property);
+
+        $property->setAccessible(true);
+        $property->setValue($value);
+    }
+
+    protected function tearDown(): void
+    {
+        $this->setStaticProperty($this->periodClass, 'macros', []);
 
         parent::tearDown();
     }

diff --git a/tests/Localization/MsBnTest.php b/tests/Localization/MsBnTest.php
@@ -188,9 +188,9 @@ class MsBnTest extends LocalizationTestCase
         // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), false, true)
         '1 saat kemudian',
         // Carbon::now()->diffForHumans(Carbon::now()->addSecond())
-        '1 saat lepas',
+        '1 saat sebelum',
         // Carbon::now()->diffForHumans(Carbon::now()->addSecond(), false, true)
-        '1 saat lepas',
+        '1 saat sebelum',
         // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), true)
         '1 saat',
         // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), true, true)

diff --git a/tests/Localization/MsMyTest.php b/tests/Localization/MsMyTest.php
@@ -188,9 +188,9 @@ class MsMyTest extends LocalizationTestCase
         // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), false, true)
         '1 saat kemudian',
         // Carbon::now()->diffForHumans(Carbon::now()->addSecond())
-        '1 saat lepas',
+        '1 saat sebelum',
         // Carbon::now()->diffForHumans(Carbon::now()->addSecond(), false, true)
-        '1 saat lepas',
+        '1 saat sebelum',
         // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), true)
         '1 saat',
         // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), true, true)

diff --git a/tests/Localization/MsSgTest.php b/tests/Localization/MsSgTest.php
@@ -188,9 +188,9 @@ class MsSgTest extends LocalizationTestCase
         // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), false, true)
         '1 saat kemudian',
         // Carbon::now()->diffForHumans(Carbon::now()->addSecond())
-        '1 saat lepas',
+        '1 saat sebelum',
         // Carbon::now()->diffForHumans(Carbon::now()->addSecond(), false, true)
-        '1 saat lepas',
+        '1 saat sebelum',
         // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), true)
         '1 saat',
         // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), true, true)

diff --git a/tests/Localization/MsTest.php b/tests/Localization/MsTest.php
@@ -188,9 +188,9 @@ class MsTest extends LocalizationTestCase
         // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), false, true)
         '1 saat kemudian',
         // Carbon::now()->diffForHumans(Carbon::now()->addSecond())
-        '1 saat lepas',
+        '1 saat sebelum',
         // Carbon::now()->diffForHumans(Carbon::now()->addSecond(), false, true)
-        '1 saat lepas',
+        '1 saat sebelum',
         // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), true)
         '1 saat',
         // Carbon::now()->addSecond()->diffForHumans(Carbon::now(), true, true)