From 3d6246f3c97c568e45be025bacc551b88982f816 Mon Sep 17 00:00:00 2001
From: Gabriel Jean <29616662+GabrielJean@users.noreply.github.com>
Date: Mon, 13 Jun 2022 11:14:39 -0400
Subject: [PATCH] Removed flag icon span if countryCode is null (#603)

* Update lang-selector.html

* Update lang-selector-2.html

* Added showFlags parameter

* Refactor showFlags logic

Signed-off-by: hossainemruz <hossainemruz@gmail.com>

Co-authored-by: hossainemruz <hossainemruz@gmail.com>
---
 README.md                                     |  3 ++
 .../navigators/floating-lang-selector.html    | 12 ++++---
 .../partials/navigators/lang-selector-2.html  | 12 ++++---
 .../partials/navigators/lang-selector.html    | 32 +++++++++++--------
 4 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 2971be9..428576c 100644
--- a/README.md
+++ b/README.md
@@ -145,6 +145,9 @@ params:
   # specify whether you want to show Table of Contents in reading page
   enableTOC: true
 
+  # specify whether you want the language flags to be displayed. 
+  showFlags: true
+
   # Provide newsletter configuration. 
   # This feature has been implemented for Mailchimp only for now.
   # You can also hide it from the footer.
diff --git a/layouts/partials/navigators/floating-lang-selector.html b/layouts/partials/navigators/floating-lang-selector.html
index 625c01f..921fdc5 100644
--- a/layouts/partials/navigators/floating-lang-selector.html
+++ b/layouts/partials/navigators/floating-lang-selector.html
@@ -5,15 +5,19 @@
 
 <div class="dropdown languageSelector">
     <a class="btn dropdown-toggle" href="#" id="languageSelector" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        {{ $countryCode := partial "helpers/country-code.html" . }}
-        <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+        {{ if ne site.Params.showFlags false }}
+            {{ $countryCode := partial "helpers/country-code.html" . }}
+            <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+        {{ end }}
         {{ site.Language.LanguageName }}
     </a>
     <div class="dropdown-menu" aria-labelledby="languageSelector">
         {{ range .Translations }}
         <a class="dropdown-item nav-link languages-item" href="{{ path.Join "/" (cond (eq .Language.Lang "en") "" .Language.Lang) $pageURL }}">
-            {{ $countryCode := partial "helpers/country-code.html" . }}
-            <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+            {{ if ne site.Params.showFlags false }}
+                {{ $countryCode := partial "helpers/country-code.html" . }}
+                <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+            {{ end }}
             {{ .Language.LanguageName }}
         </a>
         {{ end }}
diff --git a/layouts/partials/navigators/lang-selector-2.html b/layouts/partials/navigators/lang-selector-2.html
index 4fffc32..1a1611c 100644
--- a/layouts/partials/navigators/lang-selector-2.html
+++ b/layouts/partials/navigators/lang-selector-2.html
@@ -5,15 +5,19 @@
 
 <li class="nav-item dropdown">
     <a class="nav-link dropdown-toggle" href="#" id="languageSelector" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-      {{ $countryCode := partial "helpers/country-code.html" . }}
-      <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+      {{ if ne site.Params.showFlags false }}
+        {{ $countryCode := partial "helpers/country-code.html" . }}
+        <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+      {{ end }}
       {{ site.Language.LanguageName }}
     </a>
     <div class="dropdown-menu" aria-labelledby="languageSelector">
       {{ range .Translations }}
         <a class="dropdown-item nav-link languages-item" href="{{ path.Join "/" (cond (eq .Language.Lang "en") "" .Language.Lang) $pageURL }}">
-          {{ $countryCode := partial "helpers/country-code.html" . }}
-          <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+          {{ if ne site.Params.showFlags false }}
+            {{ $countryCode := partial "helpers/country-code.html" . }}
+            <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+          {{ end }}
           {{ .Language.LanguageName }}
         </a>
       {{ end }}
diff --git a/layouts/partials/navigators/lang-selector.html b/layouts/partials/navigators/lang-selector.html
index 4221a71..87c34fe 100644
--- a/layouts/partials/navigators/lang-selector.html
+++ b/layouts/partials/navigators/lang-selector.html
@@ -1,16 +1,20 @@
 <li class="nav-item dropdown">
-<a class="nav-link dropdown-toggle" href="#" id="languageSelector" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-    {{ $countryCode := partial "helpers/country-code.html" . }}
-    <span class="flag-icon flag-icon-{{$countryCode}}"></span>
-    {{ site.Language.LanguageName }}
-</a>
-<div class="dropdown-menu" aria-labelledby="languageSelector">
-    {{ range site.Home.AllTranslations }}
-    <a class="dropdown-item nav-link languages-item" href="{{ .RelPermalink }}">
-        {{ $countryCode := partial "helpers/country-code.html" . }}
-        <span class="flag-icon flag-icon-{{$countryCode}}"></span>
-        {{ .Language.LanguageName }}
+    <a class="nav-link dropdown-toggle" href="#" id="languageSelector" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        {{ if ne site.Params.showFlags false }}
+            {{ $countryCode := partial "helpers/country-code.html" . }}
+            <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+        {{ end }}
+        {{ site.Language.LanguageName }}
     </a>
-    {{ end }}
-</div>
-</li>
+    <div class="dropdown-menu" aria-labelledby="languageSelector">
+        {{ range site.Home.AllTranslations }}
+        <a class="dropdown-item nav-link languages-item" href="{{ .RelPermalink }}">
+            {{ if ne site.Params.showFlags false }}
+                {{ $countryCode := partial "helpers/country-code.html" . }}
+                <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+            {{ end }}
+            {{ .Language.LanguageName }}
+        </a>
+        {{ end }}
+    </div>
+    </li>