comparison mercurial/i18n.py @ 7948:de377b1a9a84

move encoding bits from util to encoding

In addition to cleaning up util, this gets rid of some circular dependencies.

7947:a454eeb1b827

This software may be used and distributed according to the terms
of the GNU General Public License, incorporated herein by reference.
"""

import gettext, sys, os

# modelled after templater.templatepath:
if hasattr(sys, 'frozen'):
    module = sys.executable
else:

    # 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

    # We cannot just run the text through util.tolocal since that
    # leads to infinite recursion when util._encoding is invalid.
    try:
        u = t.ugettext(message)
        return u.encode(util._encoding, "replace")
    except LookupError:
        return message

_ = gettext

# Moved after _ because of circular import.
import util

7948:de377b1a9a84

This software may be used and distributed according to the terms
of the GNU General Public License, incorporated herein by reference.
"""

import gettext, sys, os, encoding

# modelled after templater.templatepath:
if hasattr(sys, 'frozen'):
    module = sys.executable
else:

    # 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

    # We cannot just run the text through encoding.tolocal since that
    # leads to infinite recursion when encoding._encoding is invalid.
    try:
        u = t.ugettext(message)
        return u.encode(encoding.encoding, "replace")
    except LookupError:
        return message

_ = gettext