[Added] Added a getLocalizedUrls Twig filter/function that returns an…

… array of localized URLs for the current request
Pennebaker · Jun 20, 2016 · 94d938b · 94d938b
1 parent d779a24
commit 94d938b
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -55,6 +55,7 @@ Some things to do, and ideas for potential features:
 
 ### 1.1.21 -- 2016.06.16
 
+* [Added] Added a `getLocalizedUrls` Twig filter/function that returns an array of localized URLs for the current request
 * [Improved] The SEOmetrics window will now remember its open/closed state while in Live Preview
 * [Improved] Some minor tweaks to the SEOmetrics CSS
 * [Improved] The current locale is now included in the hreflang for localized sites

diff --git a/releases.json b/releases.json
@@ -4,6 +4,7 @@
         "downloadUrl": "https://github.com/nystudio107/seomatic/archive/master.zip",
         "date": "2016-06-16T11:00:00-11:00",
         "notes": [
+            "[Added] Added a getLocalizedUrls Twig filter/function that returns an array of localized URLs for the current request",
             "[Improved] The SEOmetrics window will now remember its open/closed state while in Live Preview",
             "[Improved] Some minor tweaks to the SEOmetrics CSS",
             "[Improved] The current locale is now included in the hreflang for localized sites",

diff --git a/services/SeomaticService.php b/services/SeomaticService.php
@@ -2313,6 +2313,54 @@ public function sanitizeMetaVars(&$metaVars)
 
     } /* -- sanitizeMetaVars */
 
+/* --------------------------------------------------------------------------------
+    Returns an array of localized URLs for the current request
+-------------------------------------------------------------------------------- */
+
+public function getLocalizedUrls()
+{
+    $localizedUrls = array();
+    $requestUri = craft()->request->getRequestUri();
+    if (craft()->isLocalized())
+    {
+        $element = craft()->urlManager->getMatchedElement();
+        if ($element)
+        {
+            $unsortedLocalizedUrls = array();
+            $_rows = craft()->db->createCommand()
+            ->select('locale')
+            ->addSelect('uri')
+            ->from('elements_i18n')
+            ->where(array('elementId' => $element->id, 'enabled' => 1))
+            ->queryAll();
+
+            foreach ($_rows as $row)
+            {
+              $path = ($row['uri'] == '__home__') ? '' : $row['uri'];
+              $unsortedLocalizedUrls[$row['locale']] = UrlHelper::getSiteUrl($path, null, null, $row['locale'] );
+            }
+
+            $locales = craft()->i18n->getSiteLocales();
+            foreach ($locales as $locale)
+            {
+                $localeId = $locale->getId();
+                $localizedUrls[$localeId] = $unsortedLocalizedUrls[$localeId];
+            }
+        }
+        else
+        {
+            $locales = craft()->i18n->getSiteLocales();
+            foreach ($locales as $locale)
+            {
+                $localeId = $locale->getId();
+                $localizedUrls[$localeId] = UrlHelper::getSiteUrl($requestUri, null, null, $localeId);
+
+            }
+        }
+    }
+    return $localizedUrls;
+} /* --  getLocalizedUrls */
+
 /* --------------------------------------------------------------------------------
     Get a fully qualified URL based on the siteUrl, if no scheme/host is present
 -------------------------------------------------------------------------------- */

diff --git a/templates/_seo_meta.twig b/templates/_seo_meta.twig
@@ -13,8 +13,9 @@
 <meta name="description" content="{{ seomaticMeta.seoDescription |raw }}" />
 <meta name="generator" content="SEOmatic" />
 <link rel="canonical" href="{{ seomaticMeta.canonicalUrl }}" />
-{% for locale in craft.i18n.getSiteLocales() %}
-{% if craft.config.siteUrl is iterable %}{% if craft.config.siteUrl[locale.getId()] is defined %}<link rel="alternate" hreflang="{{ locale.getId() |lower |replace ('_', '-') }}" href="{{ craft.config.siteUrl[locale.getId()] ~ craft.request.path }}" />{% endif%}{% endif %}
+{% set localizedUrls = getLocalizedUrls() %}
+{% for key, value in localizedUrls %}
+<link rel="alternate" hreflang="{{ key |lower |replace ('_', '-') }}" href="{{ value }}" />
 {% endfor %}
 {% if seomaticIdentity.address.addressRegion is defined and seomaticIdentity.address.addressRegion %}
 <meta name="geo.region" content="{{ seomaticIdentity.address.addressRegion |raw }}" />

diff --git a/twigextensions/SeomaticTwigExtension.php b/twigextensions/SeomaticTwigExtension.php
@@ -56,6 +56,7 @@ public function getFilters()
             'truncateStringOnWord' => new \Twig_Filter_Method($this, 'truncateStringOnWord'),
             'encodeEmailAddress' => new \Twig_Filter_Method($this, 'encodeEmailAddress'),
             'extractTextFromMatrix' => new \Twig_Filter_Method($this, 'extractTextFromMatrix'),
+            'getLocalizedUrls' => new \Twig_Filter_Method($this, 'getLocalizedUrls'),
             'getFullyQualifiedUrl' => new \Twig_Filter_Method($this, 'getFullyQualifiedUrl'),
         );
     }
@@ -73,6 +74,7 @@ public function getFunctions()
             'truncateStringOnWord' => new \Twig_Function_Method($this, 'truncateStringOnWord'),
             'encodeEmailAddress' => new \Twig_Function_Method($this, 'encodeEmailAddress'),
             'extractTextFromMatrix' => new \Twig_Function_Method($this, 'extractTextFromMatrix'),
+            'getLocalizedUrls' => new \Twig_Function_Method($this, 'getLocalizedUrls'),
             'getFullyQualifiedUrl' => new \Twig_Function_Method($this, 'getFullyQualifiedUrl'),
         );
     }
@@ -176,6 +178,17 @@ public function extractTextFromMatrix($matrixBlocks)
         return $result;
     } /* -- extractTextFromMatrix */
 
+/* --------------------------------------------------------------------------------
+    Returns an array of localized URLs for the current request
+-------------------------------------------------------------------------------- */
+
+    public function getLocalizedUrls()
+    {
+        $result = craft()->seomatic->getLocalizedUrls();
+
+        return $result;
+    } /* -- getLocalizedUrls */
+
 /* --------------------------------------------------------------------------------
     Get a fully qualified URL based on the siteUrl, if no scheme/host is present
 -------------------------------------------------------------------------------- */

diff --git a/variables/SeomaticVariable.php b/variables/SeomaticVariable.php
@@ -107,6 +107,17 @@ public function extractTextFromMatrix($matrixBlocks)
         return $result;
     } /* -- extractTextFromMatrix */
 
+/* --------------------------------------------------------------------------------
+    Returns an array of localized URLs for the current request
+-------------------------------------------------------------------------------- */
+
+    public function getLocalizedUrls()
+    {
+        $result = craft()->seomatic->getLocalizedUrls();
+
+        return $result;
+    } /* -- getLocalizedUrls */
+
 /* --------------------------------------------------------------------------------
     Get a fully qualified URL based on the siteUrl, if no scheme/host is present
 -------------------------------------------------------------------------------- */