This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7435

i18n: get datapath directly from resourceutil
ClosedPublic

Authored by martinvonz on Nov 15 2019, 2:12 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGf0bee3b1b847: i18n: get datapath directly from resourceutil
rHG3ba0aae3b2f2: i18n: get datapath directly from resourceutil
Summary

The new resourceutil module is lower in the dependency graph, so we
can depend directly on it and won't have to depend on the util module
to inject the datapath.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Nov 15 2019, 2:12 PM
indygreg accepted this revision.Nov 16 2019, 2:08 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
mercurial/i18n.py
57

I'm not thrilled about the use of global variables here: I feel like the locale directory and related functionality should be associated with a ui instance or something. But this was an existing can of worms and you didn't make anything worse. So this is fine for now.

This revision is now accepted and ready to land.Nov 16 2019, 2:08 PM
martinvonz added a commit: rHG3ba0aae3b2f2: i18n: get datapath directly from resourceutil.Nov 16 2019, 2:22 PM
Closed by commit rHG3ba0aae3b2f2: i18n: get datapath directly from resourceutil (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 18184

doc/gendoc.py

# This script is executed during installs and may not have C extensions # This script is executed during installs and may not have C extensions
# available. Relax C module requirements. # available. Relax C module requirements.
os.environ['HGMODULEPOLICY'] = 'allow' os.environ['HGMODULEPOLICY'] = 'allow'
# import from the live mercurial repo # import from the live mercurial repo
sys.path.insert(0, "..") sys.path.insert(0, "..")
from mercurial import demandimport from mercurial import demandimport
demandimport.enable() demandimport.enable()
# Load util so that the locale path is set by i18n.setdatapath() before
# calling _().
from mercurial import util
util.datapath
from mercurial import ( from mercurial import (
commands, commands,
encoding, encoding,
extensions, extensions,
help, help,
minirst, minirst,
pycompat, pycompat,
ui as uimod, ui as uimod,

mercurial/i18n.py

# i18n.py - internationalization support for mercurial # i18n.py - internationalization support for mercurial
# #
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import gettext as gettextmod import gettext as gettextmod
import locale import locale
import os import os
import sys import sys
from .pycompat import getattr from .pycompat import getattr
from .utils import resourceutil
from . import ( from . import (
encoding, encoding,
pycompat, pycompat,
) )
# modelled after templater.templatepath: # modelled after templater.templatepath:
if getattr(sys, 'frozen', None) is not None: if getattr(sys, 'frozen', None) is not None:
module = pycompat.sysexecutable module = pycompat.sysexecutable
import ctypes import ctypes
langid = ctypes.windll.kernel32.GetUserDefaultUILanguage() langid = ctypes.windll.kernel32.GetUserDefaultUILanguage()
_languages = [locale.windows_locale[langid]] _languages = [locale.windows_locale[langid]]
except (ImportError, AttributeError, KeyError): except (ImportError, AttributeError, KeyError):
# ctypes not found or unknown langid # ctypes not found or unknown langid
pass pass
_ugettext = None
datapath = pycompat.fsdecode(resourceutil.datapath)
def setdatapath(datapath):
datapath = pycompat.fsdecode(datapath)
localedir = os.path.join(datapath, 'locale') localedir = os.path.join(datapath, 'locale')
t = gettextmod.translation('hg', localedir, _languages, fallback=True) t = gettextmod.translation('hg', localedir, _languages, fallback=True)
global _ugettext
try: try:
_ugettext = t.ugettext _ugettext = t.ugettext
except AttributeError: except AttributeError:
_ugettext = t.gettext _ugettext = t.gettext
indygregUnsubmitted
Not Done

I'm not thrilled about the use of global variables here: I feel like the locale directory and related functionality should be associated with a ui instance or something. But this was an existing can of worms and you didn't make anything worse. So this is fine for now.

indygreg: I'm not thrilled about the use of global variables here: I feel like the locale directory and…
_msgcache = {} # encoding: {message: translation} _msgcache = {} # encoding: {message: translation}
def gettext(message): def gettext(message):
"""Translate message. """Translate message.
The message is looked up in the catalog to get a Unicode string, The message is looked up in the catalog to get a Unicode string,

mercurial/util.py

while a and b and a[-1] == b[-1]: while a and b and a[-1] == b[-1]:
a.pop() a.pop()
b.pop() b.pop()
b.reverse() b.reverse()
return pycompat.ossep.join(([b'..'] * len(a)) + b) or b'.' return pycompat.ossep.join(([b'..'] * len(a)) + b) or b'.'
datapath = resourceutil.datapath datapath = resourceutil.datapath
i18n.setdatapath(datapath)
def checksignature(func): def checksignature(func):
'''wrap a function with code to check for calling errors''' '''wrap a function with code to check for calling errors'''
def check(*args, **kwargs): def check(*args, **kwargs):
try: try:
return func(*args, **kwargs) return func(*args, **kwargs)