[fix][arch] update notifications are not localized

This commit is contained in:
Vinícius Moreira
2020-04-14 10:00:00 -03:00
parent 7abe146dbe
commit ad9abe93c8
3 changed files with 10 additions and 10 deletions

View File

@@ -7,13 +7,13 @@ from bauh.api.abstract.context import ApplicationContext
from bauh.api.http import HttpClient
from bauh.cli import __app_name__, cli_args
from bauh.cli.controller import CLIManager
from bauh.context import generate_i18n, DEFAULT_I18N_KEY
from bauh.view.core import config, gems
from bauh.view.core.controller import GenericSoftwareManager
from bauh.view.core.downloader import AdaptableFileDownloader
from bauh.view.util import logs, util
from bauh.view.util import logs, util, resource
from bauh.view.util.cache import DefaultMemoryCacheFactory
from bauh.view.util.disk import DefaultDiskCacheLoaderFactory
from bauh.view.util.translation import I18n
def main():
@@ -28,11 +28,11 @@ def main():
app_config = config.read_config(update_file=True)
http_client = HttpClient(logger)
empty_i18n = I18n('en', {}, 'en', {})
i18n = generate_i18n(app_config, resource.get_path('locale'))
cache_factory = DefaultMemoryCacheFactory(expiration_time=0)
context = ApplicationContext(i18n=empty_i18n,
context = ApplicationContext(i18n=i18n,
http_client=http_client,
download_icons=bool(app_config['download']['icons']),
app_root_dir=ROOT_DIR,
@@ -41,10 +41,10 @@ def main():
logger=logger,
distro=util.get_distro(),
file_downloader=AdaptableFileDownloader(logger, bool(app_config['download']['multithreaded']),
empty_i18n, http_client),
i18n, http_client),
app_name=__app_name__)
managers = gems.load_managers(context=context, locale=empty_i18n.current_key, config=app_config, default_locale='en')
managers = gems.load_managers(context=context, locale=i18n.current_key, config=app_config, default_locale=DEFAULT_I18N_KEY)
cli = CLIManager(GenericSoftwareManager(managers, context=context, config=app_config))

View File

@@ -1724,7 +1724,10 @@ class ArchManager(SoftwareManager):
def list_updates(self, internet_available: bool) -> List[PackageUpdate]:
installed = self.read_installed(disk_loader=None, internet_available=internet_available).installed
return [PackageUpdate(p.name, p.latest_version, p.get_update_type(), p.name) for p in installed if p.update]
aur_type, repo_type = self.i18n['gem.arch.type.aur.label'], self.i18n['gem.arch.type.arch_repo.label']
return [PackageUpdate(p.name, p.latest_version, aur_type if p.repository == 'aur' else repo_type, p.name) for p in installed if p.update]
def list_warnings(self, internet_available: bool) -> List[str]:
warnings = []

View File

@@ -60,9 +60,6 @@ class ArchPackage(SoftwarePackage):
def get_type(self):
return 'aur' if self.repository == 'aur' else 'arch_repo'
def get_update_type(self):
return 'Arch - {}'.format('AUR' if self.repository == 'aur' else 'Repository')
def get_default_icon_path(self) -> str:
return self.get_type_icon_path()