Merge branch 'main' into langcode

Author: James (ODSC)

CHANGELOG.md

@@ -7,10 +7,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+
 ### Added
 
 - Add `lang` attribute to `html` tag.
 
+### Fixed
+
+- If a file is expired, the error message states the correct DELETE_FILES_AFTER_DAYS value, instead of the default of 7.
+- If a file is expired, the "file not found" exception is caught by all possible sources.
+
 ## [0.30.5] - 2024-09-30
 
 ### Added

cove/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-09-25 21:29+0000\n"
+"POT-Creation-Date: 2024-10-04 15:54+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -558,22 +558,24 @@ msgid ""
 "Error message: {}"
 msgstr ""
 
-#: cove/views.py:77 cove/views.py:90
+#: cove/views.py:77 cove/views.py:109
 msgid "Sorry, the page you are looking for is not available"
 msgstr ""
 
-#: cove/views.py:79 cove/views.py:92
+#: cove/views.py:79 cove/views.py:111
 msgid "Go to Home page"
 msgstr ""
 
 #: cove/views.py:81
 msgid "We don't seem to be able to find the data you requested."
 msgstr ""
 
-#: cove/views.py:94
+#: cove/views.py:113
+#, python-format
 msgid ""
 "The data you were hoping to explore no longer exists.\n"
 "\n"
 "This is because all data supplied to this website is automatically deleted "
-"after 7 days, and therefore the analysis of that data is no longer available."
+"after %s days, and therefore the analysis of that data is no longer "
+"available."
 msgstr ""

cove/locale/es/LC_MESSAGES/django.mo

@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-26 01:52+0000\n"
+"POT-Creation-Date: 2024-10-04 15:54+0000\n"
 "PO-Revision-Date: 2018-11-30 11:12+0000\n"
 "Last-Translator: Bibiana Cristòfol <[email protected]>, 2021\n"
 "Language-Team: Spanish (https://www.transifex.com/OpenDataServices/"
@@ -616,27 +616,29 @@ msgstr ""
 "\n"
 "Mensaje del error: {}"
 
-#: cove/views.py:77 cove/views.py:90
+#: cove/views.py:77 cove/views.py:109
 msgid "Sorry, the page you are looking for is not available"
 msgstr "Lo sentimos, la página que está buscando no está disponible"
 
-#: cove/views.py:79 cove/views.py:92
+#: cove/views.py:79 cove/views.py:111
 msgid "Go to Home page"
 msgstr "Ir a la Página de Inicio"
 
 #: cove/views.py:81
 msgid "We don't seem to be able to find the data you requested."
 msgstr "Parece que no podemos encontrar los datos que usted solicitó."
 
-#: cove/views.py:94
+#: cove/views.py:113
+#, python-format
 msgid ""
 "The data you were hoping to explore no longer exists.\n"
 "\n"
 "This is because all data supplied to this website is automatically deleted "
-"after 7 days, and therefore the analysis of that data is no longer available."
+"after %s days, and therefore the analysis of that data is no longer "
+"available."
 msgstr ""
 "Los datos que usted quería explorar ya no existen.\n"
 "\n"
 "Esto se debe a que todos los datos suministrados a este sitio web se borran "
-"automáticamente después de 7 días, y por lo tanto el análisis de esos datos "
+"automáticamente después de %s días, y por lo tanto el análisis de esos datos "
 "ya no está disponible."

cove/locale/es/LC_MESSAGES/django.po

@@ -85,36 +85,37 @@ def explore_data_context(request, pk, get_file_type=None):
         file_name = data.original_file.path
         if file_name.endswith('validation_errors-3.json'):
             raise PermissionError('You are not allowed to upload a file with this name.')
+
+        file_type = get_file_type(data.original_file)
+        context = {
+            'original_file': {
+                'url': data.original_file.url,
+                'size': data.original_file.size,
+                'path': data.original_file.path,
+            },
+            'file_type': file_type,
+            'file_name': get_file_name(file_name),
+            'data_uuid': pk,
+            'current_url': request.build_absolute_uri(),
+            'source_url': data.source_url,
+            'form_name': data.form_name,
+            'created_datetime': data.created.strftime('%A, %d %B %Y %I:%M%p %Z'),
+            'created_date': data.created.strftime('%A, %d %B %Y'),
+            'created_time': data.created.strftime('%I:%M%p %Z'),
+            'support_email': settings.COVE_CONFIG.get('support_email'),
+        }
     except FileNotFoundError:
         return {}, None, render(request, 'error.html', {
             'sub_title': _('Sorry, the page you are looking for is not available'),
             'link': 'index',
             'link_text': _('Go to Home page'),
             'support_email': settings.COVE_CONFIG.get('support_email'),
             'msg': _('The data you were hoping to explore no longer exists.\n\nThis is because all '
-                     'data supplied to this website is automatically deleted after 7 days, and therefore '
+                     'data supplied to this website is automatically deleted after %s days, and therefore '
                      'the analysis of that data is no longer available.')
+                     % getattr(settings, 'DELETE_FILES_AFTER_DAYS', 7)
         }, status=404)
 
-    file_type = get_file_type(data.original_file)
-    context = {
-        'original_file': {
-            'url': data.original_file.url,
-            'size': data.original_file.size,
-            'path': data.original_file.path,
-        },
-        'file_type': file_type,
-        'file_name': get_file_name(file_name),
-        'data_uuid': pk,
-        'current_url': request.build_absolute_uri(),
-        'source_url': data.source_url,
-        'form_name': data.form_name,
-        'created_datetime': data.created.strftime('%A, %d %B %Y %I:%M%p %Z'),
-        'created_date': data.created.strftime('%A, %d %B %Y'),
-        'created_time': data.created.strftime('%I:%M%p %Z'),
-        'support_email': settings.COVE_CONFIG.get('support_email'),
-    }
-
     return (context, data, None)