D7435: i18n: get datapath directly from resourceutil
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sat Nov 16 14:23:50 EST 2019
Closed by commit rHG3ba0aae3b2f2: i18n: get datapath directly from resourceutil (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D7435?vs=18168&id=18184
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7435/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7435
AFFECTED FILES
doc/gendoc.py
mercurial/i18n.py
mercurial/util.py
CHANGE DETAILS
diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -1824,7 +1824,6 @@
datapath = resourceutil.datapath
-i18n.setdatapath(datapath)
def checksignature(func):
diff --git a/mercurial/i18n.py b/mercurial/i18n.py
--- a/mercurial/i18n.py
+++ b/mercurial/i18n.py
@@ -13,6 +13,7 @@
import sys
from .pycompat import getattr
+from .utils import resourceutil
from . import (
encoding,
pycompat,
@@ -45,18 +46,14 @@
# ctypes not found or unknown langid
pass
-_ugettext = None
-
-def setdatapath(datapath):
- datapath = pycompat.fsdecode(datapath)
- localedir = os.path.join(datapath, 'locale')
- t = gettextmod.translation('hg', localedir, _languages, fallback=True)
- global _ugettext
- try:
- _ugettext = t.ugettext
- except AttributeError:
- _ugettext = t.gettext
+datapath = pycompat.fsdecode(resourceutil.datapath)
+localedir = os.path.join(datapath, 'locale')
+t = gettextmod.translation('hg', localedir, _languages, fallback=True)
+try:
+ _ugettext = t.ugettext
+except AttributeError:
+ _ugettext = t.gettext
_msgcache = {} # encoding: {message: translation}
diff --git a/doc/gendoc.py b/doc/gendoc.py
--- a/doc/gendoc.py
+++ b/doc/gendoc.py
@@ -26,11 +26,7 @@
from mercurial import demandimport
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 (
commands,
encoding,
To: martinvonz, #hg-reviewers, indygreg
Cc: indygreg, mercurial-devel
More information about the Mercurial-devel
mailing list