Display name of languages and country flags in locale selector

- Use full language name instead of two letter language code - Use flag emoji instead of two letter country code - Fix sort order of locale selector pull-down
erciccione · Sep 10, 2019 · 92593c8 · 92593c8
1 parent c518abe
commit 92593c8
Show file tree

Hide file tree

Showing 59 changed files with 85 additions and 29 deletions.
diff --git a/_includes/main_nav.html b/_includes/main_nav.html
@@ -6,14 +6,14 @@
     {% if page.lang %}
     <div class="dropdown mobile-language-selector more-info-desktop">
       <button class="btn btn-sm dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        {{ page.lang }}
+        {{ page.language }} {{ page.flag }}
       </button>
       <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-        {% assign pages = site.pages | where:"ref", page.ref | sort: 'lang' %}
+        {% assign pages = site.pages | where:"ref", page.ref | sort: 'language' %}
         {% for page in pages %}
           <div class="dropdown-item btn-icon">
             <div class="float-right">
-              <a href="{{ page.url }}" hreflang="{{ page.lang }}">{{ page.language }}</a>
+              <a href="{{ page.url }}" hreflang="{{ page.lang }}">{{ page.language }} {{ page.flag }}</a>
             </div>
           </div>
         {% endfor %}
@@ -91,16 +91,16 @@
 
           <!-- Language selector -->
           {% if page.lang %}
-          <li class="downloads-desktop nav-item dropdown more-info-desktop">
+          <li class="downloads-desktop nav-item dropdown more-info-desktop language-selector">
             <a class="nav-link dropdown-toggle visible-language" href='#' id="languageSelectorDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-              {{ page.lang }}
+              {{ page.language }} {{ page.flag }}
             </a>
             <div class="dropdown-menu" aria-labelledby="languageSelectorDropdown">
-              {% assign pages = site.pages | where:"ref", page.ref | sort: 'lang' %}
+              {% assign pages = site.pages | where:"ref", page.ref | sort: 'language' %}
               {% for page in pages %}
                 <div class="dropdown-item btn-icon">
                   <div class="float-right">
-                    <a href="{{ page.url }}" hreflang="{{ page.lang }}">{{ page.language }}</a>
+                    <a href="{{ page.url }}" hreflang="{{ page.lang }}">{{ page.language }} {{ page.flag }}</a>
                   </div>
                 </div>
               {% endfor %}

diff --git a/_includes/main_nav_tr.html b/_includes/main_nav_tr.html
@@ -6,14 +6,14 @@
     {% if page.lang %}
     <div class="dropdown mobile-language-selector more-info-desktop">
       <button class="btn btn-sm dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        {{ page.lang }}
+        {{ page.language }} {{ page.flag }}
       </button>
       <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-        {% assign pages = site.pages | where:"ref", page.ref | sort: 'lang' %}
+        {% assign pages = site.pages | where:"ref", page.ref | sort: 'language' %}
         {% for page in pages %}
           <div class="dropdown-item btn-icon">
             <div class="float-right">
-              <a href="{{ page.url }}" hreflang="{{ page.lang }}">{{ page.language }}</a>
+              <a href="{{ page.url }}" hreflang="{{ page.lang }}">{{ page.language }} {{ page.flag }}</a>
             </div>
           </div>
         {% endfor %}
@@ -93,16 +93,16 @@
 
           <!-- Language selector -->
           {% if page.lang %}
-          <li class="downloads-desktop nav-item dropdown more-info-desktop">
+          <li class="downloads-desktop nav-item dropdown more-info-desktop language-selector">
             <a class="nav-link dropdown-toggle visible-language" href='#' id="languageSelectorDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-              {{ page.lang }}
+              {{ page.language }} {{ page.flag }}
             </a>
             <div class="dropdown-menu" aria-labelledby="languageSelectorDropdown">
-              {% assign pages = site.pages | where:"ref", page.ref | sort: 'lang' %}
+              {% assign pages = site.pages | where:"ref", page.ref | sort: 'language' %}
               {% for page in pages %}
               <div class="dropdown-item btn-icon">
                 <div class="float-right">
-                  <a href="{{ page.url }}" hreflang="{{ page.lang }}">{{ page.language }}</a>
+                  <a href="{{ page.url }}" hreflang="{{ page.lang }}">{{ page.language }} {{ page.flag }}</a>
                 </div>
               </div>
               {% endfor %}

diff --git a/community.md b/community.md
@@ -3,6 +3,7 @@ layout: page
 title: Community &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: community
 lang: en
+flag: 🌐
 language: English
 ---
 # Community

diff --git a/css/styles.scss b/css/styles.scss
@@ -498,6 +498,7 @@ footer, footer ul li {
   background-color: #fff !important;
   padding: 0 1rem;
   height: 70px;
+  white-space: nowrap;
 }
 
 .nav-link {
@@ -508,10 +509,6 @@ footer, footer ul li {
   padding: 23px 1rem;
 }
 
-.nav-link.visible-language, .dropdown.mobile-language-selector button {
-    text-transform: uppercase;
-}
-
 .navbar-light .navbar-nav .nav-item .nav-link {
   border-bottom: #EBEBEB 1px solid;
   font-weight: 400;
@@ -522,9 +519,12 @@ footer, footer ul li {
   border-bottom: #25B135 1px solid;
 }
 
+.navbar-brand {
+	margin-right: 0.65rem;
+}
 .navbar-expand-lg .navbar-nav .nav-link {
-  padding-right: 0.5rem;
-  padding-left: 0.5rem;
+  padding-right: 0.4rem;
+  padding-left: 0.4rem;
 }
 
 nav .mobile-language-selector {
@@ -873,7 +873,7 @@ front page
 
 /****************/
 
-@media (max-width: 990px) {
+@media (max-width: 991px) {
 
     .accordion-toggle {
       padding-right: 0;

diff --git a/dao.html b/dao.html
@@ -3,6 +3,7 @@
 title: The DAO &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: dao
 lang: en
+flag: 🌐
 language: English
 ---
 

diff --git a/de/community.md b/de/community.md
@@ -3,6 +3,7 @@ layout: page
 title: Community &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: community
 lang: de
+flag: 🇩🇪
 language: Deutsch
 outdated_translation: false
 ---

diff --git a/de/dao.html b/de/dao.html
@@ -3,6 +3,7 @@
 title: The DAO &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: dao
 lang: de
+flag: 🇩🇪
 language: Deutsch
 outdated_translation: false
 ---

diff --git a/de/downloads.html b/de/downloads.html
@@ -3,6 +3,7 @@
 title: Bisq Downloads &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: downloads
 lang: de
+flag: 🇩🇪
 language: Deutsch
 outdated_translation: false
 ---

diff --git a/de/faq.html b/de/faq.html
@@ -3,6 +3,7 @@
 title: FAQ &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: faq
 lang: de
+flag: 🇩🇪
 language: Deutsch
 outdated_translation: false
 ---

diff --git a/de/index.md b/de/index.md
@@ -4,6 +4,7 @@ title: Bisq - The decentralized Bitcoin exchange
 banner: /images/bitsquare-home2.jpg
 ref: index
 lang: de
+flag: 🇩🇪
 language: Deutsch
 outdated_translation: false
 ---

diff --git a/de/markets.html b/de/markets.html
@@ -3,6 +3,7 @@
 title: Bisq Markets &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: markets
 lang: de
+flag: 🇩🇪
 language: Deutsch
 outdated_translation: false
 ---

diff --git a/de/stats.html b/de/stats.html
@@ -3,6 +3,7 @@
 title: Network Stats &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: stats
 lang: de
+flag: 🇩🇪
 language: Deutsch
 outdated_translation: false
 ---

diff --git a/de/vision.md b/de/vision.md
@@ -3,6 +3,7 @@ layout: page
 title: Vision &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: vision
 lang: de
+flag: 🇩🇪
 language: Deutsch
 outdated_translation: false
 ---

diff --git a/downloads.html b/downloads.html
@@ -3,6 +3,7 @@
 title: Bisq Downloads &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: downloads
 lang: en
+flag: 🌐
 language: English
 ---
 <h1>Bisq Downloads</h1>

diff --git a/es/community.md b/es/community.md
@@ -3,6 +3,7 @@ layout: page
 title: Comunidad &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: community
 lang: es
+flag: 🇪🇸
 language: Español
 outdated_translation: false
 ---

diff --git a/es/dao.html b/es/dao.html
@@ -3,6 +3,7 @@
 title: The DAO &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: dao
 lang: es
+flag: 🇪🇸
 language: Español
 outdated_translation: false
 ---

diff --git a/es/downloads.html b/es/downloads.html
@@ -3,6 +3,7 @@
 title: Bisq Downloads &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: downloads
 lang: es
+flag: 🇪🇸
 language: Español
 outdated_translation: false
 ---

diff --git a/es/faq.html b/es/faq.html
@@ -3,6 +3,7 @@
 title: FAQ &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: faq
 lang: es
+flag: 🇪🇸
 language: Español
 outdated_translation: false
 ---

diff --git a/es/index.md b/es/index.md
@@ -4,6 +4,7 @@ title: Bisq - The decentralized Bitcoin exchange
 banner: /images/bitsquare-home2.jpg
 ref: index
 lang: es
+flag: 🇪🇸
 language: Español
 outdated_translation: false
 ---

diff --git a/es/markets.html b/es/markets.html
@@ -3,6 +3,7 @@
 title: Bisq Markets &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: markets
 lang: es
+flag: 🇪🇸
 language: Español
 outdated_translation: false
 ---

diff --git a/es/stats.html b/es/stats.html
@@ -3,6 +3,7 @@
 title: Network Stats &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: stats
 lang: es
+flag: 🇪🇸
 language: Español
 outdated_translation: false
 ---

diff --git a/es/vision.md b/es/vision.md
@@ -3,6 +3,7 @@ layout: page
 title: Vision &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: vision
 lang: es
+flag: 🇪🇸
 language: Español
 outdated_translation: false
 ---

diff --git a/faq.html b/faq.html
@@ -3,6 +3,7 @@
 title: FAQ &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: faq
 lang: en
+flag: 🌐
 language: English
 ---
 

diff --git a/fr/community.md b/fr/community.md
@@ -3,6 +3,7 @@ layout: page
 title: Community &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: community
 lang: fr
+flag: 🇫🇷
 language: Français
 outdated_translation: false
 ---

diff --git a/fr/dao.html b/fr/dao.html
@@ -3,6 +3,7 @@
 title: The DAO &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: dao
 lang: fr
+flag: 🇫🇷
 language: Français
 outdated_translation: false
 ---

diff --git a/fr/downloads.html b/fr/downloads.html
@@ -3,6 +3,7 @@
 title: Bisq Downloads &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: downloads
 lang: fr
+flag: 🇫🇷
 language: Français
 outdated_translation: false
 ---

diff --git a/fr/faq.html b/fr/faq.html
@@ -3,6 +3,7 @@
 title: FAQ &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: faq
 lang: fr
+flag: 🇫🇷
 language: Français
 outdated_translation: false
 ---

diff --git a/fr/index.md b/fr/index.md
@@ -4,6 +4,7 @@ title: Bisq - The decentralized Bitcoin exchange
 banner: /images/bitsquare-home2.jpg
 ref: index
 lang: fr
+flag: 🇫🇷
 language: Français
 outdated_translation: false
 ---

diff --git a/fr/markets.html b/fr/markets.html
@@ -3,6 +3,7 @@
 title: Bisq Markets &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: markets
 lang: fr
+flag: 🇫🇷
 language: Français
 outdated_translation: false
 ---

diff --git a/fr/stats.html b/fr/stats.html
@@ -3,6 +3,7 @@
 title: Network Stats &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: stats
 lang: fr
+flag: 🇫🇷
 language: Français
 outdated_translation: false
 ---

diff --git a/fr/vision.md b/fr/vision.md
@@ -3,6 +3,7 @@ layout: page
 title: Vision &lsaquo; Bisq - La plateforme d'échange décentralisée Bitcoin
 ref: vision
 lang: fr
+flag: 🇫🇷
 language: Français
 outdated_translation: false
 ---

diff --git a/index.md b/index.md
@@ -4,6 +4,7 @@ title: Bisq - The decentralized Bitcoin exchange
 banner: /images/bitsquare-home2.jpg
 ref: index
 lang: en
+flag: 🌐
 language: English
 ---
 

diff --git a/ja/community.md b/ja/community.md
@@ -3,6 +3,7 @@ layout: page
 title: Community &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: community
 lang: ja
+flag: 🇯🇵
 language: 日本語
 outdated_translation: false
 ---

diff --git a/ja/dao.html b/ja/dao.html
@@ -3,6 +3,7 @@
 title: The DAO &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: dao
 lang: ja
+flag: 🇯🇵
 language: 日本語
 outdated_translation: false
 ---

diff --git a/ja/downloads.html b/ja/downloads.html
@@ -3,6 +3,7 @@
 title: Bisq Downloads &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: downloads
 lang: ja
+flag: 🇯🇵
 language: 日本語
 outdated_translation: false
 ---

diff --git a/ja/faq.html b/ja/faq.html
@@ -3,6 +3,7 @@
 title: FAQ &lsaquo; Bisq - The decentralized Bitcoin exchange
 ref: faq
 lang: ja
+flag: 🇯🇵
 language: 日本語
 outdated_translation: false
 ---

diff --git a/ja/index.md b/ja/index.md
@@ -4,6 +4,7 @@ title: Bisq - The decentralized Bitcoin exchange
 banner: /images/bitsquare-home2.jpg
 ref: index
 lang: ja
+flag: 🇯🇵
 language: 日本語
 outdated_translation: false
 ---