steve
/
mybuddy
mirror of https://github.com/snachodog/mybuddy.git
1
0
Fork 0
Code Issues 3 Packages Projects 1 Releases Wiki Activity

Combine `en` and `en_GB` date input formats

This commit is contained in:
Christopher C. Wells 2021-10-26 19:36:31 -07:00 committed by Christopher Charbonneau Wells
parent b5d9875e9a
commit 0c0d4baf41
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
babybuddy/formats/en/formats.py
View File

@ -1,5 +1,6 @@
from django.conf import settings from django.conf import settings
from django.conf.locale.en import formats from django.conf.locale.en import formats as formats_us
from django.conf.locale.en_GB import formats as formats_gb
# Override the regular locale settings to support 24 hour time. # Override the regular locale settings to support 24 hour time.
if settings.USE_24_HOUR_TIME_FORMAT: if settings.USE_24_HOUR_TIME_FORMAT:
@ -22,5 +23,12 @@ else:
# only work with the locale format locale specified by this file. # only work with the locale format locale specified by this file.
SHORT_MONTH_DAY_FORMAT = 'M j' SHORT_MONTH_DAY_FORMAT = 'M j'
# Combine en_US (en) and en_GB formats. This seems to be necessary because when
# an en language variation is used this file is still loaded and there is no
# way to implement e.g. an en_US format. Combining these formats allows the app
# to support both en (en_US) and en_GB without enforcing US-centric input
# formats on users with a en_GB setting.
formats = formats_us.DATETIME_INPUT_FORMATS + formats_gb.DATETIME_INPUT_FORMATS
# Append all other input formats from the base locale. # Append all other input formats from the base locale.
DATETIME_INPUT_FORMATS = CUSTOM_INPUT_FORMATS + formats.DATETIME_INPUT_FORMATS DATETIME_INPUT_FORMATS = CUSTOM_INPUT_FORMATS + formats