From b60a78ca2e9c2a608d9827010e31e640820410d4 Mon Sep 17 00:00:00 2001
From: Fabrice Gangler <fabrice@asqatasun.org>
Date: Sat, 5 Aug 2017 03:17:13 +0200
Subject: [PATCH] Fixed #90 Webapp - Used <link rel="alternate" hreflang="">

---
 .../src/main/webapp/WEB-INF/template/head.jspf  |  7 ++++++-
 .../WEB-INF/template/template_variables.jspf    | 17 +++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/webapp/src/main/webapp/WEB-INF/template/head.jspf b/webapp/src/main/webapp/WEB-INF/template/head.jspf
index 6b485937..7ffe391d 100644
--- a/webapp/src/main/webapp/WEB-INF/template/head.jspf
+++ b/webapp/src/main/webapp/WEB-INF/template/head.jspf
@@ -27,9 +27,14 @@
     <meta name="application-name"           content="Contrast Finder">
 
 
-    <!--  Description / Canonical URL   -->
+    <!--  Description / Canonical URL / alternate  -->
     <meta name="description" content="${metaDescription}">
     <link rel="canonical"    href="${canonicalURL}" />
+    <link rel="alternate" hreflang="x-default" href="${prefixURL}" />
+    <link rel="alternate" hreflang="en" href="${prefixURL}?lang=en" />
+    <link rel="alternate" hreflang="fr" href="${prefixURL}?lang=fr" />
+    <link rel="alternate" hreflang="pt" href="${prefixURL}?lang=pt" />
+    <link rel="alternate" hreflang="ko" href="${prefixURL}?lang=ko" />
 
     <!-- Social network - Facebook -->
     <meta property="author"         content="Contrast-finder.org" />
diff --git a/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf b/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf
index 0b796093..f2e62a2a 100644
--- a/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf
+++ b/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf
@@ -22,14 +22,15 @@
 
     <%-- Canonical URL --%>
     <c:set var="prefixURL" value="https://app.contrast-finder.org/"/>
-    <c:choose>
-        <c:when test="${lang == 'en'}">
-            <c:set var="canonicalURL" value="${prefixURL}"/>
-        </c:when>
-        <c:otherwise>
-            <c:set var="canonicalURL" value="${prefixURL}?lang=${lang}"/>
-        </c:otherwise>
-    </c:choose>
+    <c:set var="canonicalURL" value="${prefixURL}?lang=${lang}"/>
+        <%-- <c:choose>
+                <c:when test="${lang == 'en'}">
+                    <c:set var="canonicalURL" value="${prefixURL}"/>
+                </c:when>
+                <c:otherwise>
+                    <c:set var="canonicalURL" value="${prefixURL}?lang=${lang}"/>
+                </c:otherwise>
+            </c:choose> --%>
 
     <%-- TITLE tag --%>
     <c:choose>