Improve translations logic

index.php

@@ -79,6 +79,32 @@ if (isset($api)) {
     return;
 }
 
+/**
+ * Language
+ */
+/** Determine Locale */
+$userLocale = \Locale::acceptFromHttp($_SERVER['HTTP_ACCEPT_LANGUAGE']);
+$locales    = array_filter(
+    array_map(
+        function ($value) {
+            if ('po' === pathinfo($value, PATHINFO_EXTENSION)) {
+                return pathinfo($value, PATHINFO_FILENAME);
+            }
+        },
+        scandir(ROOT . '/translations')
+    )
+);
+$locale     = \Locale::lookup($locales, $userLocale, false, 'en');
+
+/** Load Translation */
+$translationFilepath = ROOT . '/translations/' . $locale . '.po';
+$translations        = null;
+
+if (file_exists($translationFilepath)) {
+    $loader       = new \Gettext\Loader\PoLoader();
+    $translations = $loader->loadFile($translationFilepath);
+}
+
 /**
  * Install
  */

src/classes/page.php

@@ -157,20 +157,9 @@ class Page
         }
 
         /**
-         * Determine Locale
+         * Locale
          */
-        $userLocale = \Locale::acceptFromHttp($_SERVER['HTTP_ACCEPT_LANGUAGE']);
+        global $locale;
-        $locales    = array_filter(
-            array_map(
-                function ($value) {
-                    if ('po' === pathinfo($value, PATHINFO_EXTENSION)) {
-                        return pathinfo($value, PATHINFO_FILENAME);
-                    }
-                },
-                scandir(ROOT . '/translations')
-            )
-        );
-        $locale     = \Locale::lookup($locales, $userLocale, false, 'en');
 
         $this->language = $locale;
     }

src/functions/gettext.php

@@ -6,24 +6,13 @@
  * @author Jay Trees <github.jay@grandel.anonaddy.me>
  */
 
-use Gettext\Loader\PoLoader;
-
 function __(string $text)
 {
-    global $page;
+    global $translations;
 
-    if (!isset($page->language)) {
+    $translation = null;
-        return $text;
-    }
 
-    /**
+    if ($translations) {
-     * Use file
-     */
-    $translationFilepath = ROOT . '/translations/' . $page->language . '.po';
-
-    if (file_exists($translationFilepath)) {
-        $loader       = new PoLoader();
-        $translations = $loader->loadFile($translationFilepath);
         $translation = $translations->find(null, $text);
 
         if ($translation) {