Merge pull request #115 from ARCANEDEV/patch-3

Minor Update
ARCANEDEV · Feb 7, 2018 · 5f7c2ec · 5f7c2ec
2 parents 1a99a62 + 2e3afc4
commit 5f7c2ec
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/src/Entities/Locale.php b/src/Entities/Locale.php
@@ -12,6 +12,14 @@
  */
 class Locale implements Arrayable, Jsonable, JsonSerializable
 {
+    /* -----------------------------------------------------------------
+     |  Constants
+     | -----------------------------------------------------------------
+     */
+
+    const DIRECTION_LEFT_TO_RIGHT = 'ltr';
+    const DIRECTION_RIGHT_TO_LEFT = 'rtl';
+
     /* -----------------------------------------------------------------
      |  Properties
      | -----------------------------------------------------------------
@@ -173,9 +181,13 @@ private function setScript($script)
     public function direction()
     {
         if (empty($this->direction)) {
-            $this->direction = in_array($this->script, [
-                'Arab', 'Hebr', 'Mong', 'Tfng', 'Thaa'
-            ]) ? 'rtl' : 'ltr';
+            $rtlScripts = ['Arab', 'Hebr', 'Mong', 'Tfng', 'Thaa'];
+
+            $this->setDirection(
+                in_array($this->script, $rtlScripts)
+                    ? self::DIRECTION_RIGHT_TO_LEFT
+                    : self::DIRECTION_LEFT_TO_RIGHT
+            );
         }
 
         return $this->direction;
@@ -190,9 +202,8 @@ public function direction()
      */
     private function setDirection($direction)
     {
-        if ( ! empty($direction)) {
+        if ( ! empty($direction))
             $this->direction = strtolower($direction);
-        }
 
         return $this;
     }

diff --git a/src/Entities/LocaleCollection.php b/src/Entities/LocaleCollection.php
@@ -92,14 +92,8 @@ public function toNative()
      */
     public function loadFromConfig()
     {
-        $this->loadFromArray(
-            config('localization.locales', [])
-        );
-        $this->setSupportedKeys(
-            config('localization.supported-locales', [])
-        );
-
-        return $this;
+        return $this->loadFromArray(config('localization.locales', []))
+                    ->setSupportedKeys(config('localization.supported-locales', []));
     }
 
     /**