From 101be80d7e6ea6dad7a45377062258ec1adeaa64 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 21 Jan 2022 20:07:11 +0100 Subject: [PATCH 1/3] configpanels: logic regarding dynamic-choices questions such as domain, user, should be handled by the core --- app/src/helpers/yunohostArguments.js | 20 ++++---------------- app/src/store/data.js | 9 --------- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/app/src/helpers/yunohostArguments.js b/app/src/helpers/yunohostArguments.js index 0fc02bbd..f68fadd6 100644 --- a/app/src/helpers/yunohostArguments.js +++ b/app/src/helpers/yunohostArguments.js @@ -110,25 +110,13 @@ export function formatYunoHostArgument (arg) { } }, { - types: ['select'], - name: 'SelectItem', - props: ['id:name', 'choices'] - }, - { - types: ['user', 'domain'], + types: ['select', 'user', 'domain'], name: 'SelectItem', props: ['id:name', 'choices'], callback: function () { - field.link = { name: arg.type + '-list', text: i18n.t(`manage_${arg.type}s`) } - field.props.choices = store.getters[arg.type + 'sAsChoices'] - if (value) { - return - } - if (arg.type === 'domain') { - value = store.getters.mainDomain - } else { - value = field.props.choices.length ? field.props.choices[0].value : null - } + if ((arg.type === 'domain') || (arg.type === 'user')) { + field.link = { name: arg.type + '-list', text: i18n.t(`manage_${arg.type}s`) } + } } }, { diff --git a/app/src/store/data.js b/app/src/store/data.js index df2255f4..50e39b48 100644 --- a/app/src/store/data.js +++ b/app/src/store/data.js @@ -170,15 +170,6 @@ export default { return [] }, - usersAsChoices: state => { - if (state.users) { - return Object.values(state.users).map(({ username, fullname, mail }) => { - return { text: `${fullname} (${mail})`, value: username } - }) - } - return [] - }, - user: state => name => state.users_details[name], // not cached domains: state => state.domains, From 7d60b9a4b5fb34a3f8a3ac691daa2bc3a281a96e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= Date: Fri, 21 Jan 2022 18:02:55 +0000 Subject: [PATCH 2/3] Translated using Weblate (French) Currently translated at 99.2% (500 of 504 strings) Translation: YunoHost/admin Translate-URL: https://translate.yunohost.org/projects/yunohost/admin/fr/ --- app/src/i18n/locales/fr.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/i18n/locales/fr.json b/app/src/i18n/locales/fr.json index c7b43351..c8873a91 100644 --- a/app/src/i18n/locales/fr.json +++ b/app/src/i18n/locales/fr.json @@ -451,7 +451,16 @@ "pending": "En cours" }, "processing": "Le serveur traite l'action...", - "partial_logs": "[...] ( voir l'historique pour les logs complets)" + "partial_logs": "[...] ( voir l'historique pour les logs complets)", + "reconnecting": { + "title": "Tentative de communication avec le serveur...", + "failed": "Le serveur ne répond pas. Vous pouvez essayer de vous reconnecter ou essayer d'exécuter `systemctl restart yunohost-api` via SSH.", + "reason": { + "unknown": "La connexion avec le serveur a été fermée pour des raisons inconnues.", + "reboot": "Votre serveur redémarre et ne sera pas joignable pendant un certain temps. Une invite de connexion sera disponible dès que le serveur sera accessible." + }, + "success": "Le serveur est maintenant joignable ! Vous pouvez essayer de vous connecter" + } }, "go_back": "Revenir", "postinstall": { From 72cd1342fb9705fbbf52ee44061cb61d726aaaaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20M?= Date: Fri, 21 Jan 2022 08:17:43 +0000 Subject: [PATCH 3/3] Translated using Weblate (Galician) Currently translated at 100.0% (504 of 504 strings) Translation: YunoHost/admin Translate-URL: https://translate.yunohost.org/projects/yunohost/admin/gl/ --- app/src/i18n/locales/gl.json | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/app/src/i18n/locales/gl.json b/app/src/i18n/locales/gl.json index 89026052..ab7018a9 100644 --- a/app/src/i18n/locales/gl.json +++ b/app/src/i18n/locales/gl.json @@ -26,7 +26,18 @@ "error": "Sen éxito" }, "processing": "O servidor está procesando a acción...", - "partial_logs": "[...] (mira o historial para ver o rexistro completo)" + "partial_logs": "[...] (mira o historial para ver o rexistro completo)", + "reconnecting": { + "title": "Intentando comunicarse co servidor...", + "failed": "Semella que o servidor non responde. Podes intentar volver conectar ou intenta executar `systemctl restart yunohost-api`por ssh.", + "reason": { + "unknown": "Pechouse a conexión co servidor por razóns descoñecidas.", + "reboot": "O servidor está reiniciando e non estará dispoñible por uns minutos. O formulario de conexión estará dispoñible tan pronto o servidor sexa accesible.", + "shutdown": "O servidor estase apagando e non está dispoñible. Acéndeo e o formulario de conexión estará dispoñible tan pronto o servidor sexa accesible.", + "upgrade_system": "Pechouse a conexión ao servidor debido á actualización de yunohost. Agardando a que o servidor sexa accesible…" + }, + "success": "O servidor está accesible! Podes intentar conectar" + } }, "all": "Todo", "administration_password": "Contrasinal de administración", @@ -417,7 +428,8 @@ "change_url": "Cambiar URL de acceso a '{name}'", "change_label": "Cambiar etiqueta de '{prevName}' a '{nextName}'" }, - "adminpw": "Cambiar contrasinal admin" + "adminpw": "Cambiar contrasinal admin", + "reconnecting": "Reconectando" }, "restart": "Reiniciar", "restore": "Restaurar", @@ -570,5 +582,6 @@ "domain_dns_push_managed_in_parent_domain": "A ferramenta para os rexistros DNS automáticos están xestionados polo dominio nai {parent_domain}.", "domain_dns_push_failed_to_authenticate": "Fallou a autenticación na API da empresa rexistradora. Serán incorrectas as credenciais? (Erro: {error})", "domain_dns_push_not_applicable": "A ferramenta para rexistro automático DNS non é de aplicación ao dominio {domain},
Deberías configurar manualmente os teus rexistros DNS seguindo a documentación e a configuración inferior suxerida.", - "text_selection_is_disabled": "A selección de texto está desactivada. Se queres compartir este rexistro, comparte o rexistro *completo* co botón 'Compartir con YunoHost'.
Ou se realmente queres seleccionar un texto, preme estas teclas: ↓↓↑↑." + "text_selection_is_disabled": "A selección de texto está desactivada. Se queres compartir este rexistro, comparte o rexistro *completo* co botón 'Compartir con YunoHost'.
Ou se realmente queres seleccionar un texto, preme estas teclas: ↓↓↑↑.", + "retry": "Reintentar" }