commit 09c67a45d34f2f26f101f89a6aaa7e748cdf7cce Author: vaydheesh Date: Sat Jul 20 20:21:47 2019 +0530 rename: install_language_pack -> install_module diff --git a/apertium/__init__.py b/apertium/__init__.py index 17b1364..a2b1501 100644 --- a/apertium/__init__.py +++ b/apertium/__init__.py @@ -5,7 +5,7 @@ from typing import Dict, Tuple from apertium.analysis import analyze, Analyzer # noqa: F401 from apertium.generation import generate, Generator # noqa: F401 -from apertium.installer import install_language_pack # noqa: F401 +from apertium.installer import install_module # noqa: F401 from apertium.mode_search import search_path from apertium.translation import translate, Translator # noqa: F401 diff --git a/apertium/installer.py b/apertium/installer.py index 58bcfc8..4dc2790 100644 --- a/apertium/installer.py +++ b/apertium/installer.py @@ -96,7 +96,7 @@ class Windows: def install_apertium_base(self) -> None: self._download_apertium_windows() - def install_apertium_language(self, language: List[str]) -> None: + def install_apertium_module(self, language: List[str]) -> None: self._download_packages(language) self._edit_modes() @@ -139,7 +139,7 @@ class Ubuntu: if old_name != new_name: subprocess.run(['sudo', 'mv', old_name, new_name]) - def install_apertium_language(self, languages: List[str]) -> None: + def install_apertium_module(self, languages: List[str]) -> None: self._download_packages(languages) def install_apertium_base(self) -> None: @@ -169,11 +169,10 @@ def install_apertium() -> None: apertium_installer.install_apertium_base() -def install_language_pack(languages: List[str] = None) -> None: - if languages is None: - languages = ['apertium-eng', 'apertium-en-es'] +def install_module(modules: List[str] = None) -> None: + apertium_modules = ['apertium-{}'.format(module) for module in modules] apertium_installer = get_installer_object() - apertium_installer.install_apertium_language(languages) + apertium_installer.install_apertium_module(apertium_modules) def install_wrapper(swig_wrappers: List[str]) -> None: diff --git a/setup.py b/setup.py index e73f2fa..6491f54 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ class PostInstallCommand(install): def _post_install(): import apertium apertium.installer.install_apertium() - apertium.installer.install_language_pack(['apertium-eng', 'apertium-en-es']) + apertium.installer.install_module(['eng', 'en-es']) apertium.installer.install_wrapper(['python3-apertium', 'python3-apertium-lex-tools', 'python3-lttoolbox'])