Merge pull request #42 from bolt/hotfix/moar-efficient

Two performance improvements for fetching labels and 'current language'.
BoltTranslate · Feb 16, 2017 · 2c18a11 · 2c18a11
2 parents 957a481 + 200cb93
commit 2c18a11
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/src/Labels.php b/src/Labels.php
@@ -20,6 +20,8 @@ class Labels
     private $filesystemManager;
     /** @var string */
     private $extBasePath;
+    /** @var array */
+    private $loadedlabels = [];
 
     /**
      * Constructor.
@@ -42,7 +44,9 @@ public function __construct(Config $config, SessionInterface $session, Filesyste
      */
     public function getLabels()
     {
-        $labels = [];
+        if (!empty($this->loadedlabels)) {
+            return $this->loadedlabels;
+        }
 
         // Check that the user's JSON file exists, else copy in the default
         if (!$this->filesystemManager->has('config://extensions/labels.json')) {
@@ -81,7 +85,7 @@ public function getLabels()
 
             /** @var \Bolt\Filesystem\Handler\File $file */
             foreach ($finder->files() as $file) {
-                $labels = json_decode($file->read(), true);
+                $this->loadedlabels = json_decode($file->read(), true);
                 continue;
             }
         } catch (\Exception $e) {
@@ -91,7 +95,7 @@ public function getLabels()
             );
         }
 
-        return $labels;
+        return $this->loadedlabels;
     }
 
     /**

diff --git a/src/LabelsExtension.php b/src/LabelsExtension.php
@@ -15,6 +15,9 @@
  */
 class LabelsExtension extends SimpleExtension
 {
+    /** @var string */
+    private $currentlanguage = null;
+
     protected function registerServices(Application $app)
     {
         $app['labels'] = $app->share(
@@ -259,6 +262,7 @@ private function isValidLanguage($lang)
     private function setCurrentLanguage($lang)
     {
         if ($this->isValidLanguage($lang)) {
+            $this->currentlanguage = $lang;
             $app = $this->getContainer();
             $app['twig']->addGlobal('lang', $lang);
         }
@@ -271,12 +275,19 @@ private function setCurrentLanguage($lang)
      */
     private function getCurrentLanguage()
     {
-        $app = $this->getContainer();
-        $twigGlobals = $app['twig']->getGlobals();
-        if (isset($twigGlobals['lang'])) {
-            return $twigGlobals['lang'];
+        if (!empty($this->currentlanguage)) {
+            $lang = $this->currentlanguage;
         } else {
-            return null;
+            $app = $this->getContainer();
+            $twigGlobals = $app['twig']->getGlobals();
+            if (isset($twigGlobals['lang'])) {
+                $lang = $twigGlobals['lang'];
+            } else {
+                $lang = null;
+            }
+            $this->currentlanguage = $lang;
         }
+
+        return $lang;
     }
 }