From afca412a21732563bfe8393de231191ad897257d Mon Sep 17 00:00:00 2001 From: Bram Ceulemans Date: Thu, 11 May 2023 10:41:53 +0100 Subject: [PATCH] Reset translatable display callback after test --- src/Translatable.php | 8 ++++---- tests/TranslatableTest.php | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Translatable.php b/src/Translatable.php index ccfdc0e..935ce75 100644 --- a/src/Translatable.php +++ b/src/Translatable.php @@ -59,7 +59,7 @@ public function __construct(array $fields = []) $this->originalFields = $fields; $this->displayLocalizedNameUsingCallback = self::$displayLocalizedNameByDefaultUsingCallback ?? function (Field $field, string $locale) { - return ucfirst($field->name)." ({$locale})"; + return ucfirst($field->name) . " ({$locale})"; }; $this->createTranslatableFields(); @@ -79,7 +79,7 @@ public function locales(array $locales) return $this; } - public static function displayLocalizedNameByDefaultUsing(Closure $displayLocalizedNameByDefaultUsingCallback) + public static function displayLocalizedNameByDefaultUsing(Closure $displayLocalizedNameByDefaultUsingCallback = null) { static::$displayLocalizedNameByDefaultUsingCallback = $displayLocalizedNameByDefaultUsingCallback; } @@ -131,7 +131,7 @@ protected function createTranslatedField(Field $originalField, string $locale): $translatedField ->resolveUsing(function ($value, Model $model) use ($translatedField, $locale, $originalAttribute) { - $translatedField->attribute = 'translations_'.$originalAttribute.'_'.$locale; + $translatedField->attribute = 'translations_' . $originalAttribute . '_' . $locale; $translatedField->panel = $this->panel; return $model->translations[$originalAttribute][$locale] ?? ''; @@ -165,7 +165,7 @@ protected function onIndexPage(): bool */ private function createTrixUploadField(Trix $field, string $locale): Trix { - return Trix::make('translations_'.$field->attribute.'_'.$locale) + return Trix::make('translations_' . $field->attribute . '_' . $locale) ->withFiles( $field->getStorageDisk(), $field->getStorageDir() diff --git a/tests/TranslatableTest.php b/tests/TranslatableTest.php index 30d64ee..b98f6ea 100644 --- a/tests/TranslatableTest.php +++ b/tests/TranslatableTest.php @@ -82,6 +82,8 @@ public function it_accepts_customize_the_labels_globally() $this->assertEquals('en-title', $translatable->data[0]->name); $this->assertEquals('fr-title', $translatable->data[1]->name); + + Translatable::displayLocalizedNameByDefaultUsing(); } /** @test */