diff --git a/africanlii/templates/africanlii/au_institution_detail.html b/africanlii/templates/africanlii/au_institution_detail.html index 1cf54da21..afaff7663 100644 --- a/africanlii/templates/africanlii/au_institution_detail.html +++ b/africanlii/templates/africanlii/au_institution_detail.html @@ -19,7 +19,7 @@
{% include 'peachjam/_entity_profile.html' %}
{% endif %}
diff --git a/africanlii/templates/africanlii/au_organ_detail.html b/africanlii/templates/africanlii/au_organ_detail.html
index c79765868..8a097870b 100644
--- a/africanlii/templates/africanlii/au_organ_detail.html
+++ b/africanlii/templates/africanlii/au_organ_detail.html
@@ -19,7 +19,7 @@
{% include 'peachjam/_entity_profile.html' %}
{% endif %}
diff --git a/africanlii/views/au.py b/africanlii/views/au.py
index 3947f569e..d415d585f 100644
--- a/africanlii/views/au.py
+++ b/africanlii/views/au.py
@@ -9,7 +9,7 @@
RatificationCountry,
RegionalEconomicCommunity,
)
-from peachjam.views import AuthorDetailView, PlaceDetailView
+from peachjam.views import AuthorDetailView, CoreDocument, PlaceDetailView
class AfricanUnionDetailPageView(TemplateView):
@@ -42,6 +42,7 @@ class AfricanUnionInstitutionDetailView(AuthorDetailView):
class RegionalEconomicCommunityDetailView(PlaceDetailView):
template_name = "africanlii/regional_economic_community_detail.html"
+ queryset = CoreDocument.objects.prefetch_related("labels")
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
diff --git a/africanlii/views/taxonomy.py b/africanlii/views/taxonomy.py
index 7d17fa0b2..36ccf6907 100644
--- a/africanlii/views/taxonomy.py
+++ b/africanlii/views/taxonomy.py
@@ -44,7 +44,10 @@ def get(self, request, *args, **kwargs):
return super().get(request, *args, **kwargs)
def get_context_data(self, **kwargs):
- return super().get_context_data(taxonomy_link_prefix="indexes", **kwargs)
+ context = super().get_context_data(**kwargs)
+ context["taxonomy_link_prefix"] = "indexes"
+ context["help_link"] = "federated-case-indexes-on-africanlii"
+ return context
class DocIndexDetailView(TaxonomyDetailView):
@@ -88,6 +91,12 @@ def get_base_queryset(self):
)
return search
+ def get_queryset(self):
+ search = self.filter_queryset(self.get_base_queryset())
+ if self.latest_expression_only:
+ search = search.filter("term", is_most_recent=True)
+ return search
+
def add_facets(self, context):
"""Add a limited set of facets pulled from ES."""
faceted = FacetedSearch()
diff --git a/liiweb/locale/fr/LC_MESSAGES/django.mo b/liiweb/locale/fr/LC_MESSAGES/django.mo
index 1089fbd00..f9601c53c 100644
Binary files a/liiweb/locale/fr/LC_MESSAGES/django.mo and b/liiweb/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/liiweb/locale/fr/LC_MESSAGES/django.po b/liiweb/locale/fr/LC_MESSAGES/django.po
index 496317064..d0a78ef11 100644
--- a/liiweb/locale/fr/LC_MESSAGES/django.po
+++ b/liiweb/locale/fr/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: 39b2fd8e1f2e7f60a21a2ff40372741a\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-31 09:30+0200\n"
-"PO-Revision-Date: 2023-05-16 07:12\n"
+"PO-Revision-Date: 2023-09-19 11:54\n"
"Last-Translator: \n"
"Language-Team: French\n"
"Language: fr_FR\n"
@@ -65,22 +65,20 @@ msgstr "Collections"
#: templates/liiweb/home.html:152
#, python-format
msgid "Use %(APP_NAME)s when you're offline"
-msgstr ""
+msgstr "Utilisez %(APP_NAME)s lorsque vous êtes hors ligne"
#: templates/liiweb/home.html:154
#, python-format
msgid "Pocket Law is an offline copy of the caselaw, legislation and other legal materials from %(APP_NAME)s."
-msgstr ""
+msgstr "Pocket Law est une copie hors ligne de la jurisprudence, de la législation et d'autres documents juridiques de %(APP_NAME)s."
#: templates/liiweb/home.html:166
msgid "Latest Articles"
-msgstr ""
+msgstr "Derniers articles"
#: templates/liiweb/home.html:168
-#, fuzzy
-#| msgid "View more legislation"
msgid "View more articles"
-msgstr "Voir plus de législation"
+msgstr "Voir plus d'articles"
#: templates/liiweb/legislation_list.html:4
#: templates/liiweb/legislation_list.html:16 templates/peachjam/_header.html:17
@@ -114,15 +112,15 @@ msgstr "À propos"
#: templates/peachjam/_footer.html:12
#, python-format
msgid "Use %(APP_NAME)s offline with Pocket Law."
-msgstr ""
+msgstr "Utilisez %(APP_NAME)s hors ligne avec Pocket Law."
#: templates/peachjam/_footer.html:20
msgid "Site Statistics"
-msgstr ""
+msgstr "Statistiques du site"
#: templates/peachjam/_footer.html:24
msgid "Terms of Use"
-msgstr ""
+msgstr "Termes et conditions d'utilisation"
#: templates/peachjam/_footer.html:29
msgid "Our partners"
@@ -137,19 +135,7 @@ msgid "Judgments"
msgstr "Jugements"
#: views/legislation.py:99
-#, fuzzy, python-format
-#| msgid "Recent Legislation"
+#, python-format
msgid "%(locality)s Legislation"
-msgstr "Législation récente"
-
-#~ msgid "Twitter"
-#~ msgstr "Twitter"
-
-#~ msgid "Tweets by AfricanLII"
-#~ msgstr "Tweets par AfricanLII"
-
-#~ msgid "Subscribe"
-#~ msgstr "S'abonner"
+msgstr "%(locality)s Législation"
-#~ msgid "Subscribe to our newsletter for updates and news."
-#~ msgstr "Abonnez-vous à notre newsletter pour les mises à jour et les nouvelles."
diff --git a/liiweb/locale/pt/LC_MESSAGES/django.mo b/liiweb/locale/pt/LC_MESSAGES/django.mo
index af79fce6f..0f967eae0 100644
Binary files a/liiweb/locale/pt/LC_MESSAGES/django.mo and b/liiweb/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/liiweb/locale/pt/LC_MESSAGES/django.po b/liiweb/locale/pt/LC_MESSAGES/django.po
index 44eeaf3fd..6ed7dd021 100644
--- a/liiweb/locale/pt/LC_MESSAGES/django.po
+++ b/liiweb/locale/pt/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: 39b2fd8e1f2e7f60a21a2ff40372741a\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-31 09:30+0200\n"
-"PO-Revision-Date: 2023-05-16 07:12\n"
+"PO-Revision-Date: 2023-09-19 11:54\n"
"Last-Translator: \n"
"Language-Team: Portuguese\n"
"Language: pt_PT\n"
@@ -65,22 +65,20 @@ msgstr "Coleções"
#: templates/liiweb/home.html:152
#, python-format
msgid "Use %(APP_NAME)s when you're offline"
-msgstr ""
+msgstr "Use %(APP_NAME)s quando estiver off-line"
#: templates/liiweb/home.html:154
#, python-format
msgid "Pocket Law is an offline copy of the caselaw, legislation and other legal materials from %(APP_NAME)s."
-msgstr ""
+msgstr "Pocket Law é uma cópia offline da jurisprudência, legislação e outros materiais jurídicos de %(APP_NAME)s."
#: templates/liiweb/home.html:166
msgid "Latest Articles"
-msgstr ""
+msgstr "Artigos mais Recentes"
#: templates/liiweb/home.html:168
-#, fuzzy
-#| msgid "View more legislation"
msgid "View more articles"
-msgstr "Ver mais legislação"
+msgstr "Ver mais artigos"
#: templates/liiweb/legislation_list.html:4
#: templates/liiweb/legislation_list.html:16 templates/peachjam/_header.html:17
@@ -114,15 +112,15 @@ msgstr "Sobre"
#: templates/peachjam/_footer.html:12
#, python-format
msgid "Use %(APP_NAME)s offline with Pocket Law."
-msgstr ""
+msgstr "Use %(APP_NAME)s offline com Pocket Law."
#: templates/peachjam/_footer.html:20
msgid "Site Statistics"
-msgstr ""
+msgstr "Estatísticas do site"
#: templates/peachjam/_footer.html:24
msgid "Terms of Use"
-msgstr ""
+msgstr "Termos de Utilização"
#: templates/peachjam/_footer.html:29
msgid "Our partners"
@@ -137,19 +135,7 @@ msgid "Judgments"
msgstr "Julgamentos"
#: views/legislation.py:99
-#, fuzzy, python-format
-#| msgid "Recent Legislation"
+#, python-format
msgid "%(locality)s Legislation"
-msgstr "Legislação recente"
-
-#~ msgid "Twitter"
-#~ msgstr "Twitter"
-
-#~ msgid "Tweets by AfricanLII"
-#~ msgstr "Tweets de AfricanLII"
-
-#~ msgid "Subscribe"
-#~ msgstr "Inscrever-se"
+msgstr "%(locality)s Legislação"
-#~ msgid "Subscribe to our newsletter for updates and news."
-#~ msgstr "Assine nossa newsletter para atualizações e notícias."
diff --git a/liiweb/locale/sw/LC_MESSAGES/django.mo b/liiweb/locale/sw/LC_MESSAGES/django.mo
index 20df76b85..efc7d3654 100644
Binary files a/liiweb/locale/sw/LC_MESSAGES/django.mo and b/liiweb/locale/sw/LC_MESSAGES/django.mo differ
diff --git a/liiweb/locale/sw/LC_MESSAGES/django.po b/liiweb/locale/sw/LC_MESSAGES/django.po
index 106bded81..17409ff8d 100644
--- a/liiweb/locale/sw/LC_MESSAGES/django.po
+++ b/liiweb/locale/sw/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: 39b2fd8e1f2e7f60a21a2ff40372741a\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-31 09:30+0200\n"
-"PO-Revision-Date: 2023-05-16 07:12\n"
+"PO-Revision-Date: 2023-09-19 11:54\n"
"Last-Translator: \n"
"Language-Team: Swahili\n"
"Language: sw_KE\n"
@@ -65,22 +65,20 @@ msgstr "Makusanyo"
#: templates/liiweb/home.html:152
#, python-format
msgid "Use %(APP_NAME)s when you're offline"
-msgstr ""
+msgstr "Tumia %(APP_NAME)s ukiwa nje ya mtandao"
#: templates/liiweb/home.html:154
#, python-format
msgid "Pocket Law is an offline copy of the caselaw, legislation and other legal materials from %(APP_NAME)s."
-msgstr ""
+msgstr "Pocket Law ni nakala ya nje ya mtandao ya sheria ya kesi, sheria na nyaraka nyingine za kisheria kutoka %(APP_NAME)s."
#: templates/liiweb/home.html:166
msgid "Latest Articles"
-msgstr ""
+msgstr "Makala za Hivi Karibuni"
#: templates/liiweb/home.html:168
-#, fuzzy
-#| msgid "View more legislation"
msgid "View more articles"
-msgstr "Tazama sheria zaidi"
+msgstr "Tazama makala zaidi"
#: templates/liiweb/legislation_list.html:4
#: templates/liiweb/legislation_list.html:16 templates/peachjam/_header.html:17
@@ -114,15 +112,15 @@ msgstr "Kuhusu"
#: templates/peachjam/_footer.html:12
#, python-format
msgid "Use %(APP_NAME)s offline with Pocket Law."
-msgstr ""
+msgstr "Tumia %(APP_NAME)s nje ya mtandao na Pocket law."
#: templates/peachjam/_footer.html:20
msgid "Site Statistics"
-msgstr ""
+msgstr "Takwimu za Tovuti"
#: templates/peachjam/_footer.html:24
msgid "Terms of Use"
-msgstr ""
+msgstr "Masharti ya matumizi"
#: templates/peachjam/_footer.html:29
msgid "Our partners"
@@ -137,19 +135,7 @@ msgid "Judgments"
msgstr "Hukumu"
#: views/legislation.py:99
-#, fuzzy, python-format
-#| msgid "Recent Legislation"
+#, python-format
msgid "%(locality)s Legislation"
-msgstr "Sheria ya Hivi Karibuni"
-
-#~ msgid "Twitter"
-#~ msgstr "Twitter"
-
-#~ msgid "Tweets by AfricanLII"
-#~ msgstr "Tweets na AfricanLII"
-
-#~ msgid "Subscribe"
-#~ msgstr "Jiandikishe"
+msgstr "%(locality)s Sheria"
-#~ msgid "Subscribe to our newsletter for updates and news."
-#~ msgstr "Jiandikishe kwenye jarida letu kwa usasishaji na habari."
diff --git a/liiweb/settings.py b/liiweb/settings.py
index 0bc3b16f5..e4177e4b8 100644
--- a/liiweb/settings.py
+++ b/liiweb/settings.py
@@ -7,3 +7,5 @@
# Court codes mappings for legacy lii urls
# Override this in the lii settings.py
COURT_CODE_MAPPINGS = {}
+
+ADMINS = [("Laws.Africa", "info@laws.africa")]
diff --git a/liiweb/templates/liiweb/pocketlaw.html b/liiweb/templates/liiweb/pocketlaw.html
index 088257369..2a871894d 100644
--- a/liiweb/templates/liiweb/pocketlaw.html
+++ b/liiweb/templates/liiweb/pocketlaw.html
@@ -22,6 +22,7 @@ Your offline {{ APP_NAME }} companion.
Get started with Pocket Law
+ {% include "peachjam/_help_button.html" with link="pocket-law" %}- Download Pocket Law {{ APP_NAME }}.
- Double-click the application to start the installation. diff --git a/peachjam/adapters/adapters.py b/peachjam/adapters/adapters.py index da1b27656..ed1132f6f 100644 --- a/peachjam/adapters/adapters.py +++ b/peachjam/adapters/adapters.py @@ -18,12 +18,14 @@ Author, CoreDocument, DocumentNature, + DocumentTopic, GenericDocument, LegalInstrument, Legislation, Locality, Predicate, Relationship, + Taxonomy, Work, ) from peachjam.plugins import plugins @@ -87,6 +89,7 @@ def __init__(self, settings): } ) self.api_url = self.settings["api_url"] + self.taxonomy_topic_root = self.settings.get("taxonomy_topic_root") def check_for_updates(self, last_refreshed): """Checks for documents updated since last_refreshed (which may be None), and returns a list @@ -257,6 +260,14 @@ def update_document(self, url): if hasattr(model, "metadata_json"): field_data["metadata_json"] = document + if hasattr(model, "timeline_json"): + timeline = self.client_get(f"{url}/timeline.json").json() + field_data["timeline_json"] = timeline["timeline"] + + if hasattr(model, "commencements_json"): + commencements_json = self.client_get(f"{url}/commencements.json").json() + field_data["commencements_json"] = commencements_json["commencements"] + if hasattr(model, "repealed") and document["repeal"]: field_data["repealed"] = True @@ -290,6 +301,28 @@ def update_document(self, url): # the source file is the PDF version self.download_source_file(f"{url}.pdf", created_doc, title) + if self.taxonomy_topic_root: + # clear any existing taxonomies + created_doc.taxonomies.filter( + topic__slug__startswith=self.taxonomy_topic_root + ).delete() + + if document["taxonomy_topics"]: + # get topics beginning with "subject-areas" + topics = [ + t + for t in document["taxonomy_topics"] + if t.startswith(self.taxonomy_topic_root) + ] + if topics: + taxonomies = Taxonomy.objects.filter(slug__in=topics) + for taxonomy in taxonomies: + DocumentTopic.objects.create( + document=created_doc, + topic=taxonomy, + ) + logger.info(f"Added {len(taxonomies)} taxonomies to {created_doc}") + self.set_parent(document, created_doc) self.fetch_relationships(document, created_doc) diff --git a/peachjam/admin.py b/peachjam/admin.py index 447a977e3..3e62a247b 100644 --- a/peachjam/admin.py +++ b/peachjam/admin.py @@ -77,6 +77,7 @@ ) from peachjam.resources import ( ArticleResource, + AttorneyResource, GenericDocumentResource, JudgmentResource, UserResource, @@ -326,9 +327,19 @@ def _save_m2m(self): self.instance.update_text_content() +class AttachedFilesInline(BaseAttachmentFileInline): + model = AttachedFiles + form = AttachedFilesForm + + class DocumentAdmin(BaseAdmin): form = DocumentForm - inlines = [DocumentTopicInline, SourceFileInline, AlternativeNameInline] + inlines = [ + DocumentTopicInline, + SourceFileInline, + AlternativeNameInline, + AttachedFilesInline, + ] list_display = ( "title", "jurisdiction", @@ -655,11 +666,6 @@ class CaseNumberAdmin(admin.StackedInline): fields = ["matter_type", "number", "year", "string_override"] -class AttachedFilesInline(BaseAttachmentFileInline): - model = AttachedFiles - form = AttachedFilesForm - - class BenchInline(admin.TabularInline): # by using an inline, the ordering of the judges is preserved model = Bench @@ -693,7 +699,6 @@ class JudgmentAdmin(ImportExportMixin, DocumentAdmin): inlines = [ BenchInline, CaseNumberAdmin, - AttachedFilesInline, ] + DocumentAdmin.inlines filter_horizontal = ("judges", "attorneys") list_filter = (*DocumentAdmin.list_filter, "court") @@ -736,6 +741,9 @@ class JudgmentAdmin(ImportExportMixin, DocumentAdmin): "Advanced", ) + class Media: + js = ("js/judgment_duplicates.js",) + def get_fieldsets(self, request, obj=None): fieldsets = super().get_fieldsets(request, obj) @@ -1005,10 +1013,15 @@ class MatterTypeAdmin(BaseAdmin): help_topic = "site-admin/add-matter-types" +@admin.register(Attorney) +class AttorneyAdmin(ImportExportMixin, admin.ModelAdmin): + resource_class = AttorneyResource + list_display = ("name", "description") + + admin.site.register( [ CitationLink, - Attorney, CourtClass, AttachedFileNature, CitationProcessing, diff --git a/peachjam/fixtures/documents/sample_documents.json b/peachjam/fixtures/documents/sample_documents.json index b4bb05144..4d4f72f28 100644 --- a/peachjam/fixtures/documents/sample_documents.json +++ b/peachjam/fixtures/documents/sample_documents.json @@ -9459,17 +9459,6 @@ "assent_date": null, "commenced": true, "commencement_date": "2009-12-18", - "commencements": [ - { - "all_provisions": true, - "commencing_frbr_uri": null, - "commencing_title": null, - "date": "2009-12-18", - "main": true, - "note": "", - "provisions": [] - } - ], "commencing_work": null, "country": "aa", "created_at": "2022-08-15T18:01:56.600733Z", @@ -9571,6 +9560,50 @@ "url": "https://api.laws.africa/v2/akn/aa-au/act/pact/2005/non-aggression-and-common-defence/eng@2005-01-31", "year": "2005" }, + "timeline_json": [ + { + "date": "2020-12-15", + "events": [ + { + "note": "", + "type": "publication", + "by_title": "", + "by_frbr_uri": "", + "description": "Published" + }, + { + "note": "", + "type": "commencement", + "by_title": "", + "by_frbr_uri": "", + "description": "Commenced" + } + ] + }, + { + "date": "2020-12-14", + "events": [ + { + "note": "", + "type": "assent", + "by_title": "", + "by_frbr_uri": "", + "description": "Assented to" + } + ] + } + ], + "commencements_json": [ + { + "all_provisions": true, + "commencing_frbr_uri": null, + "commencing_title": null, + "date": "2009-12-18", + "main": true, + "note": "", + "provisions": [] + } + ], "parent_work": null, "repealed": false }, @@ -9608,17 +9641,6 @@ "assent_date": null, "commenced": true, "commencement_date": "1972-03-15", - "commencements": [ - { - "all_provisions": true, - "commencing_frbr_uri": null, - "commencing_title": null, - "date": "1972-03-15", - "main": true, - "note": "", - "provisions": [] - } - ], "commencing_work": null, "country": "aa", "created_at": "2022-08-30T10:11:39.239608Z", @@ -9720,6 +9742,43 @@ "url": "https://api.laws.africa/v2/akn/aa-au/act/1969/civil-aviation-commission/eng@1969-01-17", "year": "1969" }, + "timeline_json": [ + { + "date": "1972-03-15", + "events": [ + { + "note": "", + "type": "commencement", + "by_title": "", + "by_frbr_uri": "", + "description": "Commenced" + } + ] + }, + { + "date": "1969-01-17", + "events": [ + { + "note": "", + "type": "consolidation", + "by_title": "", + "by_frbr_uri": "", + "description": "Consolidation" + } + ] + } + ], + "commencements_json": [ + { + "all_provisions": true, + "commencing_frbr_uri": null, + "commencing_title": null, + "date": "1972-03-15", + "main": true, + "note": "", + "provisions": [] + } + ], "parent_work": null, "repealed": false }, @@ -10004,237 +10063,1146 @@ } }, { - "model": "peachjam.work", - "pk": 2433, + "model": "peachjam.coredocument", + "pk": 3041, "fields": { - "frbr_uri": "/akn/za/act/1979/70", + "polymorphic_ctype": [ + "peachjam", + "legislation" + ], + "work": 2433, + "doc_type": "legislation", "title": "Divorce Act, 1979", - "languages": "[\"eng\"]", - "ranking": 0.0 - } - }, - { - "model": "peachjam.legislation", - "pk": 3040, - "fields": { - "metadata_json": { - "url": "https://api.laws.africa/v2/akn/za/act/1979/70/eng@2020-10-22", - "stub": false, - "year": "1979", - "links": [ - { - "rel": "alternate", - "href": "https://api.laws.africa/v2/akn/za/act/1979/70/eng@2020-10-22.html", - "title": "HTML", - "mediaType": "text/html" - }, - { - "rel": "alternate", - "href": "https://api.laws.africa/v2/akn/za/act/1979/70/eng@2020-10-22.html?standalone=1", - "title": "Standalone HTML", - "mediaType": "text/html" - }, - { - "rel": "alternate", - "href": "https://api.laws.africa/v2/akn/za/act/1979/70/eng@2020-10-22.xml", - "title": "Akoma Ntoso", - "mediaType": "application/xml" - }, - { - "rel": "alternate", - "href": "https://api.laws.africa/v2/akn/za/act/1979/70/eng@2020-10-22.pdf", - "title": "PDF", - "mediaType": "application/pdf" - }, - { - "rel": "alternate", - "href": "https://api.laws.africa/v2/akn/za/act/1979/70/eng@2020-10-22.epub", - "title": "ePUB", - "mediaType": "application/epub+zip" - }, - { - "rel": "toc", - "href": "https://api.laws.africa/v2/akn/za/act/1979/70/eng@2020-10-22/toc.json", - "title": "Table of Contents", - "mediaType": "application/json" - }, - { - "rel": "media", - "href": "https://api.laws.africa/v2/akn/za/act/1979/70/eng@2020-10-22/media.json", - "title": "Media", - "mediaType": "application/json" - } - ], - "title": "Divorce Act, 1979", - "nature": "act", - "number": "70", - "repeal": null, - "country": "za", - "subtype": null, - "frbr_uri": "/akn/za/act/1979/70", - "language": "eng", - "locality": null, - "commenced": true, - "principal": true, - "type_name": "Act", - "amendments": [ - { - "date": "1984-11-01", - "amending_uri": "/akn/za/act/1984/88", - "amending_title": "Matrimonial Property Act, 1984" - }, - { - "date": "1986-10-03", - "amending_uri": "/akn/za/act/1986/97", - "amending_title": "Transfer of Powers and Duties of the State President Act, 1986" - }, - { - "date": "1988-12-02", - "amending_uri": "/akn/za/act/1988/3", - "amending_title": "Marriage and Matrimonial Property Law Amendment Act, 1988" - }, - { - "date": "1989-08-01", - "amending_uri": "/akn/za/act/1989/7", - "amending_title": "Divorce Amendment Act, 1989" - }, - { - "date": "1990-10-01", - "amending_uri": "/akn/za/act/1987/24", - "amending_title": "Mediation in Certain Divorce Matters Act, 1987" - }, - { - "date": "1992-04-15", - "amending_uri": "/akn/za/act/1992/44", - "amending_title": "Divorce Amendment Act, 1992" - }, - { - "date": "1992-08-01", - "amending_uri": "/akn/za/act/1992/3", - "amending_title": "Domicile Act, 1992" - }, - { - "date": "1996-11-22", - "amending_uri": "/akn/za/act/1996/95", - "amending_title": "Divorce Amendment Act, 1996" - }, - { - "date": "1997-04-01", - "amending_uri": "/akn/za/act/1996/18", - "amending_title": "Justice Laws Rationalisation Act, 1996" - }, - { - "date": "1998-04-06", - "amending_uri": "/akn/za/act/1997/65", - "amending_title": "Divorce Courts Amendment Act, 1997" - }, - { - "date": "1998-06-01", - "amending_uri": "/akn/za/act/1996/65", - "amending_title": "Films and Publications Act, 1996" - }, - { - "date": "2005-03-31", - "amending_uri": "/akn/za/act/2003/55", - "amending_title": "Judicial Matters Second Amendment Act, 2003" - }, - { - "date": "2010-08-09", - "amending_uri": "/akn/za/act/2008/31", - "amending_title": "Jurisdiction of Regional Courts Amendment Act, 2008" - }, - { - "date": "2020-10-22", - "amending_uri": "/akn/za/act/2020/12", - "amending_title": "Judicial Matters Amendment Act, 2020" - } - ], - "as_at_date": null, - "created_at": "2022-01-13T19:46:11.150418Z", - "taxonomies": [ - { - "title": "Special Collections", - "topics": [ - { - "level_1": "Magistrates' Legislation Handbook", - "level_2": null - }, - { - "level_1": "Pension Funds Adjudicator", - "level_2": null - } - ], - "vocabulary": "lawsafrica-special" - } - ], - "updated_at": "2022-05-17T08:25:31.533995Z", - "assent_date": "1979-06-08", - "parent_work": null, - "commencements": [ - { - "date": "1979-07-01", - "main": true, - "note": "See section 19", - "provisions": [], - "all_provisions": true, - "commencing_title": null, - "commencing_frbr_uri": null - } - ], - "numbered_title": "Act 70 of 1979", - "points_in_time": [ - { - "date": "1979-06-15", - "expressions": [ - { - "url": "https://api.laws.africa/v2/akn/za/act/1979/70/eng@1979-06-15", - "title": "Divorce Act, 1979", - "language": "eng", - "expression_date": "1979-06-15", - "expression_frbr_uri": "/akn/za/act/1979/70/eng@1979-06-15" - } - ] - }, - { - "date": "1984-11-01", - "expressions": [ - { - "url": "https://api.laws.africa/v2/akn/za/act/1979/70/eng@1984-11-01", - "title": "Divorce Act, 1979", - "language": "eng", - "expression_date": "1984-11-01", - "expression_frbr_uri": "/akn/za/act/1979/70/eng@1984-11-01" - } - ] - }, - { - "date": "1986-10-03", - "expressions": [ - { - "url": "https://api.laws.africa/v2/akn/za/act/1979/70/eng@1986-10-03", - "title": "Divorce Act, 1979", - "language": "eng", - "expression_date": "1986-10-03", - "expression_frbr_uri": "/akn/za/act/1979/70/eng@1986-10-03" - } - ] - }, - { - "date": "1988-12-02", - "expressions": [ - { - "url": "https://api.laws.africa/v2/akn/za/act/1979/70/eng@1988-12-02", - "title": "Divorce Act, 1979", - "language": "eng", - "expression_date": "1988-12-02", - "expression_frbr_uri": "/akn/za/act/1979/70/eng@1988-12-02" - } - ] - }, - { - "date": "1989-08-01", - "expressions": [ - { + "date": "2010-08-09", + "source_url": "https://api.laws.africa/v2/akn/za/act/1979/70/media/publication/za-act-1979-70-publication-document.pdf", + "citation": "Act 70 of 1979", + "content_html": "\n\n\n\n \n\n\n
- \n \n \n \n \n Published in Government Gazette no. 6506 on 15 June 1979\n \n \n\n \n \n \n\n\n \n \n
- \n Assented to on 8 June 1979\n \n \n \n\n \n \n \n
- \n \n Commenced on 1 July 1979\n \n \n \n \n \n \n \n
- Note: See section 19 \n \n \n \n\n \n \n
- \n [This is the version of this document from 22 October 2020.]\n \n \n \n\n \n \n \n \n \n\n \n \n \n \n \n\n \n \n \n \n \n
- \n \n \n \n [Amended by Matrimonial Property Act, 1984 (Act 88 of 1984) on 1 November 1984]\n \n \n \n \n
- \n \n \n \n [Amended by Transfer of Powers and Duties of the State President Act, 1986 (Act 97 of 1986) on 3 October 1986]\n \n \n \n \n
- \n \n \n \n [Amended by Marriage and Matrimonial Property Law Amendment Act, 1988 (Act 3 of 1988) on 2 December 1988]\n \n \n \n \n
- \n \n \n \n [Amended by Divorce Amendment Act, 1989 (Act 7 of 1989) on 1 August 1989]\n \n \n \n \n
- \n \n \n \n [Amended by Mediation in Certain Divorce Matters Act, 1987 (Act 24 of 1987) on 1 October 1990]\n \n \n \n \n
- \n \n \n \n [Amended by Divorce Amendment Act, 1992 (Act 44 of 1992) on 15 April 1992]\n \n \n \n \n
- \n \n \n \n [Amended by Domicile Act, 1992 (Act 3 of 1992) on 1 August 1992]\n \n \n \n \n
- \n \n \n \n [Amended by Divorce Amendment Act, 1996 (Act 95 of 1996) on 22 November 1996]\n \n \n \n \n
- \n \n \n \n [Amended by Justice Laws Rationalisation Act, 1996 (Act 18 of 1996) on 1 April 1997]\n \n \n \n \n
- \n \n \n \n [Amended by Divorce Courts Amendment Act, 1997 (Act 65 of 1997) on 6 April 1998]\n \n \n \n \n
- \n \n \n \n [Amended by Films and Publications Act, 1996 (Act 65 of 1996) on 1 June 1998]\n \n \n \n \n
- \n \n \n \n [Amended by Judicial Matters Second Amendment Act, 2003 (Act 55 of 2003) on 31 March 2005]\n \n \n \n \n
- \n \n \n \n [Amended by Jurisdiction of Regional Courts Amendment Act, 2008 (Act 31 of 2008) on 9 August 2010]\n \n \n \n \n
- \n \n \n \n [Amended by Judicial Matters Amendment Act, 2020 (Act 12 of 2020) on 22 October 2020]\n \n \n \n \n\n \n
\n \n\n \n
\n\n\n\n\n\n\n\n\n \n South Africa\n
\n \n\n \n \n \n\n \n Divorce Act, 1979
\n \n\n \n \n \nAct 70 of 1979
\n \n \n \n\n \n- \n \n \n
- \n \n
1. Definitions
\n2. Jurisdiction
\n3. Dissolution of marriage and grounds of divorce
\nA marriage may be dissolved by a court by a decree of divorce and the only grounds on which such a decree may be granted are—4. Irretrievable break-down of marriage as ground of divorce
\n5. Mental illness or continuous unconsciousness as grounds of divorce
\n5A. Refusal to grant divorce
\nIf it appears to a court in divorce proceedings that despite the granting of a decree of divorce by the court the spouses or either one of them will, by reason of the prescripts of their religion or the religion of either one of them, not be free to remarry unless the marriage is also dissolved in accordance with such prescripts or unless a barrier to the remarriage of the spouse concerned is removed, the court may refuse to grant a decree of divorce unless the court is satisfied that the spouse within whose power it is to have the marriage so dissolved or the said barrier so removed, has taken all the necessary steps to have the marriage so dissolved or the barrier to the remarriage of the other spouse removed or the court may make any other order that it finds just.[section 5A inserted by section 1 of Act 95 of 1996]6. Safeguarding of interests of dependent and minor children
\n7. Division of assets and maintenance of parties
\n8. Rescission, suspension or variation of orders
\n9. Forfeiture of patrimonial benefits of marriage
\n10. Costs
\nIn a divorce action the court shall not be bound to make an order for costs in favour of the successful party, but the court may, having regard to the means of the parties, and their conduct in so far as it may be relevant, make such order as it considers just, and the court may order that the costs of the proceedings be apportioned between the parties.11. Procedure
\nThe procedure applicable with reference to a divorce action shall be the procedure prescribed from time to time by rules of court.12. Limitation of publication of particulars of divorce action\n
\n13. Recognition of certain foreign divorce orders
\nThe validity of a divorce order or an order for the annulment of a marriage or for judicial separation granted in a court of a foreign country or territory shall be recognized by a court in the Republic if, on the date on which the order was granted, either party to the marriage-14. Abolition of orders for restitution of conjugal rights and judicial separation
\nIt shall not be competent for a court to issue an order for the restitution of conjugal rights or for judicial separation.15. Application of Act
\nThis Act shall not apply with reference to a divorce action or proceedings for the restitution of conjugal rights or for judicial separation instituted before the commencement of this Act.16. Amendment of section 5 of Act 37 of 1953, as amended by section 2 of Act 13 of 1966\n
\nSection 5 of the Matrimonial Affairs Act, 1953, is hereby amended—17. Amendment of section 72 of Act 66 of 1965, as amended by section 7 of Act 54 of 1970\n
\nSection 72 of the Administration of Estates Act, 1965, is hereby amended by the substitution for that part of subsection (1) which precedes paragraph (b) thereof, of the following:\"(1) The Master shall, subject to the provisions of subsection (3) and to any applicable provision of section 5 of the Matrimonial Affairs Act, 1953 (Act No. 37 of 1953), and section 4 of the Matrimonial Affairs Ordinance, 1955 (Ordinance No. 25 of 1955), of the territory, or any order of court made under any such provision or any provision of the Divorce Act, 1979, on the written application of any person—18. Repeal of laws
\nThe laws mentioned in the Schedule are hereby repealed to the extent set out in the third column of the Schedule.19. Short title and commencement
\nThis Act shall be called the Divorce Act, 1979, and shall come into operation on 1 July 1979.
+
+
+
+
+
diff --git a/peachjam/js/components/FilterFacets/SingleFacet.vue b/peachjam/js/components/FilterFacets/SingleFacet.vue
index 25c872fa1..7f8e0608e 100644
--- a/peachjam/js/components/FilterFacets/SingleFacet.vue
+++ b/peachjam/js/components/FilterFacets/SingleFacet.vue
@@ -18,7 +18,7 @@
/>
-
+
+
';
+ return '
';
} else {
return ``;
}
diff --git a/peachjam/js/components/FindDocuments/index.vue b/peachjam/js/components/FindDocuments/index.vue
index f8615e6ba..65e077428 100644
--- a/peachjam/js/components/FindDocuments/index.vue
+++ b/peachjam/js/components/FindDocuments/index.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
diff --git a/peachjam/js/components/FindDocuments/SearchResult.vue b/peachjam/js/components/FindDocuments/SearchResult.vue
index bbb68fcb2..11c353674 100644
--- a/peachjam/js/components/FindDocuments/SearchResult.vue
+++ b/peachjam/js/components/FindDocuments/SearchResult.vue
@@ -1,7 +1,7 @@
';
} else {
return ``;
}
diff --git a/peachjam/js/components/FindDocuments/index.vue b/peachjam/js/components/FindDocuments/index.vue
index f8615e6ba..65e077428 100644
--- a/peachjam/js/components/FindDocuments/index.vue
+++ b/peachjam/js/components/FindDocuments/index.vue
@@ -1,5 +1,5 @@
-
+