From 4f3ef359c81cc4e911850fc082df32dd5635d47a Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Tue, 18 Aug 2015 19:44:07 +0200
Subject: [PATCH] Fix getting the site languages

---
 classes/admin.php                     | 21 +++++++++++++++++++++
 themes/grav/templates/pages.html.twig |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/classes/admin.php b/classes/admin.php
index 1b74f07c..f70117c9 100644
--- a/classes/admin.php
+++ b/classes/admin.php
@@ -594,6 +594,11 @@ class Admin
         return $page;
     }
 
+    /**
+     * Return the languages available in the admin
+     *
+     * @return array
+     */
     public static function adminLanguages()
     {
         $languages = [];
@@ -604,6 +609,22 @@ class Admin
         return $languages;
     }
 
+    /**
+     * Return the languages available in the site
+     *
+     * @return array
+     */
+    public static function siteLanguages()
+    {
+        $languages = [];
+        $lang_data = Grav::instance()['config']->get('system.languages.supported', []);
+
+        foreach ($lang_data as $index => $lang) {
+            $languages[$lang] = LanguageCodes::getNativeName($lang);
+        }
+        return $languages;
+    }
+
     /**
      * Static helper method to return current route.
      *
diff --git a/themes/grav/templates/pages.html.twig b/themes/grav/templates/pages.html.twig
index f04451ae..cf500160 100644
--- a/themes/grav/templates/pages.html.twig
+++ b/themes/grav/templates/pages.html.twig
@@ -88,7 +88,7 @@
                     </button>
                     <ul class="dropdown-menu language-switcher">
                         {% for language in admin.languages_enabled %}
-                            <li><a class="button {% if admin_lang == language %}active{% endif %}" href="{{ base_url_relative }}{{ theme.slug }}/pages/task{{ config.system.param_sep }}switchlanguage/lang{{ config.system.param_sep }}{{language}}">{{ admin.adminLanguages[language] }}</a></li>
+                            <li><a class="button {% if admin_lang == language %}active{% endif %}" href="{{ base_url_relative }}{{ theme.slug }}/pages/task{{ config.system.param_sep }}switchlanguage/lang{{ config.system.param_sep }}{{language}}">{{ admin.siteLanguages[language] }}</a></li>
                         {% endfor %}
                     </ul>
                 </div>