From 574db7fda170f05aa5ade4ebeceff25ae1304255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20Moreira?= Date: Wed, 11 Mar 2020 11:01:35 -0300 Subject: [PATCH] [fix][ui][settings] not matching the default system locale with the available options --- CHANGELOG.md | 1 + bauh/gems/appimage/model.py | 2 +- bauh/view/core/settings.py | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb27c5d5..36939297 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - some installed apps were not being displayed as installed in the search results - UI - categories filter being displayed during ongoing actions + - settings: not matching the default system locale with the available options ### Improvements - AUR diff --git a/bauh/gems/appimage/model.py b/bauh/gems/appimage/model.py index 50db2b2f..c17e52fe 100644 --- a/bauh/gems/appimage/model.py +++ b/bauh/gems/appimage/model.py @@ -11,7 +11,7 @@ class AppImage(SoftwarePackage): def __init__(self, name: str = None, description: str = None, github: str = None, source: str = None, version: str = None, url_download: str = None, url_icon: str = None, url_screenshot: str = None, license: str = None, author: str = None, categories=None, icon_path: str = None, installed: bool = False, - url_download_latest_version: str = None): + url_download_latest_version: str = None, **kwargs): super(AppImage, self).__init__(id=name, name=name, version=version, latest_version=version, icon_url=url_icon, license=license, description=description, installed=installed) diff --git a/bauh/view/core/settings.py b/bauh/view/core/settings.py index 104a7e47..5f1c3775 100644 --- a/bauh/view/core/settings.py +++ b/bauh/view/core/settings.py @@ -203,8 +203,12 @@ class GenericSettingsManager: if core_config['locale']: current_locale = [l for l in locale_opts if l.value == core_config['locale']] - if not current_locale and self.i18n.default_key: - current_locale = [l for l in locale_opts if l.value == self.i18n.default_key] + if not current_locale: + if self.i18n.current_key: + current_locale = [l for l in locale_opts if l.value == self.i18n.current_key] + + if not current_locale: + current_locale = [l for l in locale_opts if l.value == self.i18n.default_key] current_locale = current_locale[0] if current_locale else None