Integrated the automated site per language definition with the rest o…

…f the plugin Contains method name changes, syntax changes and class visibility changes.
pierrestoffe · Jun 2, 2019 · c024ddc · c024ddc
1 parent 418858b
commit c024ddc
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/src/services/LanguageRedirectorService.php b/src/services/LanguageRedirectorService.php
@@ -195,17 +195,18 @@ public function getSiteFromLanguage(string $language = null)
             return null;
         }
 
-        $languages = $this->getLanguages(); 
-        $siteForLanguage = $languages[$language] ?? 0;
+        $sitesPerLanguage = $this->getSitesPerLanguage();
+
+        $siteFromLanguage = $sitesPerLanguage[$language] ?? 0;
 
-        if (is_int($siteForLanguage)) {
-            $site = Craft::$app->sites->getSiteById($siteForLanguage);
+        if (is_int($siteFromLanguage)) {
+            $site = Craft::$app->sites->getSiteById($siteFromLanguage);
 
             if (null != $site) {
                 return $site;
             }
         } else {
-            $site = Craft::$app->sites->getSiteByHandle($siteForLanguage);
+            $site = Craft::$app->sites->getSiteByHandle($siteFromLanguage);
 
             if (null != $site) {
                 return $site;
@@ -215,6 +216,26 @@ public function getSiteFromLanguage(string $language = null)
         return null;
     }
 
+    /**
+     * Get the list of all languages defined in the settings or in the Sites table, and their corresponding Site.
+     *
+     * @return array
+     */
+    public function getSitesPerLanguage()
+    {
+        $languages = LanguageRedirector::getInstance()->getSettings()->languages;
+        if (!empty($languages)) {
+            return $languages;
+        }
+
+        $languages = [];
+        foreach (Craft::$app->sites->getAllSites() as $site) {
+            $languages[$site->language] = (int) $site->id;
+        }
+
+        return $languages;
+    }
+
     // Private Methods
     // =========================================================================
 
@@ -252,7 +273,7 @@ private function _getLanguageFromSession()
      */
     private function _getLanguageFromGuess()
     {
-        $siteLanguages = array_keys($this->getLanguages());
+        $siteLanguages = array_keys($this->getSitesPerLanguage());
 
         // Get exact languages matches (required when working with country specific locales)
         $languages = array_intersect(array_map('strtolower', Craft::$app->getRequest()->getAcceptableLanguages()), array_map('strtolower', $siteLanguages));
@@ -344,25 +365,4 @@ private function _getQueryParameters()
     {
         return $this->_queryParameters;
     }
-
-    /**
-     * Gets the defined site languages from settings or from the sites table.
-     *
-     * @return array
-     */
-    protected function getLanguages()
-    {
-        $languages = LanguageRedirector::getInstance()->getSettings()->languages;
-        if (!empty($languages)) {
-            return $languages;
-        }
-
-        $languages = [];
-        foreach (Craft::$app->sites->getAllSites() as $site)
-        {
-            $languages[$site->language] = (int)$site->id;
-        }
-
-        return $languages;
-    }
 }
diff --git a/src/variables/LanguageSwitcher.php b/src/variables/LanguageSwitcher.php
@@ -32,7 +32,8 @@ class LanguageSwitcherVariable
     public function getUrls($urlOverrides = null): array
     {
         $queryParameterName = LanguageRedirector::getInstance()->getSettings()->queryParameterName;
-        $siteLanguages = LanguageRedirector::getInstance()->getSettings()->languages;
+        $languageRedirectorService = new LanguageRedirectorService();
+        $siteLanguages = $languageRedirectorService->getSitesPerLanguage();
 
         if (!$siteLanguages) {
             return array();
@@ -41,8 +42,7 @@ public function getUrls($urlOverrides = null): array
         $languages = array();
 
         foreach ($siteLanguages as $language => $site) {
-            $languageService = new LanguageRedirectorService();
-            $targetUrl = $urlOverrides[$language] ?? $languageService->getTargetUrl($language);
+            $targetUrl = $urlOverrides[$language] ?? $languageRedirectorService->getTargetUrl($language);
             $locale = Craft::$app->i18n->getLocaleById($language);
 
             if (null !== $targetUrl) {