Skip to content

Commit 09c67a4

Browse files
rename: install_language_pack -> install_module
1 parent 716a26c commit 09c67a4

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

apertium/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from apertium.analysis import analyze, Analyzer # noqa: F401
77
from apertium.generation import generate, Generator # noqa: F401
8-
from apertium.installer import install_language_pack # noqa: F401
8+
from apertium.installer import install_module # noqa: F401
99
from apertium.mode_search import search_path
1010
from apertium.translation import translate, Translator # noqa: F401
1111

apertium/installer.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def _edit_modes(self) -> None:
9696
def install_apertium_base(self) -> None:
9797
self._download_apertium_windows()
9898

99-
def install_apertium_language(self, language: List[str]) -> None:
99+
def install_apertium_module(self, language: List[str]) -> None:
100100
self._download_packages(language)
101101
self._edit_modes()
102102

@@ -139,7 +139,7 @@ def _rename_wrappers(wrapper_name: dict = None):
139139
if old_name != new_name:
140140
subprocess.run(['sudo', 'mv', old_name, new_name])
141141

142-
def install_apertium_language(self, languages: List[str]) -> None:
142+
def install_apertium_module(self, languages: List[str]) -> None:
143143
self._download_packages(languages)
144144

145145
def install_apertium_base(self) -> None:
@@ -169,11 +169,10 @@ def install_apertium() -> None:
169169
apertium_installer.install_apertium_base()
170170

171171

172-
def install_language_pack(languages: List[str] = None) -> None:
173-
if languages is None:
174-
languages = ['apertium-eng', 'apertium-en-es']
172+
def install_module(modules: List[str] = None) -> None:
173+
apertium_modules = ['apertium-{}'.format(module) for module in modules]
175174
apertium_installer = get_installer_object()
176-
apertium_installer.install_apertium_language(languages)
175+
apertium_installer.install_apertium_module(apertium_modules)
177176

178177

179178
def install_wrapper(swig_wrappers: List[str]) -> None:

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def __init__(self, *args, **kwargs):
1313
def _post_install():
1414
import apertium
1515
apertium.installer.install_apertium()
16-
apertium.installer.install_language_pack(['apertium-eng', 'apertium-en-es'])
16+
apertium.installer.install_module(['eng', 'en-es'])
1717
apertium.installer.install_wrapper(['python3-apertium', 'python3-apertium-lex-tools',
1818
'python3-lttoolbox'])
1919

0 commit comments

Comments
 (0)