summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-11-10 00:57:29 -0600
committerMichael Merickel <michael@merickel.org>2014-11-10 00:57:29 -0600
commitd1d3edbbafd5ed0160e70f960025a12fa0783b5b (patch)
treed4bbc47ee9c469d3a89cf84f9df27b0edffe0f29 /docs/glossary.rst
parentfe83c6bfdab16818cb434d95a09bd6510b43aa24 (diff)
parent7dd39020afbd50f6b27e03bb81ace700ae280bef (diff)
downloadpyramid-d1d3edbbafd5ed0160e70f960025a12fa0783b5b.tar.gz
pyramid-d1d3edbbafd5ed0160e70f960025a12fa0783b5b.tar.bz2
pyramid-d1d3edbbafd5ed0160e70f960025a12fa0783b5b.zip
Merge branch 'master' into feature.security-docs-enhancements
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst9
1 files changed, 8 insertions, 1 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index ef207a4bb..01300a0be 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -758,9 +758,16 @@ Glossary
made. For example the word "java" might be translated
differently if the translation domain is "programming-languages"
than would be if the translation domain was "coffee". A
- translation domain is represnted by a collection of ``.mo`` files
+ translation domain is represented by a collection of ``.mo`` files
within one or more :term:`translation directory` directories.
+ Translation Context
+ A string representing the "context" in which a translation was
+ made within a given :term:`translation domain`. See the gettext
+ documentation, `11.2.5 Using contexts for solving ambiguities
+ <https://www.gnu.org/software/gettext/manual/gettext.html#Contexts>`_
+ for more information.
+
Translator
A callable which receives a :term:`translation string` and returns a
translated Unicode object for the purposes of internationalization. A