summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-11-12 12:23:48 -0500
committerChris McDonough <chrism@plope.com>2014-11-12 12:23:48 -0500
commitb1fac53cd0c3b930aec90e27f4d19c5f785f52e2 (patch)
treee71f8e716ab2d12cb692c5789120cd0984aaa340 /docs/glossary.rst
parent0337f987466dd47696f4293604d071bf020f165e (diff)
parent4d19a6f383c802f9620b7d2fc239e5c6ad6c52f9 (diff)
downloadpyramid-b1fac53cd0c3b930aec90e27f4d19c5f785f52e2.tar.gz
pyramid-b1fac53cd0c3b930aec90e27f4d19c5f785f52e2.tar.bz2
pyramid-b1fac53cd0c3b930aec90e27f4d19c5f785f52e2.zip
Merge branch 'master' of github.com:Pylons/pyramid
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