spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-07 02:24:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

[fix][arch] i18n renaming issues

Browse Source
This commit is contained in:
Vinícius Moreira
2020-04-13 17:44:14 -03:00
parent 6786dc98bb
commit 315fe71e77
8 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
bauh/gems/arch/controller.py
View File

@@ -647,8 +647,8 @@ class ArchManager(SoftwareManager):
def _check_action_allowed(self, pkg: ArchPackage, watcher: ProcessWatcher) -> bool:
if user.is_root() and pkg.repository == 'aur':
watcher.show_message(title=self.i18n['arch.install.arch.root_error.title'],
body=self.i18n['arch.install.arch.root_error.body'],
watcher.show_message(title=self.i18n['arch.install.aur.root_error.title'],
body=self.i18n['arch.install.aur.root_error.body'],
type_=MessageType.ERROR)
return False
return True
@@ -1303,14 +1303,14 @@ class ArchManager(SoftwareManager):
if check_res:
if check_res.get('gpg_key'):
if context.watcher.request_confirmation(title=self.i18n['arch.arch.install.unknown_key.title'],
body=self.i18n['arch.install.arch.unknown_key.body'].format(bold(context.name), bold(check_res['gpg_key']))):
context.watcher.change_substatus(self.i18n['arch.arch.install.unknown_key.status'].format(bold(check_res['gpg_key'])))
if context.watcher.request_confirmation(title=self.i18n['arch.install.aur.unknown_key.title'],
body=self.i18n['arch.install.aur.unknown_key.body'].format(bold(context.name), bold(check_res['gpg_key']))):
context.watcher.change_substatus(self.i18n['arch.aur.install.unknown_key.status'].format(bold(check_res['gpg_key'])))
self.logger.info("Importing GPG key {}".format(check_res['gpg_key']))
if not context.handler.handle(gpg.receive_key(check_res['gpg_key'])):
self.logger.error("An error occurred while importing the GPG key {}".format(check_res['gpg_key']))
context.watcher.show_message(title=self.i18n['error'].capitalize(),
body=self.i18n['arch.arch.install.unknown_key.receive_error'].format(bold(check_res['gpg_key'])))
body=self.i18n['arch.aur.install.unknown_key.receive_error'].format(bold(check_res['gpg_key'])))
return False
else:
@@ -1318,9 +1318,9 @@ class ArchManager(SoftwareManager):
return False
if check_res.get('validity_check'):
body = "<p>{}</p><p>{}</p>".format(self.i18n['arch.arch.install.validity_check.body'].format(bold(context.name)),
self.i18n['arch.arch.install.validity_check.proceed'])
return not context.watcher.request_confirmation(title=self.i18n['arch.arch.install.validity_check.title'].format('( checksum )'),
body = "<p>{}</p><p>{}</p>".format(self.i18n['arch.aur.install.validity_check.body'].format(bold(context.name)),
self.i18n['arch.aur.install.validity_check.proceed'])
return not context.watcher.request_confirmation(title=self.i18n['arch.aur.install.validity_check.title'].format('( checksum )'),
body=body,
confirmation_label=self.i18n['no'].capitalize(),
deny_label=self.i18n['yes'].capitalize())
@@ -1498,33 +1498,33 @@ class ArchManager(SoftwareManager):
srcinfo = self.aur_client.get_src_info(pkgname)
if srcinfo.get('validpgpkeys'):
handler.watcher.print(self.i18n['arch.arch.install.verifying_pgp'])
handler.watcher.print(self.i18n['arch.aur.install.verifying_pgp'])
keys_to_download = [key for key in srcinfo['validpgpkeys'] if not pacman.verify_pgp_key(key)]
if keys_to_download:
keys_str = ''.join(
['<br/><span style="font-weight:bold"> - {}</span>'.format(k) for k in keys_to_download])
msg_body = '{}:<br/>{}<br/><br/>{}'.format(self.i18n['arch.arch.install.pgp.body'].format(bold(pkgname)),
msg_body = '{}:<br/>{}<br/><br/>{}'.format(self.i18n['arch.aur.install.pgp.body'].format(bold(pkgname)),
keys_str, self.i18n['ask.continue'])
if handler.watcher.request_confirmation(title=self.i18n['arch.arch.install.pgp.title'], body=msg_body):
if handler.watcher.request_confirmation(title=self.i18n['arch.aur.install.pgp.title'], body=msg_body):
for key in keys_to_download:
handler.watcher.change_substatus(self.i18n['arch.arch.install.pgp.substatus'].format(bold(key)))
handler.watcher.change_substatus(self.i18n['arch.aur.install.pgp.substatus'].format(bold(key)))
if not handler.handle(pacman.receive_key(key, root_password)):
handler.watcher.show_message(title=self.i18n['error'],
body=self.i18n['arch.arch.install.pgp.receive_fail'].format(
body=self.i18n['arch.aur.install.pgp.receive_fail'].format(
bold(key)),
type_=MessageType.ERROR)
return False
if not handler.handle(pacman.sign_key(key, root_password)):
handler.watcher.show_message(title=self.i18n['error'],
body=self.i18n['arch.arch.install.pgp.sign_fail'].format(
body=self.i18n['arch.aur.install.pgp.sign_fail'].format(
bold(key)),
type_=MessageType.ERROR)
return False
handler.watcher.change_substatus(self.i18n['arch.arch.install.pgp.success'])
handler.watcher.change_substatus(self.i18n['arch.aur.install.pgp.success'])
else:
handler.watcher.print(self.i18n['action.cancelled'])
return False
@@ -1814,8 +1814,8 @@ class ArchManager(SoftwareManager):
value=bool(local_config['repositories']),
max_width=max_width),
self._gen_bool_selector(id_='aur',
label_key='arch.config.arch',
tooltip_key='arch.config.arch.tip',
label_key='arch.config.aur',
tooltip_key='arch.config.aur.tip',
value=local_config['aur'],
max_width=max_width,
capitalize_label=False),

2
bauh/gems/arch/resources/locale/ca
View File

@@ -11,7 +11,6 @@ arch.aur.install.pgp.success=Claus PGP rebudes i signades
arch.aur.install.pgp.title=Claus PGP necessàries
arch.aur.install.unknown_key.receive_error=No s’ha pogut rebre la clau pública {}
arch.aur.install.unknown_key.status=S’està rebent la clau pública {}
arch.aur.install.unknown_key.title=Clau pública necessària
arch.aur.install.validity_check.body=Alguns dels fitxers font necessaris per a la instal·lació de {} són malmesos.
arch.aur.install.validity_check.proceed=Voleu continuar de totes maneres? ( no es recomana )
arch.aur.install.validity_check.title=Problemes d’integritat {}
@@ -133,6 +132,7 @@ arch.info.validpgpkeys=Les claus PGP vàlids
arch.info.version=versió
arch.install.aur.root_error.body=No està permès instal·lar, actualitzar ni revaloritzar un paquet com a usuari root.
arch.install.aur.root_error.title=No es permet l’acció
arch.install.aur.unknown_key.title=Clau pública necessària
arch.install.aur.unknown_key.body=Per a continuar amb la instal·lació de {} cal confiar en la clau pública següent {}
arch.install.conflict.popup.body=Les aplicacions {} estan en conflicte. Heu de desinstal·lar una per a instal·lar l’altra. Voleu continuar?
arch.install.conflict.popup.title=S’ha detectat un conflicte

2
bauh/gems/arch/resources/locale/de
View File

@@ -11,7 +11,6 @@ arch.aur.install.pgp.success=PGP Schlüssel geholt und signiert
arch.aur.install.pgp.title=PGP Schlüssel benötigt
arch.aur.install.unknown_key.receive_error=Öffentlicher Schlüssel {} konnte nicht emfangen werden
arch.aur.install.unknown_key.status=Öffentlichen Schlüssel {} emfangen
arch.aur.install.unknown_key.title=Öffentlicher Schlüssel nötig
arch.aur.install.validity_check.body=Einige der Source-Dateien für die Installation von {} sind korrupt.
arch.aur.install.validity_check.proceed=Wollen Sie trotzdem fortfahren? ( nicht empfohlen )
arch.aur.install.validity_check.title=Integritätsprobleme {}
@@ -134,6 +133,7 @@ arch.info.version=Ausführung
arch.install.aur.root_error.body=It is not allowed to install, upgrade or downgrade a package as the root user
arch.install.aur.root_error.title=Action not allowed
arch.install.aur.unknown_key.body=Um mit der Installation von {} fortzufahren ist es nötig dem öffentlichen Schlüssel {} zu vertrauen
arch.install.aur.unknown_key.title=Öffentlicher Schlüssel nötig
arch.install.conflict.popup.body=Die Anwendungen {} können nicht gleichzeitig installiert sein. Du musst eine deinstallieren um die andere zu installieren. Fortfahren?
arch.install.conflict.popup.title=Konflikt entdeckt
arch.install.dep_not_found.body.l1=Nötige Abhängigkeit {} wurde weder im AUR noch in den standard Spiegelservern gefunden

2
bauh/gems/arch/resources/locale/en
View File

@@ -11,7 +11,6 @@ arch.aur.install.pgp.success=PGP keys received and signed
arch.aur.install.pgp.title=PGP keys required
arch.aur.install.unknown_key.receive_error=Could not receive public key {}
arch.aur.install.unknown_key.status=Receiving public key {}
arch.aur.install.unknown_key.title=Public key required
arch.aur.install.validity_check.body=Some of the source-files needed for {} installation are not healthy.
arch.aur.install.validity_check.proceed=Do you want to continue anyway ? ( not recommended )
arch.aur.install.validity_check.title=Integrity issues {}
@@ -134,6 +133,7 @@ arch.info.version=version
arch.install.aur.root_error.body=It is not allowed to install, upgrade or downgrade a package as the root user
arch.install.aur.root_error.title=Action not allowed
arch.install.aur.unknown_key.body=To continue {} installation is necessary to trust the following public key {}
arch.install.aur.unknown_key.title=Public key required
arch.install.conflict.popup.body=The applications {} are in conflict. You must uninstall one to install the other. Continue ?
arch.install.conflict.popup.title=Conflict detected
arch.install.dep_not_found.body.l1=Required dependency {} was not found in AUR nor in the repositories.

2
bauh/gems/arch/resources/locale/es
View File

@@ -11,7 +11,6 @@ arch.aur.install.pgp.success=Claves PGP recibidas y firmadas
arch.aur.install.pgp.title=Claves PGP necesarias
arch.aur.install.unknown_key.receive_error=No fue posible recibir la clave pública {}
arch.aur.install.unknown_key.status=Recibiendo la clave pública {}
arch.aur.install.unknown_key.title=Clave pública necesaria
arch.aur.install.validity_check.body=Algunos de los archivos fuente necesarios para la instalación de {} no están en buen estado.
arch.aur.install.validity_check.proceed=¿Desea continuar de todos modos? ( no recomendado )
arch.aur.install.validity_check.title=Problemas de integridad {}
@@ -134,6 +133,7 @@ arch.info.version=versión
arch.install.aur.root_error.body=No es permitido instalar, actualizar o revertir la versión de un paquete como usuario root
arch.install.aur.root_error.title=Acción no permitida
arch.install.aur.unknown_key.body=Para continuar la instalación de {} es necesario confiar en la siguiente clave pública {}
arch.install.aur.unknown_key.title=Clave pública necesaria
arch.install.conflict.popup.body=Los aplicativos {} estan en conflicto. Debe desinstalar uno para instalar el otro. ¿Continuar?
arch.install.conflict.popup.title=Conflicto detectado
arch.install.dep_not_found.body.l1=No se encontró la dependencia requerida {} en AUR ni en los repositorios.

2
bauh/gems/arch/resources/locale/it
View File

@@ -11,7 +11,6 @@ arch.aur.install.pgp.success=Chiavi PGP ricevute e firmate
arch.aur.install.pgp.title=Chiavi PGP richieste
arch.aur.install.unknown_key.receive_error=Impossibile ricevere la chiave pubblica {}
arch.aur.install.unknown_key.status=Ricezione della chiave pubblica {}
arch.aur.install.unknown_key.title=Chiave pubblica richiesta
arch.aur.install.validity_check.body=Alcuni dei file di origine necessari per l'installazione di {} non sono integri.
arch.aur.install.validity_check.proceed=Vuoi continuare comunque? ( non consigliato )
arch.aur.install.validity_check.title=Problemi di integrità {}
@@ -134,6 +133,7 @@ arch.info.version=versione
arch.install.aur.root_error.body=Non è consentito installare, aggiornare o degradare un pacchetto come utente root
arch.install.aur.root_error.title=Azione non consentita
arch.install.aur.unknown_key.body=Per continuare {} l'installazione è necessaria per fidarsi della seguente chiave pubblica {}
arch.install.aur.unknown_key.title=Chiave pubblica richiesta
arch.install.conflict.popup.body=Le applicazioni {} sono in conflitto. È necessario disinstallarne una per installare l'altra. Continua ?
arch.install.conflict.popup.title=Conflitto rilevato
arch.install.dep_not_found.body.l1=La dipendenza richiesta {} non è stata trovata in AUR né nei depositos.

2
bauh/gems/arch/resources/locale/pt
View File

@@ -11,7 +11,6 @@ arch.aur.install.pgp.success=Chaves PGP recebidas e assinadas
arch.aur.install.pgp.title=Chaves PGP necessárias
arch.aur.install.unknown_key.receive_error=Não fui possível receber a chave pública {}
arch.aur.install.unknown_key.status=Recebendo a chave pública {}
arch.aur.install.unknown_key.title=Chave pública necessária
arch.aur.install.validity_check.body=Alguns dos arquivos-fonte necessários para a instalação de {} não estão íntegros.
arch.aur.install.validity_check.proceed=Você deseja continuar mesmo assim ? ( não recomendado )
arch.aur.install.validity_check.title=Problemas de integridade {}
@@ -134,6 +133,7 @@ arch.info.version=versão
arch.install.aur.root_error.body=Não é permitido instalar, atualizar ou reverter a versão de um pacote como usuário root
arch.install.aur.root_error.title=Ação não permitida
arch.install.aur.unknown_key.body=Para continuar a instalação de {} é ncessário confiar na seguinte chave pública {}
arch.install.aur.unknown_key.title=Chave pública necessária
arch.install.conflict.popup.body=Os aplicativos {} estão em conflito. Você precisa desinstalar um para instalar o outro. Continuar ?
arch.install.conflict.popup.title=Conflito detectado
arch.install.dep_not_found.body.l1=A dependência {} não foi encontrado no AUR nem nos repositórios.

2
bauh/gems/arch/resources/locale/ru
View File

@@ -11,7 +11,6 @@ arch.aur.install.pgp.success=Ключи PGP получены и подписан
arch.aur.install.pgp.title=Требуются ключи PGP
arch.aur.install.unknown_key.receive_error=Не удалось получить открытый ключ {}
arch.aur.install.unknown_key.status=Получение открытого ключа {}
arch.aur.install.unknown_key.title=Требуется открытый ключ
arch.aur.install.validity_check.body=Некоторые исходные файлы, необходимые для установки {}, не работают. Установка будет отменена, чтобы предотвратить повреждение вашей системы.
arch.aur.install.validity_check.proceed=Вы всё равно хотите продолжить ? ( не рекомендуется )
arch.aur.install.validity_check.title=Проблемы целостности
@@ -134,6 +133,7 @@ arch.info.version=Версия
arch.install.aur.root_error.body=Не разрешается устанавливать, обновлять или понижать версию пакета от имени пользователя root
arch.install.aur.root_error.title=Недопустимое действие
arch.install.aur.unknown_key.body=Для продолжения установки {} необходимо довериться следующему открытому ключу {}
arch.install.aur.unknown_key.title=Требуется открытый ключ
arch.install.conflict.popup.body=Приложения {} находятся в конфликте. Вы должны удалить одно, чтобы установить другоое. Продолжить ?
arch.install.conflict.popup.title=Обнаружен конфликт
arch.install.dep_not_found.body.l1=Требуемая зависимость {} не была найдена ни в AUR, ни в зеркалах по умолчанию.