From d88d3043317c073b5abcfacd22e53c8640f9a1b4 Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Tue, 26 Nov 2019 19:29:10 -0300 Subject: [PATCH] [ui][aur] improved Required / Optional confirmation dialogs --- bauh/gems/arch/confirmation.py | 10 ++++------ bauh/view/resources/locale/ca | 1 + bauh/view/resources/locale/en | 3 ++- bauh/view/resources/locale/es | 1 + bauh/view/resources/locale/it | 1 + bauh/view/resources/locale/pt | 3 ++- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/bauh/gems/arch/confirmation.py b/bauh/gems/arch/confirmation.py index d88653b7..b1526e23 100644 --- a/bauh/gems/arch/confirmation.py +++ b/bauh/gems/arch/confirmation.py @@ -16,7 +16,7 @@ def request_optional_deps(pkgname: str, pkg_mirrors: dict, watcher: ProcessWatch opts = [] for p, d in pkg_mirrors.items(): - op = InputOption('{}{} ( {} )'.format(p, ': ' + d['desc'] if d['desc'] else '', d['mirror'].upper()), p) + op = InputOption('{}{} ( {}: {} )'.format(p, ': ' + d['desc'] if d['desc'] else '', i18n['mirror'], d['mirror'].upper()), p) op.icon_path = _get_mirror_icon(d['mirror']) opts.append(op) @@ -39,13 +39,11 @@ def request_install_missing_deps(pkgname: str, pkg_mirrors: dict, watcher: Proce opts = [] for p, m in pkg_mirrors.items(): - op = InputOption('{} ( {} )'.format(p, m), p) + op = InputOption('{} ( {}: {} )'.format(p, i18n['mirror'], m.upper()), p) op.read_only = True op.icon_path = _get_mirror_icon(m) opts.append(op) - comps = [ - MultipleSelectComponent(label='', options=opts, default_options=set(opts)) - ] + comp = MultipleSelectComponent(label='', options=opts, default_options=set(opts)) - return watcher.request_confirmation(i18n['arch.missing_deps.title'], msg, comps, confirmation_label=i18n['continue'].capitalize()) + return watcher.request_confirmation(i18n['arch.missing_deps.title'], msg, [comp], confirmation_label=i18n['continue'].capitalize()) diff --git a/bauh/view/resources/locale/ca b/bauh/view/resources/locale/ca index 2e136c3e..fc24fef1 100644 --- a/bauh/view/resources/locale/ca +++ b/bauh/view/resources/locale/ca @@ -194,3 +194,4 @@ continue=continua stable=estable close=tanca publisher.verified=verificat +mirror=mirall \ No newline at end of file diff --git a/bauh/view/resources/locale/en b/bauh/view/resources/locale/en index b876f5f8..2ede48e0 100644 --- a/bauh/view/resources/locale/en +++ b/bauh/view/resources/locale/en @@ -148,4 +148,5 @@ screenshots.download.no_response=Image not found continue=continue stable=stable close=close -publisher.verified=verified \ No newline at end of file +publisher.verified=verified +mirror=mirror \ No newline at end of file diff --git a/bauh/view/resources/locale/es b/bauh/view/resources/locale/es index 323c8e16..a488cbda 100644 --- a/bauh/view/resources/locale/es +++ b/bauh/view/resources/locale/es @@ -193,3 +193,4 @@ continue=continuar stable=estable close=cerrar publisher.verified=verificado +mirror=espejo \ No newline at end of file diff --git a/bauh/view/resources/locale/it b/bauh/view/resources/locale/it index 984635c8..0197bd2b 100644 --- a/bauh/view/resources/locale/it +++ b/bauh/view/resources/locale/it @@ -149,3 +149,4 @@ continue=continua stable=stabile close=vicino publisher.verified=verificato +mirror=specchio \ No newline at end of file diff --git a/bauh/view/resources/locale/pt b/bauh/view/resources/locale/pt index b3f9a166..b7551325 100644 --- a/bauh/view/resources/locale/pt +++ b/bauh/view/resources/locale/pt @@ -195,4 +195,5 @@ screenshots.download.no_response=Imagem não encontrada continue=continuar stable=estável close=fechar -publisher.verified=verificado \ No newline at end of file +publisher.verified=verificado +mirror=espelho \ No newline at end of file