summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorlufafajoshua <77637648+lufafajoshua@users.noreply.github.com>2024-05-23 15:47:14 +0300
committerNatalia <124304+nessita@users.noreply.github.com>2024-07-01 16:33:28 -0300
commita6dd2880f5da6903cf4131e7f4d18ed9316c710c (patch)
tree67a9035b211b579bc1ba15c9042061ad9fbb4205 /docs
parent18d660d72084c7ab1aed090cef4074ca20852707 (diff)
[5.1.x] Fixed #35470 -- Separated i18n and l10n globalization settings docs.
Backport of 8733e9af998f0009d62e4f0f3d5ee566e93a4893 from main.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/settings.txt30
1 files changed, 21 insertions, 9 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 292adb3bac..0bfa144dbc 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -3672,14 +3672,14 @@ Forms
Globalization (``i18n``/``l10n``)
---------------------------------
-* :setting:`DATE_FORMAT`
-* :setting:`DATE_INPUT_FORMATS`
-* :setting:`DATETIME_FORMAT`
-* :setting:`DATETIME_INPUT_FORMATS`
-* :setting:`DECIMAL_SEPARATOR`
+
+.. _settings-i18n:
+
+Internationalization (``i18n``)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
* :setting:`FIRST_DAY_OF_WEEK`
* :setting:`FORMAT_MODULE_PATH`
-* :setting:`LANGUAGE_CODE`
* :setting:`LANGUAGE_COOKIE_AGE`
* :setting:`LANGUAGE_COOKIE_DOMAIN`
* :setting:`LANGUAGE_COOKIE_HTTPONLY`
@@ -3690,6 +3690,21 @@ Globalization (``i18n``/``l10n``)
* :setting:`LANGUAGES`
* :setting:`LANGUAGES_BIDI`
* :setting:`LOCALE_PATHS`
+* :setting:`TIME_ZONE`
+* :setting:`USE_I18N`
+* :setting:`USE_TZ`
+
+.. _settings-l10n:
+
+Localization (``l10n``)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* :setting:`DATE_FORMAT`
+* :setting:`DATE_INPUT_FORMATS`
+* :setting:`DATETIME_FORMAT`
+* :setting:`DATETIME_INPUT_FORMATS`
+* :setting:`DECIMAL_SEPARATOR`
+* :setting:`LANGUAGE_CODE`
* :setting:`MONTH_DAY_FORMAT`
* :setting:`NUMBER_GROUPING`
* :setting:`SHORT_DATE_FORMAT`
@@ -3697,10 +3712,7 @@ Globalization (``i18n``/``l10n``)
* :setting:`THOUSAND_SEPARATOR`
* :setting:`TIME_FORMAT`
* :setting:`TIME_INPUT_FORMATS`
-* :setting:`TIME_ZONE`
-* :setting:`USE_I18N`
* :setting:`USE_THOUSAND_SEPARATOR`
-* :setting:`USE_TZ`
* :setting:`YEAR_MONTH_FORMAT`
HTTP