-
-
Notifications
You must be signed in to change notification settings - Fork 31k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fixed #35306 -- Updated 5.0 Docs #18028
Open
lufafajoshua
wants to merge
7
commits into
django:main
Choose a base branch
from
lufafajoshua:ticket_35306
base: main
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+12
−3
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
670045b
Fixed #35306 -- Updated 5.0 Docs
lufafajoshua 10c3f61
Merge branch 'main' of https://github.com/django/django into ticket_3…
lufafajoshua 7cfee8e
Merge branch 'main' of https://github.com/django/django into ticket_3…
lufafajoshua c1fa226
Modified LANGUAGE_CODE setting in 5.0 docs
lufafajoshua 09ca7d3
Adjustments to localization format docs 5.0
lufafajoshua cd2c877
Update settings.txt
lufafajoshua 17d525c
Update formatting.txt
lufafajoshua File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1843,16 +1843,18 @@ standard :term:`language ID format <language code>`. For example, U.S. English | |
is ``"en-us"``. See also the `list of language identifiers`_ and | ||
:doc:`/topics/i18n/index`. | ||
|
||
:setting:`USE_I18N` must be active for this setting to have any effect. | ||
|
||
It serves two purposes: | ||
It serves three purposes: | ||
|
||
* If the locale middleware isn't in use, it decides which translation is served | ||
to all users. | ||
* If the locale middleware is active, it provides a fallback language in case the | ||
user's preferred language can't be determined or is not supported by the | ||
website. It also provides the fallback translation when a translation for a | ||
given literal doesn't exist for the user's preferred language. | ||
* If localization is explicitly disabled via the :tfilter:`unlocalize` and | ||
:ttag:`{% localize off %}<localize>` template filters or tags, it provides fallback | ||
localization formats which will be applied instead. See | ||
:ref:`controlling localization in templates <topic-l10n-templates>` for details. | ||
|
||
See :ref:`how-django-discovers-language-preference` for more details. | ||
|
||
|
@@ -3666,6 +3668,9 @@ Forms | |
* :setting:`FORM_RENDERER` | ||
* :setting:`FORMS_URLFIELD_ASSUME_HTTPS` | ||
|
||
|
||
.. _globalization-settings: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a new unused reference, I believe the start of implementing this comment. |
||
|
||
Globalization (``i18n``/``l10n``) | ||
--------------------------------- | ||
* :setting:`DATE_FORMAT` | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This sentence is not complete. However, as a non-native speaker, I'll happily defer choosing a better formulation to someone else.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, "see" needs to be capitalized and it would be good to end with "for [insert something]".
You can just say "for more details" but you might want to be more specific like "for further explanation on [insert something]."
Rough example: