Defer calls to I18N in colors theme

1 files changed, 88 insertions, 82 deletions

diff --git a/app/Module/ColorsTheme.php b/app/Module/ColorsTheme.php
index c721f38055..ed17c31bed 100644
--- a/app/Module/ColorsTheme.php
+++ b/app/Module/ColorsTheme.php
@@ -24,6 +24,7 @@ use Fisharebest\Webtrees\Session;
 use Fisharebest\Webtrees\Site;
 use Fisharebest\Webtrees\Tree;
 use Symfony\Component\HttpFoundation\Request;
+use function uasort;
 
 /**
  * The colors theme.
@@ -36,12 +37,6 @@ class ColorsTheme extends CloudsTheme
         'U' => 'person_boxNN',
     ];
 
-    /** @var string[] A list of color palettes */
-    protected $palettes;
-
-    /** @var string Which of the color palettes to use on this page */
-    protected $palette;
-
     /**
      * How should this module be labelled on tabs, menus, etc.?
      *
@@ -54,79 +49,6 @@ class ColorsTheme extends CloudsTheme
     }
 
     /**
-     * @param Request   $request
-     * @param Tree|null $tree The current tree (if there is one).
-     */
-    public function __construct(Request $request, ?Tree $tree)
-    {
-        parent::__construct($request, $tree);
-
-        $this->palettes = [
-            /* I18N: The name of a colour-scheme */
-            'aquamarine'       => I18N::translate('Aqua Marine'),
-            /* I18N: The name of a colour-scheme */
-            'ash'              => I18N::translate('Ash'),
-            /* I18N: The name of a colour-scheme */
-            'belgianchocolate' => I18N::translate('Belgian Chocolate'),
-            /* I18N: The name of a colour-scheme */
-            'bluelagoon'       => I18N::translate('Blue Lagoon'),
-            /* I18N: The name of a colour-scheme */
-            'bluemarine'       => I18N::translate('Blue Marine'),
-            /* I18N: The name of a colour-scheme */
-            'coffeeandcream'   => I18N::translate('Coffee and Cream'),
-            /* I18N: The name of a colour-scheme */
-            'coldday'          => I18N::translate('Cold Day'),
-            /* I18N: The name of a colour-scheme */
-            'greenbeam'        => I18N::translate('Green Beam'),
-            /* I18N: The name of a colour-scheme */
-            'mediterranio'     => I18N::translate('Mediterranio'),
-            /* I18N: The name of a colour-scheme */
-            'mercury'          => I18N::translate('Mercury'),
-            /* I18N: The name of a colour-scheme */
-            'nocturnal'        => I18N::translate('Nocturnal'),
-            /* I18N: The name of a colour-scheme */
-            /* I18N: The name of a colour-scheme */
-            'olivia'           => I18N::translate('Olivia'),
-            /* I18N: The name of a colour-scheme */
-            'pinkplastic'      => I18N::translate('Pink Plastic'),
-            /* I18N: The name of a colour-scheme */
-            'sage'             => I18N::translate('Sage'),
-            /* I18N: The name of a colour-scheme */
-            'shinytomato'      => I18N::translate('Shiny Tomato'),
-            /* I18N: The name of a colour-scheme */
-            'tealtop'          => I18N::translate('Teal Top'),
-        ];
-        uasort($this->palettes, '\Fisharebest\Webtrees\I18N::strcasecmp');
-
-        // If we've selected a new palette, and we are logged in, set this value as a default.
-        if (isset($_GET['themecolor']) && array_key_exists($_GET['themecolor'], $this->palettes)) {
-            // Request to change color
-            $this->palette = $_GET['themecolor'];
-            Auth::user()->setPreference('themecolor', $this->palette);
-            if (Auth::isAdmin()) {
-                Site::setPreference('DEFAULT_COLOR_PALETTE', $this->palette);
-            }
-            unset($_GET['themecolor']);
-            // Rember that we have selected a value
-            Session::put('subColor', $this->palette);
-        }
-        // If we are logged in, use our preference
-        $this->palette = Auth::user()->getPreference('themecolor');
-        // If not logged in or no preference, use one we selected earlier in the session?
-        if (!$this->palette) {
-            $this->palette = Session::get('subColor');
-        }
-        // We haven't selected one this session? Use the site default
-        if (!$this->palette) {
-            $this->palette = Site::getPreference('DEFAULT_COLOR_PALETTE');
-        }
-        // Make sure our selected palette actually exists
-        if (!array_key_exists($this->palette, $this->palettes)) {
-            $this->palette = 'ash';
-        }
-    }
-
-    /**
      * Generate a list of items for the user menu.
      *
      * @return Menu[]
@@ -154,7 +76,7 @@ class ColorsTheme extends CloudsTheme
         /* I18N: A colour scheme */
         $menu = new Menu(I18N::translate('Palette'), '#', 'menu-color');
 
-        foreach ($this->palettes as $palette_id => $palette_name) {
+        foreach ($this->palettes() as $palette_id => $palette_name) {
             $url = $this->request->getRequestUri();
             $url = preg_replace('/&themecolor=[a-z]+/', '', $url);
             $url .= '&themecolor=' . $palette_id;
@@ -162,7 +84,7 @@ class ColorsTheme extends CloudsTheme
             $menu->addSubmenu(new Menu(
                 $palette_name,
                 '#',
-                'menu-color-' . $palette_id . ($this->palette === $palette_id ? ' active' : ''),
+                'menu-color-' . $palette_id . ($this->palette() === $palette_id ? ' active' : ''),
                 [
                     'onclick' => 'document.location=\'' . $url . '\'',
                 ]
@@ -181,7 +103,91 @@ class ColorsTheme extends CloudsTheme
     {
         return [
             asset('css/colors.min.css'),
-            asset('css/colors/' . $this->palette . '.min.css'),
+            asset('css/colors/' . $this->palette() . '.min.css'),
+        ];
+    }
+
+    /**
+     * @return string
+     */
+    private function palette(): string {
+        $palettes = $this->palettes();
+
+        // If we've selected a new palette, and we are logged in, set this value as a default.
+        if (isset($_GET['themecolor'])) {
+            // Request to change color
+            $palette = $_GET['themecolor'];
+            Auth::user()->setPreference('themecolor', $palette);
+            if (Auth::isAdmin()) {
+                Site::setPreference('DEFAULT_COLOR_PALETTE', $palette);
+            }
+            unset($_GET['themecolor']);
+            // Rember that we have selected a value
+            Session::put('subColor', $palette);
+        }
+
+        // If we are logged in, use our preference
+        $palette = Auth::user()->getPreference('themecolor');
+
+        // If not logged in or no preference, use one we selected earlier in the session?
+        if (!$palette) {
+            $palette = Session::get('subColor');
+        }
+
+        // We haven't selected one this session? Use the site default
+        if (!$palette) {
+            $palette = Site::getPreference('DEFAULT_COLOR_PALETTE');
+        }
+
+        // Make sure our selected palette actually exists
+        if (!array_key_exists($palette, $palettes)) {
+            $palette = 'ash';
+        }
+
+        return $palette;
+    }
+
+    /**
+     * @return string[]
+     */
+    private function palettes(): array {
+        $palettes = [
+            /* I18N: The name of a colour-scheme */
+            'aquamarine'       => I18N::translate('Aqua Marine'),
+            /* I18N: The name of a colour-scheme */
+            'ash'              => I18N::translate('Ash'),
+            /* I18N: The name of a colour-scheme */
+            'belgianchocolate' => I18N::translate('Belgian Chocolate'),
+            /* I18N: The name of a colour-scheme */
+            'bluelagoon'       => I18N::translate('Blue Lagoon'),
+            /* I18N: The name of a colour-scheme */
+            'bluemarine'       => I18N::translate('Blue Marine'),
+            /* I18N: The name of a colour-scheme */
+            'coffeeandcream'   => I18N::translate('Coffee and Cream'),
+            /* I18N: The name of a colour-scheme */
+            'coldday'          => I18N::translate('Cold Day'),
+            /* I18N: The name of a colour-scheme */
+            'greenbeam'        => I18N::translate('Green Beam'),
+            /* I18N: The name of a colour-scheme */
+            'mediterranio'     => I18N::translate('Mediterranio'),
+            /* I18N: The name of a colour-scheme */
+            'mercury'          => I18N::translate('Mercury'),
+            /* I18N: The name of a colour-scheme */
+            'nocturnal'        => I18N::translate('Nocturnal'),
+            /* I18N: The name of a colour-scheme */
+            'olivia'           => I18N::translate('Olivia'),
+            /* I18N: The name of a colour-scheme */
+            'pinkplastic'      => I18N::translate('Pink Plastic'),
+            /* I18N: The name of a colour-scheme */
+            'sage'             => I18N::translate('Sage'),
+            /* I18N: The name of a colour-scheme */
+            'shinytomato'      => I18N::translate('Shiny Tomato'),
+            /* I18N: The name of a colour-scheme */
+            'tealtop'          => I18N::translate('Teal Top'),
         ];
+
+        uasort($palettes, '\Fisharebest\Webtrees\I18N::strcasecmp');
+
+        return $palettes;
     }
 }