summaryrefslogtreecommitdiff
path: root/django/conf
diff options
context:
space:
mode:
authorMike Edmunds <medmunds@gmail.com>2025-07-22 20:44:22 -0700
committernessita <124304+nessita@users.noreply.github.com>2025-07-23 20:17:55 -0300
commit78298b51629e14c0e472898b635bc819d47b7f27 (patch)
treefc3302ebacba36e9b06d12f90b557c9314b9be1f /django/conf
parent69a93a88edb56ba47f624dac7a21aacc47ea474f (diff)
Refs #36500 -- Corrected rewrapped long lines fixed via a script.
Manually reformatted some comments and docstrings where autofix_w505.py changed the meaning of the formatting.
Diffstat (limited to 'django/conf')
-rw-r--r--django/conf/global_settings.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index ffbe5d3980..3d4c6f4a5f 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -343,8 +343,7 @@ FORMAT_MODULE_PATH = None
DATE_FORMAT = "N j, Y"
# Default formatting for datetime objects. See all available format strings
-# here:
-# https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# here: https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
DATETIME_FORMAT = "N j, Y, P"
# Default formatting for time objects. See all available format strings here:
@@ -362,8 +361,7 @@ YEAR_MONTH_FORMAT = "F Y"
MONTH_DAY_FORMAT = "F j"
# Default short formatting for date objects. See all available format strings
-# here:
-# https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# here: https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
SHORT_DATE_FORMAT = "m/d/Y"
# Default short formatting for datetime objects.