Merge pull request #27 from stefandoorn/hreflang-output-fix

Hreflang output fix (fixes #26)
stefandoorn · Oct 29, 2017 · fcb6c29 · fcb6c29
2 parents cf6d0db + d707bba
commit fcb6c29
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 1 deletion.
diff --git a/src/Resources/views/show.xml.twig b/src/Resources/views/show.xml.twig
@@ -6,7 +6,8 @@
     {% for url in url_set %}
         <url>
             <loc>{{ url_helper.absolute_or_relative(url.localization, absolute_url) }}</loc>
-            {% if hreflang is not same as(false) %}
+            {% if hreflang is not same as(false) and url.alternatives is not empty %}
+                <xhtml:link rel="alternate" hreflang="{{ language_helper.localeToCode(sylius.localeCode) }}" href="{{ url_helper.absolute_or_relative(url.localization, absolute_url) }}"/>
                 {% for locale, location in url.alternatives %}
                     <xhtml:link rel="alternate" hreflang="{{ language_helper.localeToCode(locale) }}" href="{{ url_helper.absolute_or_relative(location, absolute_url) }}"/>
                 {% endfor %}
@@ -15,5 +16,19 @@
             {{ xml_helper.change_frequency(url) }}
             {{ xml_helper.priority(url) }}
         </url>
+        {% if hreflang is not same as(false) and url.alternatives is not empty %}
+            {% for locale, location in url.alternatives %}
+                <url>
+                    <loc>{{ url_helper.absolute_or_relative(location, absolute_url) }}</loc>
+                    <xhtml:link rel="alternate" hreflang="{{ language_helper.localeToCode(sylius.localeCode) }}" href="{{ url_helper.absolute_or_relative(url.localization, absolute_url) }}"/>
+                    {% for localeSub, locationSub in url.alternatives %}
+                        <xhtml:link rel="alternate" hreflang="{{ language_helper.localeToCode(localeSub) }}" href="{{ url_helper.absolute_or_relative(locationSub, absolute_url) }}"/>
+                    {% endfor %}
+                    {{ xml_helper.last_modification(url) }}
+                    {{ xml_helper.change_frequency(url) }}
+                    {{ xml_helper.priority(url) }}
+                </url>
+            {% endfor %}
+        {% endif %}
     {% endfor %}
 </urlset>
diff --git a/tests/Responses/Expected/show_sitemap_products_locale.xml b/tests/Responses/Expected/show_sitemap_products_locale.xml
@@ -2,13 +2,31 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <url>
     <loc>http://localhost/en_US/products/test</loc>
+    <xhtml:link rel="alternate" hreflang="en" href="http://localhost/en_US/products/test"/>
+    <xhtml:link rel="alternate" hreflang="nl" href="http://localhost/nl_NL/products/test"/>
+    <lastmod>@string@.isDateTime()</lastmod>
+    <changefreq>always</changefreq>
+    <priority>0.5</priority>
+  </url>
+  <url>
+    <loc>http://localhost/nl_NL/products/test</loc>
+    <xhtml:link rel="alternate" hreflang="en" href="http://localhost/en_US/products/test"/>
     <xhtml:link rel="alternate" hreflang="nl" href="http://localhost/nl_NL/products/test"/>
     <lastmod>@string@.isDateTime()</lastmod>
     <changefreq>always</changefreq>
     <priority>0.5</priority>
   </url>
   <url>
     <loc>http://localhost/en_US/products/mock</loc>
+    <xhtml:link rel="alternate" hreflang="en" href="http://localhost/en_US/products/mock"/>
+    <xhtml:link rel="alternate" hreflang="nl" href="http://localhost/nl_NL/products/mock"/>
+    <lastmod>@string@.isDateTime()</lastmod>
+    <changefreq>always</changefreq>
+    <priority>0.5</priority>
+  </url>
+  <url>
+    <loc>http://localhost/nl_NL/products/mock</loc>
+    <xhtml:link rel="alternate" hreflang="en" href="http://localhost/en_US/products/mock"/>
     <xhtml:link rel="alternate" hreflang="nl" href="http://localhost/nl_NL/products/mock"/>
     <lastmod>@string@.isDateTime()</lastmod>
     <changefreq>always</changefreq>

diff --git a/tests/Responses/Expected/show_sitemap_taxons_locale.xml b/tests/Responses/Expected/show_sitemap_taxons_locale.xml
@@ -2,12 +2,28 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <url>
     <loc>http://localhost/en_US/taxons/test</loc>
+    <xhtml:link rel="alternate" hreflang="en" href="http://localhost/en_US/taxons/test"/>
+    <xhtml:link rel="alternate" hreflang="nl" href="http://localhost/nl_NL/taxons/test"/>
+    <changefreq>always</changefreq>
+    <priority>0.5</priority>
+  </url>
+  <url>
+    <loc>http://localhost/nl_NL/taxons/test</loc>
+    <xhtml:link rel="alternate" hreflang="en" href="http://localhost/en_US/taxons/test"/>
     <xhtml:link rel="alternate" hreflang="nl" href="http://localhost/nl_NL/taxons/test"/>
     <changefreq>always</changefreq>
     <priority>0.5</priority>
   </url>
   <url>
     <loc>http://localhost/en_US/taxons/mock</loc>
+    <xhtml:link rel="alternate" hreflang="en" href="http://localhost/en_US/taxons/mock"/>
+    <xhtml:link rel="alternate" hreflang="nl" href="http://localhost/nl_NL/taxons/mock"/>
+    <changefreq>always</changefreq>
+    <priority>0.5</priority>
+  </url>
+  <url>
+    <loc>http://localhost/nl_NL/taxons/mock</loc>
+    <xhtml:link rel="alternate" hreflang="en" href="http://localhost/en_US/taxons/mock"/>
     <xhtml:link rel="alternate" hreflang="nl" href="http://localhost/nl_NL/taxons/mock"/>
     <changefreq>always</changefreq>
     <priority>0.5</priority>