From bfae07ce6d74fba835289d392ee3532dbb089f80 Mon Sep 17 00:00:00 2001
From: MunifTanjim <muniftanjim@gmail.com>
Date: Sun, 5 Aug 2018 12:27:09 +0600
Subject: [PATCH] fix [templates]: resolves #160

---
 layouts/partials/entry/taxonomy-list.html   | 12 +++++-------
 layouts/partials/extras/taxonomy_cloud.html | 17 ++++++++---------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/layouts/partials/entry/taxonomy-list.html b/layouts/partials/entry/taxonomy-list.html
index 0f17f820..3503d3f0 100644
--- a/layouts/partials/entry/taxonomy-list.html
+++ b/layouts/partials/entry/taxonomy-list.html
@@ -7,13 +7,11 @@
   </span>
   <span class='screen-reader-text'>{{ ( ( i18n $tx 2 ) | default $txs ) | title }}: </span>
   {{- range $i, $term := ( index $.Params $txs ) -}}
-  {{- if gt $i 0 }}, {{ end -}}
-  <a class='{{ $tx }}' href='{{ ( print $txs "/" ( $term | urlize ) ) | relLangURL }}'>
-    {{- with $.Site.GetPage ( print "/" $txs "/" ( $term | urlize ) ) -}}
-      {{- .Title -}}
-    {{- else -}}
-      {{- $term -}}
+    {{- with $.Site.GetPage ( print "/" $txs "/" $term ) -}}
+      {{- if gt $i 0 }}, {{ end -}}
+      <a class='{{ $tx }}' href='{{ .RelPermalink }}'>
+        {{- .Title -}}
+      </a>
     {{- end -}}
-  </a>
   {{- end -}}
 </div>
diff --git a/layouts/partials/extras/taxonomy_cloud.html b/layouts/partials/extras/taxonomy_cloud.html
index 9c603cab..338cc50a 100644
--- a/layouts/partials/extras/taxonomy_cloud.html
+++ b/layouts/partials/extras/taxonomy_cloud.html
@@ -2,11 +2,11 @@
 {{- $Site := $Scope.Site -}}
 {{- $Scratch := $Scope.Scratch -}}
 {{- $Shuffle := ( .Shuffle | default true ) -}}
-{{- $Taxonomy := .Taxonomy -}}
-{{- $Data := ( $Site.GetPage $Taxonomy ).Data -}}
+{{- $TaxonomyPage := ( $Site.GetPage ( print "/" .Taxonomy ) ) -}}
+{{- $Data := $TaxonomyPage.Data -}}
 
 <div class='container list-container'>
-  <ul class='list taxonomy-cloud {{- if not $Shuffle }} no-shuffle{{- end -}}'>
+  <ul class='list taxonomy-cloud {{- if not $Shuffle }} no-shuffle {{- end -}}'>
   {{- if gt ( len $Data.Terms ) 0 -}}
     {{- $maxSize := 2.0 -}}
     {{- $minSize := 1.0 -}}
@@ -16,24 +16,23 @@
     {{- $minCount := ( index $Data.Terms.ByCount.Reverse 0 ).Count -}}
     {{- $countSpread := ( sub $maxCount $minCount ) -}}
 
-
     {{- $Scratch.Set "sizeStep" 0 -}}
     {{- if gt $countSpread 0 -}}
       {{- $Scratch.Set "sizeStep" ( div $sizeSpread $countSpread ) -}}
     {{- end -}}
 
-
     {{- range $Data.Terms.Alphabetical -}}
       {{- $count := .Count -}}
       {{- $sizeStep := ( $Scratch.Get "sizeStep" ) -}}
       {{- $size := ( add $minSize ( mul $sizeStep ( sub $count $minCount ) ) ) -}}
+
+      {{- with $Site.GetPage ( print "/" $Data.Plural "/" .Term ) -}}
       <li>
-        <a href='{{ ( print $Data.Plural "/" ( .Term | urlize ) ) | relLangURL }}' style='font-size:{{ $size }}em'>
-          {{- with $Site.GetPage ( print "/" $Data.Plural "/" .Term ) -}}
-            {{- .Title -}}
-          {{- end -}}
+        <a href='{{ .RelPermalink }}' style='font-size:{{ $size }}em'>
+          {{- .Title -}}
         </a>
       </li>
+      {{- end -}}
     {{- end -}}
   {{- else -}}
     <span>