Merge branch 'main' into sandrava-1690

laws-africa · Aug 13, 2024 · d4d4d7d · d4d4d7d
2 parents 803f958 + 7f06d44
commit d4d4d7d
Show file tree

Hide file tree

Showing 55 changed files with 1,357 additions and 1,021 deletions.
diff --git a/africanlii/admin.py b/africanlii/admin.py
@@ -1,6 +1,7 @@
 from countries_plus.models import Country
 from django.contrib import admin
 
+from africanlii.forms import RatificationForm
 from africanlii.models import (
     AfricanUnionInstitution,
     AfricanUnionOrgan,
@@ -26,6 +27,7 @@ def formfield_for_foreignkey(self, db_field, request, **kwargs):
 @admin.register(Ratification)
 class RatificationAdmin(ImportExportMixin, admin.ModelAdmin):
     inlines = (RatificationCountryAdmin,)
+    form = RatificationForm
     resource_class = RatificationResource
 
 

diff --git a/africanlii/forms.py b/africanlii/forms.py
@@ -1,3 +1,7 @@
+from dal import autocomplete
+from django import forms
+
+from africanlii.models import Ratification
 from peachjam.forms import BaseDocumentFilterForm
 
 
@@ -52,3 +56,10 @@ def filter_faceted_search(self, search):
             search.add_filter("jurisdiction", jurisdictions)
 
         return search
+
+
+class RatificationForm(forms.ModelForm):
+    class Meta:
+        model = Ratification
+        fields = "__all__"
+        widgets = {"work": autocomplete.ModelSelect2(url="autocomplete-works")}
diff --git a/africanlii/locale/en/LC_MESSAGES/django.po b/africanlii/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-17 09:40+0200\n"
+"POT-Creation-Date: 2024-08-06 10:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -171,7 +171,7 @@ msgstr ""
 msgid "Indexes"
 msgstr ""
 
-#: templates/africanlii/member_state_detail.html:38
+#: templates/africanlii/member_state_detail.html:37
 msgid "No documents found."
 msgstr ""
 
@@ -459,3 +459,15 @@ msgstr ""
 #: templates/peachjam_search/search.html:5
 msgid "Search regional and national African legal information."
 msgstr ""
+
+#: views/taxonomy.py:126
+msgid "Judrisdictions"
+msgstr ""
+
+#: views/taxonomy.py:132
+msgid "Years"
+msgstr ""
+
+#: views/taxonomy.py:140
+msgid "Alphabet"
+msgstr ""
diff --git a/africanlii/locale/fr/LC_MESSAGES/django.po b/africanlii/locale/fr/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 39b2fd8e1f2e7f60a21a2ff40372741a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-17 09:40+0200\n"
+"POT-Creation-Date: 2024-08-06 10:12+0200\n"
 "PO-Revision-Date: 2024-07-19 09:44\n"
 "Last-Translator: \n"
 "Language-Team: French\n"
@@ -170,7 +170,7 @@ msgstr "Union africaine"
 msgid "Indexes"
 msgstr "Index"
 
-#: templates/africanlii/member_state_detail.html:38
+#: templates/africanlii/member_state_detail.html:37
 msgid "No documents found."
 msgstr "Aucun document trouvé."
 
@@ -459,3 +459,16 @@ msgstr "Rapports et tutoriels"
 msgid "Search regional and national African legal information."
 msgstr "Rechercher des informations juridiques africaines régionales et nationales."
 
+#: views/taxonomy.py:126
+#, fuzzy
+#| msgid "ratifications"
+msgid "Judrisdictions"
+msgstr "ratifications"
+
+#: views/taxonomy.py:132
+msgid "Years"
+msgstr ""
+
+#: views/taxonomy.py:140
+msgid "Alphabet"
+msgstr ""
diff --git a/africanlii/locale/pt/LC_MESSAGES/django.po b/africanlii/locale/pt/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 39b2fd8e1f2e7f60a21a2ff40372741a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-17 09:40+0200\n"
+"POT-Creation-Date: 2024-08-06 10:12+0200\n"
 "PO-Revision-Date: 2024-07-19 09:44\n"
 "Last-Translator: \n"
 "Language-Team: Portuguese\n"
@@ -170,7 +170,7 @@ msgstr "União Africana"
 msgid "Indexes"
 msgstr "Índices"
 
-#: templates/africanlii/member_state_detail.html:38
+#: templates/africanlii/member_state_detail.html:37
 msgid "No documents found."
 msgstr "Nenhum documento encontrado."
 
@@ -459,3 +459,16 @@ msgstr "Relatórios e guias"
 msgid "Search regional and national African legal information."
 msgstr "Pesquise informações legais africanas regionais e nacionais."
 
+#: views/taxonomy.py:126
+#, fuzzy
+#| msgid "ratifications"
+msgid "Judrisdictions"
+msgstr "ratificações"
+
+#: views/taxonomy.py:132
+msgid "Years"
+msgstr ""
+
+#: views/taxonomy.py:140
+msgid "Alphabet"
+msgstr ""
diff --git a/africanlii/locale/sw/LC_MESSAGES/django.po b/africanlii/locale/sw/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 39b2fd8e1f2e7f60a21a2ff40372741a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-17 09:40+0200\n"
+"POT-Creation-Date: 2024-08-06 10:12+0200\n"
 "PO-Revision-Date: 2024-07-19 09:44\n"
 "Last-Translator: \n"
 "Language-Team: Swahili\n"
@@ -170,7 +170,7 @@ msgstr "Umoja wa Afrika"
 msgid "Indexes"
 msgstr "Faharasa"
 
-#: templates/africanlii/member_state_detail.html:38
+#: templates/africanlii/member_state_detail.html:37
 msgid "No documents found."
 msgstr "Hakuna nyaraka zilizopatikana."
 
@@ -459,3 +459,16 @@ msgstr "Ripoti na Miongozo"
 msgid "Search regional and national African legal information."
 msgstr "Tafuta taarifa za kisheria za kikanda na kitaifa za Afrika."
 
+#: views/taxonomy.py:126
+#, fuzzy
+#| msgid "ratifications"
+msgid "Judrisdictions"
+msgstr "uridhiaji"
+
+#: views/taxonomy.py:132
+msgid "Years"
+msgstr ""
+
+#: views/taxonomy.py:140
+msgid "Alphabet"
+msgstr ""
diff --git a/africanlii/templates/africanlii/au_institution_detail.html b/africanlii/templates/africanlii/au_institution_detail.html
@@ -30,6 +30,3 @@
   {{ block.super }}
   {% include 'peachjam/_years_list.html' with showallyears=True %}
 {% endblock %}
-{% block content %}
-  {% include 'peachjam/_document_table.html' %}
-{% endblock %}
diff --git a/africanlii/templates/africanlii/member_state_detail.html b/africanlii/templates/africanlii/member_state_detail.html
@@ -28,10 +28,9 @@
 {% block page-title %}<h1 class="mt-4">{{ member_state }}</h1>{% endblock %}
 {% block page-header %}
   {{ block.super }}
-  <div class="mb-3">{% include 'africanlii/_lii_info.html' %}</div>
+  <div class="mb-5">{% include 'africanlii/_lii_info.html' %}</div>
 {% endblock %}
-{% block page-list-facets %}{% endblock %}
-{% block content %}
+{% block document-table %}
   {% if ratification_countries %}
     {% include 'africanlii/_ratification_table.html' %}
   {% else %}

diff --git a/gazettes/templates/peachjam/gazette_list.html b/gazettes/templates/peachjam/gazette_list.html
@@ -1,6 +1,6 @@
 {% extends 'peachjam/gazette_list.html' %}
 {% load i18n %}
-{% block localities %}
+{% block count-and-search %}
   <div class="row">
     <div class="col">{{ block.super }}</div>
     {% if contributors %}

diff --git a/gazettes/templates/peachjam/gazette_year.html b/gazettes/templates/peachjam/gazette_year.html
@@ -1,6 +1,6 @@
 {% extends 'peachjam/gazette_year.html' %}
 {% load i18n %}
-{% block preamble %}
+{% block count-and-search %}
   <div class="row">
     <div class="col">{{ block.super }}</div>
     {% if contributors %}

diff --git a/lawlibrary/templates/peachjam/gazette_year.html b/lawlibrary/templates/peachjam/gazette_year.html
@@ -1,16 +1,18 @@
 {% extends 'peachjam/gazette_year.html' %}
 {% load i18n %}
 {% block breadcrumbs %}
-  <nav aria-label="breadcrumb">
-    <ol class="breadcrumb">
-      <li class="breadcrumb-item">
-        <a href="{% url 'gazettes' %}">{% trans 'Gazettes' %}</a>
-      </li>
-      {% if locality %}
+  <div class="container">
+    <nav aria-label="breadcrumb">
+      <ol class="breadcrumb">
         <li class="breadcrumb-item">
-          <a href="{% url 'gazettes_by_locality' code=locality.code %}">{{ locality }}</a>
+          <a href="{% url 'gazettes' %}">{% trans 'Gazettes' %}</a>
         </li>
-      {% endif %}
-    </ol>
-  </nav>
+        {% if locality %}
+          <li class="breadcrumb-item">
+            <a href="{% url 'gazettes_by_locality' code=locality.code %}">{{ locality }}</a>
+          </li>
+        {% endif %}
+      </ol>
+    </nav>
+  </div>
 {% endblock %}