Backed out changeset eeaacd858eab (bug 1922252) DONTBUILD
--HG-- rename : python/l10n/tb_l10n/missing_ftl.py => python/l10n/missing_ftl/__init__.py rename : python/l10n/tb_l10n/__init__.py => python/l10n/tbxchannel/__init__.py rename : python/l10n/tb_l10n/l10n_merge.py => python/l10n/tbxchannel/l10n_merge.py rename : python/l10n/tb_l10n/tb_migration_test.py => python/l10n/tbxchannel/tb_migration_test.py
This commit is contained in:
Родитель
77605cfb2c
Коммит
ace61c7c5a
|
@ -35,13 +35,14 @@ known-first-party = [
|
|||
"mozrelease",
|
||||
"mozterm",
|
||||
"mozversioncontrol",
|
||||
"mozxchannel",
|
||||
"tbxchannel",
|
||||
"gecko_taskgraph",
|
||||
"buildconfig",
|
||||
]
|
||||
known-local-folder = [
|
||||
"rocboot",
|
||||
"rocbuild",
|
||||
"tb_l10n",
|
||||
"thirdroc",
|
||||
"comm_taskgraph",
|
||||
]
|
||||
|
|
|
@ -25,7 +25,7 @@ GECKO_PATH = COMM_PATH.parent
|
|||
COMM_PYTHON_L10N = os.path.join(COMM_PATH, "python/l10n")
|
||||
sys.path.insert(1, COMM_PYTHON_L10N)
|
||||
|
||||
from tb_l10n.l10n_merge import (
|
||||
from tbxchannel.l10n_merge import (
|
||||
COMM_STRINGS_PATTERNS,
|
||||
FIREFOX_L10N,
|
||||
GECKO_STRINGS_PATTERNS,
|
||||
|
|
|
@ -34,7 +34,7 @@ def tb_add_missing_ftls(command_context, merge, locale):
|
|||
repositories in favor of creating the files during l10m-repackaging.
|
||||
This code assumes that mach compare-locales --merge has already run.
|
||||
"""
|
||||
from tb_l10n.missing_ftl import add_missing_ftls, get_lang_ftls, get_source_ftls
|
||||
from missing_ftl import add_missing_ftls, get_lang_ftls, get_source_ftls
|
||||
|
||||
print("Checking for missing .ftl files in locale {}".format(locale))
|
||||
comm_src_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
|
||||
|
@ -58,11 +58,7 @@ def run_migration_tests(command_context, test_paths=None, **kwargs):
|
|||
test_paths = []
|
||||
command_context.activate_virtualenv()
|
||||
|
||||
from tb_l10n.tb_migration_test import (
|
||||
inspect_migration,
|
||||
prepare_object_dir,
|
||||
test_migration,
|
||||
)
|
||||
import tbxchannel.tb_migration_test as fmt
|
||||
|
||||
rv = 0
|
||||
with_context = []
|
||||
|
|
|
@ -22,8 +22,7 @@ from mozharness.mozilla.l10n.locales import LocalesMixin
|
|||
from mozpack.archive import create_tar_from_files
|
||||
from mozpack.copier import FileRegistry
|
||||
from mozpack.files import FileFinder
|
||||
|
||||
from tb_l10n.l10n_merge import COMM_STRINGS_PATTERNS, GECKO_STRINGS_PATTERNS
|
||||
from tbxchannel.l10n_merge import COMM_STRINGS_PATTERNS, GECKO_STRINGS_PATTERNS
|
||||
|
||||
|
||||
class CommMultiLocale(LocalesMixin, AutomationMixin, VCSMixin, BaseScript):
|
||||
|
|
|
@ -1173,6 +1173,7 @@ files_changed:
|
|||
- comm/python/l10n/tb_fluent_migrations/completed/bug_1889422_fluent_migration_chat_properties_files_12_.py
|
||||
- comm/python/l10n/tb_fluent_migrations/completed/bug_1889422_fluent_migration_chat_properties_files_13_.py
|
||||
- comm/python/l10n/tb_fluent_migrations/completed/bug_697706_archive_options.py
|
||||
- comm/python/l10n/tbxchannel/l10n_merge.py
|
||||
- comm/python/thirdroc/rnp_generated.py
|
||||
- comm/rust/.cargo/config.toml.in
|
||||
- comm/rust/Cargo.lock
|
||||
|
|
Загрузка…
Ссылка в новой задаче