summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-11-17 02:27:03 -0600
committerMichael Merickel <michael@merickel.org>2014-11-17 02:27:03 -0600
commit5d0b1beaf3b09045fd3dd71244938ee6e391ebf3 (patch)
tree2fd3a374d4c937184497e5589bcf93391833949a /docs/glossary.rst
parent650d3d5fa383d89a3b28029162d6ef4d58be3da1 (diff)
parentc0f1fc8d31df45371d5ae6689d3e0a39c058c3ac (diff)
downloadpyramid-5d0b1beaf3b09045fd3dd71244938ee6e391ebf3.tar.gz
pyramid-5d0b1beaf3b09045fd3dd71244938ee6e391ebf3.tar.bz2
pyramid-5d0b1beaf3b09045fd3dd71244938ee6e391ebf3.zip
Merge branch 'master' into feature.override-asset-with-absolute-path
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 deb4c1c8b..ef7e9a9ae 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -749,9 +749,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