Browse files

Update documentation for pull request #5

  • Loading branch information...
1 parent db73244 commit 64c8a6ee3bd471039d291a5567542647468d0ef7 @wichert wichert committed Feb 3, 2012
Showing with 7 additions and 1 deletion.
  1. +4 −0 CHANGES.txt
  2. +3 −1 docs/translation.rst
View
4 CHANGES.txt
@@ -4,6 +4,10 @@ translationstring
Next release
------------
+- Honour mapping information passed to the translator, combining it with
+ mapping data already part of the translation string.
+
+
- Support formatting of translation strings with %-operator.
0.4 (09-22-2011)
View
4 docs/translation.rst
@@ -48,7 +48,9 @@ The optional ``domain`` argument can be used to specify or override
the domain of the ``tstring`` argument (useful when ``tstring`` is a
normal string rather than a translation string). The optional
``mapping`` argument can specify the interpolation mapping, useful
-when the ``tstring`` argument is not a translation string.
+when the ``tstring`` argument is not a translation string. If
+``tstring`` is a translation string its mapping data, if present, is
+combined with the data from the ``mapping`` argument.
.. code-block:: python
:linenos:

0 comments on commit 64c8a6e

Please sign in to comment.