Added language chooser display option.

admin_interface/templates/admin/base_site.html

@@ -64,6 +64,9 @@ https://github.com/fabiocaccamo/django-admin-interface
 
 {% block welcome-msg %}
 {% get_admin_interface_theme as theme %}
-{% if theme.language_chooser_active %}{% get_admin_interface_language_chooser %}{% endif %}
+{% if theme.language_chooser_active %}
+    {% get_admin_interface_languages as languages %}
+    {% include "admin_interface/language_chooser.html" %}
+{% endif %}
 {% if theme.env_visible_in_header %}<span class="environment-label {{ theme.env_name }}"></span> - {% endif %}{{ block.super }}<br>
 {% endblock %}

admin_interface/templates/admin_interface/language_chooser.html

@@ -1,5 +1,6 @@
 {% load admin_interface_tags %}
 
+{% if languages %}
 <div class="language-chooser">
     {% for language in languages %}
     <form class="language-chooser-hidden-form" id="language-chooser-hidden-form-{{ language.code }}" action="{{ language.activation_url }}" method="POST">
@@ -11,8 +12,9 @@
         {% csrf_token %}
         <select name="language" onchange="document.getElementById(String('language-chooser-hidden-form-' + this.value)).submit();">
             {% for language in languages %}
-            <option value="{{ language.code }}" {% if language.active %}selected{% endif %}>{{ language.code|upper }}</option>
+            <option value="{{ language.code }}" {% if language.active %}selected{% endif %}>{% if theme.language_chooser_display == 'code' %}{{ language.code|upper }}{% elif theme.language_chooser_display == 'name' %}{{ language.name }}{% endif %}</option>
             {% endfor %}
         </select>
     </form>
-</div>
+</div>
+{% endif %}