Notes dictionary: language names.

diff --git a/apps/dictionary/templates/dictionary/note_list.html b/apps/dictionary/templates/dictionary/note_list.html
index 3d4916c..9428655 100755 (executable)
--- a/apps/dictionary/templates/dictionary/note_list.html
+++ b/apps/dictionary/templates/dictionary/note_list.html
@@ -76,12 +76,12 @@
     <strong>{% trans "all" %}</strong>
 {% endif %}
 
     <strong>{% trans "all" %}</strong>
 {% endif %}
 

-{% for lang in languages %}
+{% for lang, lang_name in languages %}

     |
     {% if lang == language %}
     |
     {% if lang == language %}

-        <strong>{{ lang }}</strong>
+        <strong>{{ lang_name }}</strong>

     {% else %}
     {% else %}

-        <a href='?{% set_get "page" lang=lang %}'>{{ lang }}</a>
+        <a href='?{% set_get "page" lang=lang %}'>{{ lang_name }}</a>

     {% endif %}
 {% endfor %}
 </p>
     {% endif %}
 {% endfor %}
 </p>

diff --git a/apps/dictionary/views.py b/apps/dictionary/views.py
index 76530bc..40b36ba 100755 (executable)
--- a/apps/dictionary/views.py
+++ b/apps/dictionary/views.py
@@ -3,7 +3,9 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.views.generic.list import ListView
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.views.generic.list import ListView

+from django.conf import settings

 from django.db.models import Count, Q
 from django.db.models import Count, Q

+from catalogue.constants import LANGUAGES_3TO2

 from .constants import FN_TYPES
 from .models import Note, Qualifier
 
 from .constants import FN_TYPES
 from .models import Note, Qualifier
 


@@ -50,6 +52,10 @@ class NotesView(ListView):
                 nobj = nobj.filter(fltr)
         self.languages = nobj.order_by('language').values_list(
             'language', flat=True).distinct()
                 nobj = nobj.filter(fltr)
         self.languages = nobj.order_by('language').values_list(
             'language', flat=True).distinct()

+        lang_names = dict(settings.LANGUAGES)
+        self.languages = [
+            (lang, lang_names.get(LANGUAGES_3TO2.get(lang, lang), lang))
+            for lang in self.languages]

 
         nobj = objects
         for key, fltr in filters.items():
 
         nobj = objects
         for key, fltr in filters.items():

diff --git a/apps/wolnelektury_core/templates/main_page.html b/apps/wolnelektury_core/templates/main_page.html
index 118f3ac..17dc2e6 100755 (executable)
--- a/apps/wolnelektury_core/templates/main_page.html
+++ b/apps/wolnelektury_core/templates/main_page.html
@@ -46,7 +46,7 @@
             <li><a href="{% url 'suggest' %}" id="suggest" class="ajaxable">{% trans "Report a bug or suggestion" %}</a></li>
             <!--li><a href="http://turniej.wolnelektury.pl">Turniej Elektrybałtów</a></li-->
             <li><a href="{% url 'reporting_catalogue_pdf' %}">{% trans "Download the catalogue in PDF format." %}</a></li>
             <li><a href="{% url 'suggest' %}" id="suggest" class="ajaxable">{% trans "Report a bug or suggestion" %}</a></li>
             <!--li><a href="http://turniej.wolnelektury.pl">Turniej Elektrybałtów</a></li-->
             <li><a href="{% url 'reporting_catalogue_pdf' %}">{% trans "Download the catalogue in PDF format." %}</a></li>

-            <!--li><a href="{% url 'infopage' "widget" %}">{% trans "Widget" %}</a></li-->
+           <li><a href="{% url 'dictionary_notes' %}">{% trans "Footnotes" %}</a></li>

             <li><a href="{% url 'suggest_publishing' %}" id="suggest-publishing" class="ajaxable">{% trans "Missing a book?" %}</a></li>
             <li><a href="{% url 'publish_plan' %}">{% trans "Publishing plan" %}</a></li>
             <li><a href="{% url 'api' %}">API</a></li>
             <li><a href="{% url 'suggest_publishing' %}" id="suggest-publishing" class="ajaxable">{% trans "Missing a book?" %}</a></li>
             <li><a href="{% url 'publish_plan' %}">{% trans "Publishing plan" %}</a></li>
             <li><a href="{% url 'api' %}">API</a></li>