Merge pull request #275 from VSEScala/mhvis-patch-20231228-locale

Change locale formatting in preparation for Django 5.0
VSEScala · Dec 31, 2023 · e8fe22e · e8fe22e
2 parents 08cc428 + 55173d2
commit e8fe22e
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 18 deletions.
diff --git a/assets/templates/accounts/user_history_claimed.html b/assets/templates/accounts/user_history_claimed.html
@@ -25,7 +25,7 @@
             {% for entry in object_list %}
                 <tr>
                     <td>
-                        {{ entry.date }}
+                        {{ entry.date|date:"SHORT_DATE_FORMAT" }}
                     </td>
                     <td>
                         {{ entry.dish }}

diff --git a/assets/templates/accounts/user_history_joined.html b/assets/templates/accounts/user_history_joined.html
@@ -22,7 +22,7 @@
             {% for entry in object_list %}
                 <tr>
                     <td>
-                        {{ entry.dining_list.date }}
+                        {{ entry.dining_list.date|date:"SHORT_DATE_FORMAT" }}
                     </td>
                     <td>
                         {{ entry.dining_list.dish }}

diff --git a/assets/templates/credit_management/transaction_table.html b/assets/templates/credit_management/transaction_table.html
@@ -13,7 +13,7 @@
         <tbody>
         {% for tx in object_list %}
             <tr>
-                <td>{{ tx.moment }}</td>
+                <td>{{ tx.moment|date:"SHORT_DATE_FORMAT" }}</td>
                 <td>
                     {% if tx.source == account_self %}
                         {{ tx.target }}

diff --git a/assets/templates/dining_lists/dining_day.html b/assets/templates/dining_lists/dining_day.html
@@ -48,7 +48,7 @@
         <div class="col-lg-4 mt-3 mt-lg-0 d-flex flex-column justify-content-center align-items-center">
             {# During weekend, next Monday is bold. If we don't want that, use 'today' instead of 'upcoming' here #}
             <h4 class="my-0 {% if date.upcoming == date %}font-weight-bold{% endif %}">
-                {{ date|date|capfirst }}
+                {{ date|date:"l j F"|capfirst }}
             </h4>
         </div>
     </div>

diff --git a/assets/templates/dining_lists/dining_slot.html b/assets/templates/dining_lists/dining_slot.html
@@ -15,7 +15,7 @@
     <div class="fixed-bottom bg-light">
         <div class="container text-center">
             <p class="lead">
-                {{ dining_list.association }} - {{ dining_list.date }}
+                {{ dining_list.association }} - {{ dining_list.date|date:"l j F" }}
             </p>
             <div class="row">
                 <div class="col px-1">

diff --git a/creditmanagement/templatetags/credit_tags.py b/creditmanagement/templatetags/credit_tags.py
@@ -1,15 +1,13 @@
 from django import template
-from django.utils.safestring import mark_safe
+from django.utils.formats import localize
 
 register = template.Library()
 
 
 @register.filter
 def euro(value):
     """Format for euro values."""
-    amount = "{:.2f}".format(abs(value))
-    v = "{}€{}".format("-" if value < 0 else "", amount)
-    return mark_safe(v)
+    return f"-€{localize(-value)}" if value < 0 else f"€{localize(value)}"
 
 
 @register.filter

diff --git a/scaladining/formats/__init__.py b/scaladining/formats/__init__.py
diff --git a/scaladining/formats/en/__init__.py b/scaladining/formats/en/__init__.py
diff --git a/scaladining/formats/en/formats.py b/scaladining/formats/en/formats.py
@@ -0,0 +1,4 @@
+"""Use Dutch style formatting for the English locale."""
+
+# noinspection PyUnresolvedReferences
+from django.conf.locale.nl.formats import *
diff --git a/scaladining/settings.py b/scaladining/settings.py
@@ -133,18 +133,13 @@ def file_parser(value):
 # Internationalization
 
 TIME_ZONE = "Europe/Amsterdam"
-
-# Automatic Dutch localization with English language is difficult,
-# so we'll set the date formats manually to Dutch style.
-DATE_FORMAT = "l j F"  # Default: N j, Y
-SHORT_DATE_FORMAT = "d-m-Y"  # Default: m/d/Y
-DATETIME_FORMAT = "N j, Y, G:i"  # Default: N j, Y, P
-SHORT_DATETIME_FORMAT = "d-m-Y G:i"  # Default: m/d/Y P
+LANGUAGE_CODE = "en-us"
+FORMAT_MODULE_PATH = "scaladining.formats"
 
 USE_I18N = False
-USE_L10N = False
-USE_TZ = True
 USE_THOUSAND_SEPARATOR = True
+# USE_TZ is True by default from Django 5.0
+USE_TZ = True
 
 AUTHENTICATION_BACKENDS = [
     "django.contrib.auth.backends.ModelBackend",