From d0d478de999e04d5551d1f6e58eefdf9e424dddb Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Mon, 2 Dec 2019 12:53:48 -0300 Subject: [PATCH] [improvement][aur] optdeps dialog: 'cancel' button label changed to 'do not install' --- CHANGELOG.md | 5 ++++- bauh/gems/arch/confirmation.py | 4 ++-- bauh/gems/arch/controller.py | 2 +- bauh/view/resources/locale/ca | 3 ++- bauh/view/resources/locale/de | 3 ++- bauh/view/resources/locale/en | 1 + bauh/view/resources/locale/es | 3 ++- bauh/view/resources/locale/it | 3 ++- bauh/view/resources/locale/pt | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c51e57c4..11c22971 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [0.7.4] 2019-12 +### Improvements +- Some AUR labels have been changed to not confuse the user + ### Fixes - AUR: - not finding some dependencies declared as files instead of the package names (e.g: dolphin-emu-git ) - + ## [0.7.3] 2019-11-29 ### Improvements diff --git a/bauh/gems/arch/confirmation.py b/bauh/gems/arch/confirmation.py index 054acdeb..12b73fdf 100644 --- a/bauh/gems/arch/confirmation.py +++ b/bauh/gems/arch/confirmation.py @@ -27,8 +27,8 @@ def request_optional_deps(pkgname: str, pkg_mirrors: dict, watcher: ProcessWatch 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']), components=[view_opts], - confirmation_label=i18n['install'], - deny_label=i18n['cancel']) + confirmation_label=i18n['install'].capitalize(), + deny_label=i18n['do_not.install'].capitalize()) if install: return {o.value for o in view_opts.values} diff --git a/bauh/gems/arch/controller.py b/bauh/gems/arch/controller.py index 53e7bfb8..445a2c47 100644 --- a/bauh/gems/arch/controller.py +++ b/bauh/gems/arch/controller.py @@ -467,7 +467,7 @@ class ArchManager(SoftwareManager): depnames = {RE_SPLIT_VERSION.split(dep)[0] for dep in check_res['missing_deps']} dep_mirrors = self._map_mirrors(depnames) - if len(depnames) != len(dep_mirrors): # cheking if a dependency could not be found in any mirror + if len(depnames) != len(dep_mirrors): # checking if a dependency could not be found in any mirror for dep in depnames: if dep not in dep_mirrors: message.show_dep_not_found(dep, self.i18n, handler.watcher) diff --git a/bauh/view/resources/locale/ca b/bauh/view/resources/locale/ca index f5ab61ba..f080866b 100644 --- a/bauh/view/resources/locale/ca +++ b/bauh/view/resources/locale/ca @@ -199,4 +199,5 @@ stable=estable close=tanca publisher.verified=verificat mirror=mirall -emulator=emulador \ No newline at end of file +emulator=emulador +do_not.install=no instal·leu \ No newline at end of file diff --git a/bauh/view/resources/locale/de b/bauh/view/resources/locale/de index 6e73d587..a7b7f02f 100644 --- a/bauh/view/resources/locale/de +++ b/bauh/view/resources/locale/de @@ -153,4 +153,5 @@ continue=Weiter stable=Stabil close=Schließen publisher.verified=Verifiziert -emulator=emulator \ No newline at end of file +emulator=emulator +do_not.install=nicht installieren \ No newline at end of file diff --git a/bauh/view/resources/locale/en b/bauh/view/resources/locale/en index 09f24e74..ab040dae 100644 --- a/bauh/view/resources/locale/en +++ b/bauh/view/resources/locale/en @@ -155,3 +155,4 @@ close=close publisher.verified=verified mirror=mirror emulator=emulator +do_not.install=don't install diff --git a/bauh/view/resources/locale/es b/bauh/view/resources/locale/es index a54c5f76..8be80d9a 100644 --- a/bauh/view/resources/locale/es +++ b/bauh/view/resources/locale/es @@ -198,4 +198,5 @@ stable=estable close=cerrar publisher.verified=verificado mirror=espejo -emulator=emulador \ No newline at end of file +emulator=emulador +do_not.install=no instalar \ No newline at end of file diff --git a/bauh/view/resources/locale/it b/bauh/view/resources/locale/it index 0053b289..666f8f2c 100644 --- a/bauh/view/resources/locale/it +++ b/bauh/view/resources/locale/it @@ -154,4 +154,5 @@ stable=stabile close=vicino publisher.verified=verificato mirror=specchio -emulator=emulatore \ No newline at end of file +emulator=emulatore +do_not.install=non installare \ No newline at end of file diff --git a/bauh/view/resources/locale/pt b/bauh/view/resources/locale/pt index 073912b6..71890dff 100644 --- a/bauh/view/resources/locale/pt +++ b/bauh/view/resources/locale/pt @@ -201,4 +201,5 @@ stable=estável close=fechar publisher.verified=verificado mirror=espelho -emulator=emulador \ No newline at end of file +emulator=emulador +do_not.install=não instalar \ No newline at end of file