comparison mercurial/i18n.py @ 21746:2d47d81c79fb

i18n: explicitly decode paragraphs

This was triggering an exception when the default encoding was disabled.

21745:4c62478be2ea

    # If message is None, t.ugettext will return u'None' as the
    # translation whereas our callers expect us to return None.
    if message is None:
        return message

    paragraphs = message.split('\n\n')
    # Be careful not to translate the empty string -- it holds the
    # meta data of the .po file.
    u = u'\n\n'.join([p and t.ugettext(p) or '' for p in paragraphs])
    try:
        # encoding.tolocal cannot be used since it will first try to

21746:2d47d81c79fb

    # If message is None, t.ugettext will return u'None' as the
    # translation whereas our callers expect us to return None.
    if message is None:
        return message

    if type(message) is unicode:
        # goofy unicode docstrings in test
        paragraphs = message.split(u'\n\n')
    else:
        paragraphs = [p.decode("ascii") for p in message.split('\n\n')]
    # Be careful not to translate the empty string -- it holds the
    # meta data of the .po file.
    u = u'\n\n'.join([p and t.ugettext(p) or '' for p in paragraphs])
    try:
        # encoding.tolocal cannot be used since it will first try to