summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorsebashwa <sebashwa@mailbox.org>2020-06-12 15:29:13 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2020-06-15 09:05:09 +0200
commit2d3b6bce28148fb0b8cf0939098bb6fe03d1b4f5 (patch)
tree3d998eaac85bf123063faafae8af9dd6d61599b5 /docs
parent6f526cb2038cb2b8a4bf58818f963a2759d81b89 (diff)
[3.1.x] Fixed #31690 -- Added note about fuzzy entries in translation docs.
Backport of 3d664a158de18acf72fc8e0671f0f390cbca4b2e from master
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/django-admin.txt4
-rw-r--r--docs/topics/i18n/translation.txt7
2 files changed, 10 insertions, 1 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 78efcf0afb..5e17ff8f8d 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -160,7 +160,7 @@ are excluded.
.. django-admin-option:: --use-fuzzy, -f
-Includes fuzzy translations into compiled files.
+Includes `fuzzy translations`_ into compiled files.
Example usage::
@@ -173,6 +173,8 @@ Example usage::
django-admin compilemessages -x pt_BR
django-admin compilemessages -x pt_BR -x fr
+.. _fuzzy translations: https://www.gnu.org/software/gettext/manual/html_node/Fuzzy-Entries.html
+
.. django-admin-option:: --ignore PATTERN, -i PATTERN
.. versionadded:: 3.0
diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt
index 5fdf8f0a4e..1aa46d8122 100644
--- a/docs/topics/i18n/translation.txt
+++ b/docs/topics/i18n/translation.txt
@@ -1619,6 +1619,13 @@ otherwise, they'll be tacked together without whitespace!
files are created). This means that everybody will be using the same
encoding, which is important when Django processes the PO files.
+.. admonition:: Fuzzy entries
+
+ :djadmin:`makemessages` sometimes generates translation entries marked as
+ fuzzy, e.g. when translations are inferred from previously translated
+ strings. By default, fuzzy entries are **not** processed by
+ :djadmin:`compilemessages`.
+
To reexamine all source code and templates for new translation strings and
update all message files for **all** languages, run this::