diff --git a/CHANGELOG.md b/CHANGELOG.md index 4275aa92..5f99e300 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Improvements - Arch + - install: + - optional packages installation dialog appearance (aligned with other dependencies dialogs) - uninstall: - displaying hard and unnecessary requirements versions and descriptions diff --git a/bauh/gems/arch/confirmation.py b/bauh/gems/arch/confirmation.py index 616be095..67d2278c 100644 --- a/bauh/gems/arch/confirmation.py +++ b/bauh/gems/arch/confirmation.py @@ -22,11 +22,9 @@ def request_optional_deps(pkgname: str, pkg_repos: dict, watcher: ProcessWatcher for p, d in pkg_repos.items(): size = sizes.get(p) - op = InputOption('{}{} ({}: {}) - {}: {}'.format(p, ': ' + d['desc'] if d['desc'] else '', - i18n['repository'], - d['repository'].lower(), - i18n['size'].capitalize(), - get_human_size_str(size) if size is not None else '?'), p) + label = f"{p} ({i18n['repository']}: {d['repository'].lower()}) | " \ + f"{i18n['size'].capitalize()}: {get_human_size_str(size) if size is not None else '?'}" + op = InputOption(label=label, value=p, tooltip=d.get('desc') or None) op.icon_path = _get_repo_icon(d['repository']) opts.append(op) @@ -34,11 +32,16 @@ def request_optional_deps(pkgname: str, pkg_repos: dict, watcher: ProcessWatcher options=opts, default_options=set(opts)) + msg = f"

{i18n['arch.install.optdeps.request.success'].format(pkg=bold(pkgname))}

" \ + f"

{i18n['arch.install.optdeps.request.body']}:

" + install = watcher.request_confirmation(title=i18n['arch.install.optdeps.request.title'], - body='

{}.

{}:

'.format(i18n['arch.install.optdeps.request.body'].format(bold(pkgname)), i18n['arch.install.optdeps.request.help']), + body=msg, components=[view_opts], confirmation_label=i18n['install'].capitalize(), - deny_label=i18n['do_not.install'].capitalize()) + deny_label=i18n['do_not.install'].capitalize(), + min_width=600, + min_height=200) if install: return {o.value for o in view_opts.values} diff --git a/bauh/gems/arch/resources/locale/ca b/bauh/gems/arch/resources/locale/ca index 0fe3bedf..16c24c9b 100644 --- a/bauh/gems/arch/resources/locale/ca +++ b/bauh/gems/arch/resources/locale/ca @@ -224,8 +224,8 @@ arch.install.error.conflicting_files=The package {} wants to overwrite files fro arch.install.error.conflicting_files.proceed=Allow arch.install.error.conflicting_files.stop=Cancel installation arch.install.optdep.error=Could not install the optional packages: {} -arch.install.optdeps.request.body={} s’ha instal·lat correctament. Hi ha paquets opcionals associats que potser voldreu instal·lar -arch.install.optdeps.request.help=Marqueu els que voleu +arch.install.optdeps.request.body=Check the optional associated packages below that you want to install +arch.install.optdeps.request.success={pkg} was successfully installed ! arch.install.optdeps.request.title=Dependències opcionals arch.installing.package=S’està instal·lant el paquet {} arch.checking_unnecessary_deps=Checking if there are packages no longer needed diff --git a/bauh/gems/arch/resources/locale/de b/bauh/gems/arch/resources/locale/de index 048bc56f..e7ed479d 100644 --- a/bauh/gems/arch/resources/locale/de +++ b/bauh/gems/arch/resources/locale/de @@ -224,8 +224,8 @@ arch.install.error.conflicting_files=The package {} wants to overwrite files fro arch.install.error.conflicting_files.proceed=Allow arch.install.error.conflicting_files.stop=Cancel installation arch.install.optdep.error=Could not install the optional packages: {} -arch.install.optdeps.request.body={} wurde erfolgreich installiert! Es gibt optionale zugehörige Pakete welche du vielleicht auch installieren möchtest -arch.install.optdeps.request.help=Wähle entsprechende aus +arch.install.optdeps.request.body=Check the optional associated packages below that you want to install +arch.install.optdeps.request.success={pkg} was successfully installed ! arch.install.optdeps.request.title=Optionale Abhängigkeiten arch.installing.package=Paket {} installieren arch.checking_unnecessary_deps=Checking if there are packages no longer needed diff --git a/bauh/gems/arch/resources/locale/en b/bauh/gems/arch/resources/locale/en index 1c474eeb..8db15b66 100644 --- a/bauh/gems/arch/resources/locale/en +++ b/bauh/gems/arch/resources/locale/en @@ -224,8 +224,8 @@ arch.install.error.conflicting_files=The package {} wants to overwrite files fro arch.install.error.conflicting_files.proceed=Allow arch.install.error.conflicting_files.stop=Cancel installation arch.install.optdep.error=Could not install the optional packages: {} -arch.install.optdeps.request.body={} was succesfully installed ! There are some optional associated packages that you might want to install -arch.install.optdeps.request.help=Check those you want +arch.install.optdeps.request.body=Check the optional associated packages below that you want to install +arch.install.optdeps.request.success={pkg} was successfully installed ! arch.install.optdeps.request.title=Optional dependencies arch.installing.package=Installing {} package arch.checking_unnecessary_deps=Checking if there are packages no longer needed diff --git a/bauh/gems/arch/resources/locale/es b/bauh/gems/arch/resources/locale/es index ed8372a0..6764e3c5 100644 --- a/bauh/gems/arch/resources/locale/es +++ b/bauh/gems/arch/resources/locale/es @@ -224,8 +224,8 @@ arch.install.error.conflicting_files=El paquete {} quiere sobrescribir archivos arch.install.error.conflicting_files.proceed=Permitir arch.install.error.conflicting_files.stop=Cancelar instalación arch.install.optdep.error=No se pudo instalar los paquetes opcionales: {} -arch.install.optdeps.request.body=¡{} se instaló correctamente! Hay algunos paquetes opcionales asociados que es posible que desee instalar -arch.install.optdeps.request.help=Marque los que desee +arch.install.optdeps.request.body=Marque los paquetes opcionales asociados abajo que desea instalar +arch.install.optdeps.request.success=¡{pkg} se instaló correctamente! arch.install.optdeps.request.title=Dependencias opcionales arch.installing.package=Instalando el paquete {} arch.checking_unnecessary_deps=Verificando se hay paquetes innecesarios diff --git a/bauh/gems/arch/resources/locale/fr b/bauh/gems/arch/resources/locale/fr index 440c437d..c5ee9a91 100644 --- a/bauh/gems/arch/resources/locale/fr +++ b/bauh/gems/arch/resources/locale/fr @@ -224,8 +224,8 @@ arch.install.error.conflicting_files=Le paquet {} veut écraser les fichiers d'a arch.install.error.conflicting_files.proceed=Permettre arch.install.error.conflicting_files.stop=Annuler l'installation arch.install.optdep.error=Impossible d'installer les paquets optionnels: {} -arch.install.optdeps.request.body={} installé avec succès ! Il y a des paquets optionnels que vous pouvez installer -arch.install.optdeps.request.help=Cochez ceux que vous désirez +arch.install.optdeps.request.body=Check the optional associated packages below that you want to install +arch.install.optdeps.request.success={pkg} was successfully installed ! arch.install.optdeps.request.title=Dépendances optionnelles arch.installing.package=Installation du paquet {} arch.checking_unnecessary_deps=Calcul des paquets devenus inutiles diff --git a/bauh/gems/arch/resources/locale/it b/bauh/gems/arch/resources/locale/it index fc58be2a..7b81b14f 100644 --- a/bauh/gems/arch/resources/locale/it +++ b/bauh/gems/arch/resources/locale/it @@ -224,8 +224,8 @@ arch.install.error.conflicting_files=The package {} wants to overwrite files fro arch.install.error.conflicting_files.proceed=Allow arch.install.error.conflicting_files.stop=Cancel installation arch.install.optdep.error=Could not install the optional packages: {} -arch.install.optdeps.request.body={} è stato installato con successo! Ci sono alcuni pacchetti associati opzionali che potresti voler installare -arch.install.optdeps.request.help=Controlla quelli che vuoi +arch.install.optdeps.request.body=Check the optional associated packages below that you want to install +arch.install.optdeps.request.success={pkg} was successfully installed ! arch.install.optdeps.request.title=Dipendenze opzionali arch.installing.package=Installazione del pacchetto {} arch.checking_unnecessary_deps=Checking if there are packages no longer needed diff --git a/bauh/gems/arch/resources/locale/pt b/bauh/gems/arch/resources/locale/pt index eac3a145..eaea1f4f 100644 --- a/bauh/gems/arch/resources/locale/pt +++ b/bauh/gems/arch/resources/locale/pt @@ -223,8 +223,8 @@ arch.install.error.conflicting_files=O pacote {} quer sobrepor alguns arquivos d arch.install.error.conflicting_files.proceed=Permitir arch.install.error.conflicting_files.stop=Cancelar instalação arch.install.optdep.error=Não foi possível instalar os pacotes opcionais: {} -arch.install.optdeps.request.body={} foi instalado com sucesso ! Existem alguns pacotes opcionais associados que você talvez queira instalar -arch.install.optdeps.request.help=Marque os desejados +arch.install.optdeps.request.body=Selecione abaixo os pacotes opcionais associados que você queira instalar +arch.install.optdeps.request.success={pkg} foi instalado com sucesso ! arch.install.optdeps.request.title=Dependências opcionais arch.installing.package=Instalando o pacote {} arch.checking_unnecessary_deps=Verificando se há pacotes não mais necessários diff --git a/bauh/gems/arch/resources/locale/ru b/bauh/gems/arch/resources/locale/ru index 47e9d755..085fb6de 100644 --- a/bauh/gems/arch/resources/locale/ru +++ b/bauh/gems/arch/resources/locale/ru @@ -224,8 +224,8 @@ arch.install.error.conflicting_files=The package {} wants to overwrite files fro arch.install.error.conflicting_files.proceed=Allow arch.install.error.conflicting_files.stop=Cancel installation arch.install.optdep.error=Could not install the optional packages: {} -arch.install.optdeps.request.body={} успешно установлен ! Есть некоторые дополнительные связанные пакеты, которые вы можете установить -arch.install.optdeps.request.help=Отметьте те, которые вы хотите установить +arch.install.optdeps.request.body=Check the optional associated packages below that you want to install +arch.install.optdeps.request.success={pkg} was successfully installed ! arch.install.optdeps.request.title=Необязательные зависимости arch.installing.package=Установка пакета {} arch.checking_unnecessary_deps=Checking if there are packages no longer needed diff --git a/bauh/gems/arch/resources/locale/tr b/bauh/gems/arch/resources/locale/tr index 12d6e033..e4877105 100644 --- a/bauh/gems/arch/resources/locale/tr +++ b/bauh/gems/arch/resources/locale/tr @@ -224,8 +224,8 @@ arch.install.error.conflicting_files=The package {} wants to overwrite files fro arch.install.error.conflicting_files.proceed=Allow arch.install.error.conflicting_files.stop=Cancel installation arch.install.optdep.error=Tercihe bağlı paketler yüklenemedi: {} -arch.install.optdeps.request.body={} başarıyla yüklendi! Yüklemek isteyebileceğiniz bazı tercihe bağlı bağımlılıklar vardır -arch.install.optdeps.request.help=İstediklerinizi kontrol edin +arch.install.optdeps.request.body=Check the optional associated packages below that you want to install +arch.install.optdeps.request.success={pkg} was successfully installed ! arch.install.optdeps.request.title=İsteğe bağlı bağımlılıklar arch.installing.package={} Paketi yükleniyor arch.checking_unnecessary_deps=Artık gerekli olmayan paketler olup olmadığını kontrol et