From 39584019599656ea0175f6a68cd72572dfecb8cc Mon Sep 17 00:00:00 2001 From: Jesse Leite Date: Wed, 13 Mar 2024 18:36:48 -0400 Subject: [PATCH 1/2] Extract text direction logic for reuse. --- src/Statamic.php | 5 ++--- src/Translator/TextDirection.php | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 src/Translator/TextDirection.php diff --git a/src/Statamic.php b/src/Statamic.php index 531fb51c016..99075bed29f 100644 --- a/src/Statamic.php +++ b/src/Statamic.php @@ -16,6 +16,7 @@ use Statamic\Support\DateFormat; use Statamic\Support\Str; use Statamic\Tags\FluentTag; +use Statamic\Translator\TextDirection; use Stringy\StaticStringy; class Statamic @@ -479,8 +480,6 @@ public static function cpLocale(): string public static function cpDirection() { - $rtl = ['ar', 'fa', 'he', 'ps', 'ur']; - - return in_array(static::cpLocale(), $rtl) ? 'rtl' : 'ltr'; + return TextDirection::getDirection(static::cpLocale()); } } diff --git a/src/Translator/TextDirection.php b/src/Translator/TextDirection.php new file mode 100644 index 00000000000..e8f78ad3332 --- /dev/null +++ b/src/Translator/TextDirection.php @@ -0,0 +1,19 @@ + Date: Wed, 13 Mar 2024 18:59:26 -0400 Subject: [PATCH 2/2] nitpick --- src/Statamic.php | 4 ++-- src/Support/TextDirection.php | 13 +++++++++++++ src/Translator/TextDirection.php | 19 ------------------- 3 files changed, 15 insertions(+), 21 deletions(-) create mode 100644 src/Support/TextDirection.php delete mode 100644 src/Translator/TextDirection.php diff --git a/src/Statamic.php b/src/Statamic.php index 99075bed29f..bb70deea98d 100644 --- a/src/Statamic.php +++ b/src/Statamic.php @@ -15,8 +15,8 @@ use Statamic\Support\Arr; use Statamic\Support\DateFormat; use Statamic\Support\Str; +use Statamic\Support\TextDirection; use Statamic\Tags\FluentTag; -use Statamic\Translator\TextDirection; use Stringy\StaticStringy; class Statamic @@ -480,6 +480,6 @@ public static function cpLocale(): string public static function cpDirection() { - return TextDirection::getDirection(static::cpLocale()); + return TextDirection::of(static::cpLocale()); } } diff --git a/src/Support/TextDirection.php b/src/Support/TextDirection.php new file mode 100644 index 00000000000..642d57065a2 --- /dev/null +++ b/src/Support/TextDirection.php @@ -0,0 +1,13 @@ +