From ff752dac07f0c234bb355110900dc3fb0aadb022 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 22 Jan 2024 15:12:01 -0500 Subject: [PATCH] Closes #14862: Add note to date & time configs regarding localization --- docs/configuration/date-time.md | 3 +++ docs/configuration/system.md | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/configuration/date-time.md b/docs/configuration/date-time.md index ab8b5ad13..a23053e08 100644 --- a/docs/configuration/date-time.md +++ b/docs/configuration/date-time.md @@ -10,6 +10,9 @@ The time zone NetBox will use when dealing with dates and times. It is recommend You may define custom formatting for date and times. For detailed instructions on writing format strings, please see [the Django documentation](https://docs.djangoproject.com/en/stable/ref/templates/builtins/#date). Default formats are listed below. +!!! note + These system defaults will be overridden by a user's selected language/locale when [localization](./system.md#enable_localization) is enabled. + ```python DATE_FORMAT = 'N j, Y' # June 26, 2016 SHORT_DATE_FORMAT = 'Y-m-d' # 2016-06-26 diff --git a/docs/configuration/system.md b/docs/configuration/system.md index 7fbf9ec54..db77f8aff 100644 --- a/docs/configuration/system.md +++ b/docs/configuration/system.md @@ -69,7 +69,7 @@ Email is sent from NetBox only for critical events or if configured for [logging Default: False -Determines if localization features are enabled or not. This should only be enabled for development or testing purposes as netbox is not yet fully localized. Turning this on will localize numeric and date formats (overriding what is set for DATE_FORMAT) based on the browser locale as well as translate certain strings from third party modules. +Determines if localization features are enabled or not. This should only be enabled for development or testing purposes as netbox is not yet fully localized. Turning this on will localize numeric and date formats (overriding any configured [system defaults](./date-time.md#date-and-time-formatting)) based on the browser locale as well as translate certain strings from third party modules. ---