[view] improvement: changing some words and symbols to improve readability and cohesion (upgrade summary)

CHANGELOG.md

@@ -11,7 +11,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   - code refactoring
 
 - UI
-  - update summary: displaying a '+' for positive sizes (previously the sign was only displayed for negative numbers) (#250)[https://github.com/vinifmor/bauh/issues/250]
+  - update summary: 
+    - displaying a '+' for positive sizes (previously the sign was only displayed for negative numbers) (#250)[https://github.com/vinifmor/bauh/issues/250]
+    - changing some words and symbols to improve readability and cohesion (#250)[https://github.com/vinifmor/bauh/issues/250]
   
 ### Fixes
 - Debian

bauh/view/qt/thread.py

@@ -253,17 +253,16 @@ class UpgradeSelected(AsyncAction):
 
         size_str = None
         if display_sizes:
-            size_str = '{}: {}'.format(self.i18n['size'].capitalize(),
+            storage_size = '?' if req.extra_size is None else get_human_size_str(req.extra_size, positive_size_symbol)
-                                       '?' if req.extra_size is None else get_human_size_str(req.extra_size, positive_size_symbol))
+            size_str = f"{self.i18n['action.update.storage_size']}: {storage_size}"
             if required_size and req.extra_size != req.required_size:
-                size_str += ' ( {}: {} )'.format(self.i18n['action.update.pkg.required_size'].capitalize(),
+                download_size = '?' if req.required_size is None else get_human_size_str(req.required_size)
-                                                 '?' if req.required_size is None else get_human_size_str(req.required_size))
+                size_str += f" ({self.i18n['action.update.download_size']}: {download_size})"
 
-        label = '{}{}'.format(req.pkg.name,
+        label = f"{req.pkg.name} {f' ({req.pkg.latest_version})' if req.pkg.latest_version else ''}"
-                              ' ( {} )'.format(req.pkg.latest_version) if req.pkg.latest_version else '')
 
         if size_str:
-            label += ' - {}'.format(size_str)
+            label += f' | {size_str}'
 
         return InputOption(label=label,
                            value=None,
@@ -287,21 +286,21 @@ class UpgradeSelected(AsyncAction):
         opts = [self._req_as_option(req=r, tooltip=False, custom_tooltip=r.reason, display_sizes=False) for r in reqs]
         comps = [MultipleSelectComponent(label='', options=opts, default_options=set(opts))]
 
-        return FormComponent(label='{} ( {}: {} )'.format(self.i18n['action.update.cannot_update_label'],
+        return FormComponent(label='{} ({}: {})'.format(self.i18n['action.update.cannot_update_label'],
-                                                          self.i18n['amount'].capitalize(), len(opts)),
+                                                        self.i18n['amount'].capitalize(), len(opts)),
                              components=comps)
 
     def _gen_to_install_form(self, reqs: List[UpgradeRequirement]) -> Tuple[FormComponent, Tuple[int, int]]:
-        opts = [self._req_as_option(r, custom_tooltip=r.reason) for r in reqs]
+        opts = [self._req_as_option(r, custom_tooltip=r.reason, positive_size_symbol=True) for r in reqs]
         comps = [MultipleSelectComponent(label='', options=opts, default_options=set(opts))]
         required_size, extra_size = self._sum_pkgs_size(reqs)
 
-        lb = '{} ( {}: {}. {}: {}. {}: {} )'.format(self.i18n['action.update.required_label'].capitalize(),
+        lb = '{} ({}: {} | {}: {} | {}: {})'.format(self.i18n['action.update.required_label'].capitalize(),
                                                     self.i18n['amount'].capitalize(),
                                                     len(opts),
-                                                    self.i18n['size'].capitalize(),
+                                                    self.i18n['action.update.storage_size'],
-                                                    '?' if extra_size is None else get_human_size_str(extra_size),
+                                                    '?' if extra_size is None else get_human_size_str(extra_size, True),
-                                                    self.i18n['action.update.pkg.required_size'].capitalize(),
+                                                    self.i18n['action.update.download_size'],
                                                     '?' if required_size is None else get_human_size_str(required_size))
         return FormComponent(label=lb, components=comps), (required_size, extra_size)
 
@@ -310,11 +309,11 @@ class UpgradeSelected(AsyncAction):
         comps = [MultipleSelectComponent(label='', options=opts, default_options=set(opts))]
         required_size, extra_size = self._sum_pkgs_size(reqs)
 
-        lb = '{} ( {}: {}. {}: {} )'.format(self.i18n['action.update.label_to_remove'].capitalize(),
+        lb = '{} ({}: {} | {}: {})'.format(self.i18n['action.update.label_to_remove'].capitalize(),
-                                            self.i18n['amount'].capitalize(),
+                                           self.i18n['amount'].capitalize(),
-                                            len(opts),
+                                           len(opts),
-                                            self.i18n['size'].capitalize(),
+                                           self.i18n['action.update.storage_size'],
-                                            '?' if extra_size is None else get_human_size_str(-extra_size))
+                                           '?' if extra_size is None else get_human_size_str(-extra_size))
         return FormComponent(label=lb, components=comps)
 
     def _gen_to_update_form(self, reqs: List[UpgradeRequirement]) -> Tuple[FormComponent, Tuple[int, int]]:
@@ -322,12 +321,12 @@ class UpgradeSelected(AsyncAction):
         comps = [MultipleSelectComponent(label='', options=opts, default_options=set(opts))]
         required_size, extra_size = self._sum_pkgs_size(reqs)
 
-        lb = '{} ( {}: {}. {}: {}. {}: {} )'.format(self.i18n['action.update.label_to_upgrade'].capitalize(),
+        lb = '{} ({}: {} | {}: {} | {}: {})'.format(self.i18n['action.update.label_to_upgrade'].capitalize(),
                                                     self.i18n['amount'].capitalize(),
                                                     len(opts),
-                                                    self.i18n['size'].capitalize(),
+                                                    self.i18n['action.update.storage_size'],
                                                     '?' if extra_size is None else get_human_size_str(extra_size, True),
-                                                    self.i18n['action.update.pkg.required_size'].capitalize(),
+                                                    self.i18n['action.update.download_size'],
                                                     '?' if required_size is None else get_human_size_str(required_size))
 
         return FormComponent(label=lb, components=comps), (required_size, extra_size)
@@ -490,12 +489,10 @@ class UpgradeSelected(AsyncAction):
             extra_size += updates_size[1]
             comps.append(updates_form)
 
-        extra_size_text = '{}: {}'.format(self.i18n['action.update.total_size'].capitalize(),
+        disc_size_text = f"{self.i18n['action.update.total_storage_size']}: {get_human_size_str(extra_size, True)}"
-                                          get_human_size_str(extra_size, True))
+        download_size_text = f"{self.i18n['action.update.download_size']}: {get_human_size_str(required_size)}"
 
-        req_size_text = '{}: {}'.format(self.i18n['action.update.required_size'].capitalize(),
+        comps.insert(0, TextComponent(f'{disc_size_text} ({download_size_text})', size=14))
-                                        get_human_size_str(required_size))
-        comps.insert(0, TextComponent('{}  |  {}'.format(extra_size_text, req_size_text), size=14))
         comps.insert(1, TextComponent(''))
 
         if not self.request_confirmation(title=self.i18n['action.update.summary'].capitalize(), body='', components=comps,

bauh/view/resources/locale/ca

@@ -77,22 +77,22 @@ action.run.tooltip=Feu clic aquí per a iniciar l’aplicació
 action.screenshots.tooltip=Feu clic aquí per a veure imatges d’aquesta aplicació
 action.settings.tooltip=Feu clic aquí per a obrir accions addicionals
 action.update.cannot_update_label=Cannot be upgraded
+action.update.download_size=Download
 action.update.install_req.fail.body=No s'ha pogut instal·lar {}
 action.update.install_req.fail.title=Ha fallat la instal·lació
 action.update.label_to_remove=Must be uninstalled
 action.update.label_to_upgrade=Will be upgraded
-action.update.pkg.required_size=Requires
 action.update.required_label=Must be installed
-action.update.required_size=Disk space required (download)
 action.update.requirements.body=Abans d’actualitzar cal instal·lar les següents {} dependències
 action.update.requirements.status=Verificant els requisits
 action.update.requirements.title=Requisits d’actualització
 action.update.status.checking_sizes=Calculating upgrade size
+action.update.storage_size=Mida
 action.update.success.reboot.line1=Upgrades successfully applied !
 action.update.success.reboot.line2=Some changes may require a system restart to take effect.
 action.update.success.reboot.line3=Restart now ?
 action.update.summary=Upgrade summary
-action.update.total_size=Update size
+action.update.total_storage_size=Mida total
 action.trim_disk.ask=Optimize disc (trim) after upgrading ?
 address=adreça
 all_files=tots els fitxers

bauh/view/resources/locale/de

@@ -77,22 +77,22 @@ action.run.tooltip=Die Anwendung ausführen
 action.screenshots.tooltip=Fotos der Anwendung anzeigen
 action.settings.tooltip=Weitere Optionen anzeigen
 action.update.cannot_update_label=Cannot be upgraded
+action.update.download_size=Download
 action.update.install_req.fail.body={} konnte nicht erfolgreich installiert werden
 action.update.install_req.fail.title=Installation fehlgeschlagen
 action.update.label_to_remove=Must be uninstalled
 action.update.label_to_upgrade=Will be upgraded
-action.update.pkg.required_size=Requires
 action.update.required_label=Must be installed
-action.update.required_size=Disk space required (download)
 action.update.requirements.body=Die folgenden {} Abhängigkeiten müssen zusätzlich installiert werden
 action.update.requirements.status=Prüfe Voraussetzungen
 action.update.requirements.title=Upgrade-Voraussetzungen
 action.update.status.checking_sizes=Calculating upgrade size
+action.update.storage_size=Größe
 action.update.success.reboot.line1=Upgrades successfully applied !
 action.update.success.reboot.line2=Some changes may require a system restart to take effect.
 action.update.success.reboot.line3=Restart now ?
 action.update.summary=Upgrade summary
-action.update.total_size=Update size
+action.update.total_storage_size=Total size
 action.trim_disk.ask=Optimize disc (trim) after upgrading ?
 address=Adresse
 all_files=Alle Dateien

bauh/view/resources/locale/en

@@ -77,22 +77,22 @@ action.run.tooltip=Click here to launch this application
 action.screenshots.tooltip=Click here to see some pictures of this application
 action.settings.tooltip=Click here to open extra actions
 action.update.cannot_update_label=Cannot be upgraded
+action.update.download_size=Download
 action.update.install_req.fail.body=It was not possible to install {}
 action.update.install_req.fail.title=Installation failed
 action.update.label_to_remove=Must be uninstalled
 action.update.label_to_upgrade=Will be upgraded
-action.update.pkg.required_size=Requires
 action.update.required_label=Must be installed
-action.update.required_size=Disk space required (download)
 action.update.requirements.body=The following {} dependencies must be installed before upgrading
 action.update.requirements.status=Checking requirements
 action.update.requirements.title=Upgrade requirements
 action.update.status.checking_sizes=Calculating the upgrades size
+action.update.storage_size=Size
 action.update.success.reboot.line1=Upgrades successfully applied !
 action.update.success.reboot.line2=Some changes may require a system restart to take effect.
 action.update.success.reboot.line3=Restart now ?
 action.update.summary=Upgrade summary
-action.update.total_size=Update size
+action.update.total_storage_size=Total size
 action.trim_disk.ask=Optimize disc (trim) after upgrading ?
 address=address
 all_files=all files

bauh/view/resources/locale/es

@@ -77,22 +77,22 @@ action.run.tooltip=Pulse aquí para iniciar la aplicación
 action.screenshots.tooltip=Pulse aquí para ver algunas fotos de esta aplicación
 action.settings.tooltip=Pulse aquí para abrir acciones adicionales
 action.update.cannot_update_label=No se puede actualizar
+action.update.download_size=Descarga
 action.update.install_req.fail.body=No fue posible instalar {}
 action.update.install_req.fail.title=Falló la instalación
 action.update.label_to_remove=Necesitan ser desinstalados
 action.update.label_to_upgrade=Serán actualizados
-action.update.pkg.required_size=Requiere
 action.update.required_label=Deben instalarse
-action.update.required_size=Espacio en disco requerido (download)
 action.update.requirements.body=Las siguientes {} dependencias deben ser instaladas antes de actualizar
 action.update.requirements.status=Verificando los requisitos
 action.update.requirements.title=Requisitos de actualización
 action.update.status.checking_sizes=Calculando el tamaño de las actualizaciónes
+action.update.storage_size=Tamaño
 action.update.success.reboot.line1=¡Sistema actualizado con éxito!
 action.update.success.reboot.line2=Algunos cambios pueden requerir un reinicio del sistema para que surta efecto.
 action.update.success.reboot.line3=¿Reiniciar ahora?
 action.update.summary=Resumen de actualización
-action.update.total_size=Tamaño de la actualización
+action.update.total_storage_size=Tamaño total
 action.trim_disk.ask=¿Optimizar el disco (trim) después de actualizar?
 address=dirección
 all_files=todos los archivos

bauh/view/resources/locale/fr

@@ -77,22 +77,22 @@ action.run.tooltip=Cliquez ici pour lancer cette application
 action.screenshots.tooltip=Cliquez ici pour des aprerçus de cette application
 action.settings.tooltip=Cliquez ici pour plus d'actions
 action.update.cannot_update_label=Impossible à mettre à jour
+action.update.download_size=Download
 action.update.install_req.fail.body=Impossible d'installer {}
 action.update.install_req.fail.title=Échec de l'installation
 action.update.label_to_remove=Doit être désinstallé
 action.update.label_to_upgrade=Va être mis à jour
-action.update.pkg.required_size=Requiert
 action.update.required_label=Doit être installé
-action.update.required_size=Espace disque requis (download)
 action.update.requirements.body=Ces dépendences {} doivent être installées avant mise à jour
 action.update.requirements.status=Verification des prérequis
 action.update.requirements.title=Mies à jour des prérequis
 action.update.status.checking_sizes=Calcul de la taille des mises à jour
+action.update.storage_size=Taille
 action.update.success.reboot.line1=Mises à jour réussies!
 action.update.success.reboot.line2=L'application de certains changements nécessite de redémarrer.
 action.update.success.reboot.line3=Redémarrer maintenant ?
 action.update.summary=Résumé de la mise à jour
-action.update.total_size=Taille de la mise à jour
+action.update.total_storage_size=Taille totale
 action.trim_disk.ask=Optimizer le disque (trim) après mise à jour ?
 address=adresse
 all_files=Tous les fichiers

bauh/view/resources/locale/it

@@ -77,22 +77,22 @@ action.run.tooltip=Fai clic qui per avviare questa applicazione
 action.screenshots.tooltip=Clicca qui per vedere alcune immagini di questa applicazione
 action.settings.tooltip=Fai clic qui per aprire ulteriori azioni
 action.update.cannot_update_label=Cannot be upgraded
+action.update.download_size=Download
 action.update.install_req.fail.body=Non è stato possibile installare {}
 action.update.install_req.fail.title=Installazione non riuscita
 action.update.label_to_remove=Must be uninstalled
 action.update.label_to_upgrade=Will be upgraded
-action.update.pkg.required_size=Requires
 action.update.required_label=Must be installed
-action.update.required_size=Disk space required (download)
 action.update.requirements.body=Le seguenti {} dipendenze devono essere installati prima dell'aggiornamento
 action.update.requirements.status=Verificando i requisiti
 action.update.requirements.title=Requisiti di aggiornamento
 action.update.status.checking_sizes=Calculating upgrade size
+action.update.storage_size=Taglia
 action.update.success.reboot.line1=Upgrades successfully applied !
 action.update.success.reboot.line2=Some changes may require a system restart to take effect.
 action.update.success.reboot.line3=Restart now ?
 action.update.summary=Upgrade summary
-action.update.total_size=Update size
+action.update.total_storage_size=Dimensione totale
 action.trim_disk.ask=Optimize disc (trim) after upgrading ?
 address=indirizzo
 all_files=tutti i files

bauh/view/resources/locale/pt

@@ -77,22 +77,22 @@ action.run.tooltip=Clique aqui para iniciar esse aplicativo
 action.screenshots.tooltip=Clique aqui para ver algumas fotos desse aplicativo
 action.settings.tooltip=Clique aqui para abrir ações adicionais
 action.update.cannot_update_label=Não podem ser atualizados
+action.update.download_size=Download
 action.update.install_req.fail.body=Não foi possível instalar {}
 action.update.install_req.fail.title=Instalação falhou
 action.update.label_to_remove=Precisam ser desinstalados
 action.update.label_to_upgrade=Serão atualizados
-action.update.pkg.required_size=Requer
 action.update.required_label=Precisam ser instalados
-action.update.required_size=Espaço necessário em disco (Download)
 action.update.requirements.body=As seguintes {} dependências precisam ser instaladas antes de atualizar
 action.update.requirements.status=Verificando requisitos
 action.update.requirements.title=Requisitos de atualização
 action.update.status.checking_sizes=Calculando o tamanho das atualizações
+action.update.storage_size=Tamanho
 action.update.success.reboot.line1=Atualizações aplicadas com sucesso !
 action.update.success.reboot.line2=Algumas alterações podem exigir a reinicialização do sistem para que surtam efeito.
 action.update.success.reboot.line3=Reiniciar agora ?
 action.update.summary=Resumo de atualização
-action.update.total_size=Tamanho da atualização
+action.update.total_storage_size=Tamanho total
 action.trim_disk.ask=Otimizar disco (trim) depois de atualizar ?
 address=endereço
 all_files=todos os arquivos

bauh/view/resources/locale/ru

@@ -77,22 +77,22 @@ action.run.tooltip=Нажмите здесь, чтобы запустить эт
 action.screenshots.tooltip=Нажмите здесь, чтобы увидеть некоторые скриншоты этого приложения
 action.settings.tooltip=Нажмите здесь, чтобы открыть дополнительные действия
 action.update.cannot_update_label=Cannot be upgraded
+action.update.download_size=Download
 action.update.install_req.fail.body=Невозможно установить {}
 action.update.install_req.fail.title=Установка не удалась
 action.update.label_to_remove=Must be uninstalled
 action.update.label_to_upgrade=Will be upgraded
-action.update.pkg.required_size=Requires
 action.update.required_label=Должен быть установлен
-action.update.required_size=Disk space required (download)
 action.update.requirements.body=Перед обновлением необходимо установить следующие зависимости {}
 action.update.requirements.status=Проверка требований
 action.update.requirements.title=Требования к обновлению
 action.update.status.checking_sizes=Расчет размера обновления
+action.update.storage_size=Размер
 action.update.success.reboot.line1=Upgrades successfully applied !
 action.update.success.reboot.line2=Some changes may require a system restart to take effect.
 action.update.success.reboot.line3=Restart now ?
 action.update.summary=Сводка обновления
-action.update.total_size=Update size
+action.update.total_storage_size=Общий размер
 action.trim_disk.ask=Optimize disc (trim) after upgrading ?
 address=Адрес
 all_files=Все файлы

bauh/view/resources/locale/tr

@@ -77,22 +77,22 @@ action.run.tooltip=Uygulamayı başlatmak için burayı tıkla
 action.screenshots.tooltip=Bu uygulamanın bazı resimlerini görmek için buraya tıklayın
 action.settings.tooltip=Extra eylemleri açmak için buraya tıkla
 action.update.cannot_update_label=Yeni sürüme yükseltilemez
+action.update.download_size=Download
 action.update.install_req.fail.body={} kurmak mümkün değildi
 action.update.install_req.fail.title=Yükleme başarısız
 action.update.label_to_remove=Kaldırılmalı
 action.update.label_to_upgrade=Yükseltilecek
-action.update.pkg.required_size=Gereksinimler
 action.update.required_label=Yüklenmeli
-action.update.required_size=Gerekli disk alanı (download)
 action.update.requirements.body=Yükseltmeden önce aşağıdaki {} bağımlılıklar kurulmalıdır
 action.update.requirements.status=Gereksinimler kontrol ediliyor
 action.update.requirements.title=Yükseltme gereksinimleri
 action.update.status.checking_sizes=Yükseltme boyutunun hesaplanması
+action.update.storage_size=Boyut
 action.update.success.reboot.line1=Yükseltmeler başarıyla uygulandı !
 action.update.success.reboot.line2=Bazı değişiklikler, sistemin etkinleşmesi için sistemin yeniden başlatılmasını gerektirebilir.
 action.update.success.reboot.line3=Şimdi yeniden başlat ?
 action.update.summary=Yükseltme özeti
-action.update.total_size=Güncelleme boyutu
+action.update.total_storage_size=Toplam boyut
 action.trim_disk.ask=Diski optimize edin (trim) after upgrading ?
 address=adres
 all_files=tüm dosyalar