Skip to content

Commit

Permalink
Merge pull request #13 from lelit/master
Browse files Browse the repository at this point in the history
Fix two typos and show both $var and ${var} syntaxes
  • Loading branch information
tseaver committed Apr 9, 2013
2 parents df3b6fc + d32ba69 commit c5d979c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions translationstring/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class TranslationString(text_type):
``default`` represents an explicit *default text* for this
translation string. Default text appears when the translation
string cannot be translated. Usually, the ``msgid`` of a
translation string serves double duty as as its default text.
translation string serves double duty as its default text.
However, using this option you can provide a different default
text for this translation string. This feature is useful when the
default of a translation string is too complicated or too long to
Expand Down Expand Up @@ -97,7 +97,7 @@ def __mod__(self, options):
def interpolate(self, translated=None):
""" Interpolate the value ``translated`` which is assumed to
be a Unicode object containing zero or more *replacement
markers* (``${foo}`` or ``${bar}``) using the ``mapping``
markers* (``$foo`` or ``${bar}``) using the ``mapping``
dictionary attached to this instance. If the ``mapping``
dictionary is empty or ``None``, no interpolation is
performed.
Expand All @@ -111,7 +111,7 @@ def interpolate(self, translated=None):
# NB: this function should never never lose the *original
# identity* of a non-``None`` but empty ``default`` value it
# is provided. If (translated == default) , it should return the
# *orignal* default, not a derivation. See the comment below in
# *original* default, not a derivation. See the comment below in
# ChameleonTranslate.

if self.mapping and translated:
Expand Down

0 comments on commit c5d979c

Please sign in to comment.