From 14053db41ce80517c9b1afea12daba2806e98d06 Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Fri, 14 Nov 2025 14:59:32 +0100 Subject: [PATCH 1/2] enh(phrasing): adjust a bunch of user-facing strings, remove placeholders on NcCheckboxRadioSwitch, add mandatory names on NcModals Signed-off-by: Julien Veyssier --- lib/Command/Daemon/AddRegistry.php | 2 +- lib/Command/Daemon/ListRegistry.php | 2 +- lib/Command/Daemon/RegisterDaemon.php | 20 ++--- lib/Command/Daemon/RemoveRegistry.php | 2 +- lib/Service/ExAppsPageService.php | 2 +- lib/Settings/Admin.php | 2 +- lib/SetupChecks/DaemonCheck.php | 4 +- src/components/AdminSettings.vue | 12 +-- .../DaemonConfig/ConfirmDaemonDeleteModal.vue | 19 ++--- src/components/DaemonConfig/DaemonConfig.vue | 4 +- .../DaemonConfig/DaemonConfigDetailsModal.vue | 32 ++++---- .../DaemonConfig/DaemonConfigList.vue | 6 +- .../DaemonConfig/DaemonTestDeploy.vue | 18 +++-- .../DaemonConfig/DockerRegistriesModal.vue | 14 ++-- .../DaemonConfig/ManageDaemonConfigModal.vue | 77 +++++++++---------- 15 files changed, 108 insertions(+), 108 deletions(-) diff --git a/lib/Command/Daemon/AddRegistry.php b/lib/Command/Daemon/AddRegistry.php index e32864e9d..380eeb0a6 100644 --- a/lib/Command/Daemon/AddRegistry.php +++ b/lib/Command/Daemon/AddRegistry.php @@ -27,7 +27,7 @@ public function __construct( protected function configure(): void { $this->setName('app_api:daemon:registry:add'); - $this->setDescription('Add Deploy daemon Docker registry mapping'); + $this->setDescription('Add deploy daemon Docker registry mapping'); $this->addArgument('name', InputArgument::REQUIRED, 'Deploy daemon name'); $this->addOption('registry-from', null, InputOption::VALUE_REQUIRED, 'Deploy daemon registry from URL'); $this->addOption('registry-to', null, InputOption::VALUE_REQUIRED, 'Deploy daemon registry to URL'); diff --git a/lib/Command/Daemon/ListRegistry.php b/lib/Command/Daemon/ListRegistry.php index 2256d918e..89e9e6e5d 100644 --- a/lib/Command/Daemon/ListRegistry.php +++ b/lib/Command/Daemon/ListRegistry.php @@ -25,7 +25,7 @@ public function __construct( protected function configure(): void { $this->setName('app_api:daemon:registry:list'); - $this->setDescription('List configured Deploy daemon Docker registry mappings'); + $this->setDescription('List the configured deploy daemon Docker registry mappings'); $this->addArgument('name', InputArgument::REQUIRED, 'Deploy daemon name'); } diff --git a/lib/Command/Daemon/RegisterDaemon.php b/lib/Command/Daemon/RegisterDaemon.php index c9db0a6c4..00b9e3ccb 100644 --- a/lib/Command/Daemon/RegisterDaemon.php +++ b/lib/Command/Daemon/RegisterDaemon.php @@ -36,18 +36,18 @@ protected function configure(): void { $this->addArgument('display-name', InputArgument::REQUIRED); $this->addArgument('accepts-deploy-id', InputArgument::REQUIRED, 'The deployment method that the daemon accepts. Can be "manual-install" or "docker-install". "docker-install" is for Docker Socket Proxy and HaRP.'); $this->addArgument('protocol', InputArgument::REQUIRED, 'The protocol used to connect to the daemon. Can be "http" or "https".'); - $this->addArgument('host', InputArgument::REQUIRED, 'The hostname (and port) or path at which the docker socket proxy or harp or the manual-install app is/would be available. This need not be a public host, just a host accessible by the Nextcloud server. It can also be a path to the docker socket. (e.g. appapi-harp:8780, /var/run/docker.sock)'); + $this->addArgument('host', InputArgument::REQUIRED, 'The hostname (and port) or path at which the Docker socket proxy or HaRP or the manual-install app is/would be available. This does not need to be a public host, just a host accessible by the Nextcloud server. It can also be a path to the Docker socket. (e.g. appapi-harp:8780, /var/run/docker.sock)'); $this->addArgument('nextcloud_url', InputArgument::REQUIRED); // daemon-config settings - $this->addOption('net', null, InputOption::VALUE_REQUIRED, 'The name of the docker network the ex-apps installed by this daemon should use. Default is "host".'); - $this->addOption('haproxy_password', null, InputOption::VALUE_REQUIRED, 'AppAPI Docker Socket Proxy password for HAProxy Basic auth. Only for docker socket proxy daemon.'); - $this->addOption('compute_device', null, InputOption::VALUE_REQUIRED, 'Compute device for GPU support (cpu|cuda|rocm)'); + $this->addOption('net', null, InputOption::VALUE_REQUIRED, 'The name of the Docker network the ex-apps installed by this daemon should use. Default is "host".'); + $this->addOption('haproxy_password', null, InputOption::VALUE_REQUIRED, 'AppAPI Docker Socket Proxy password for HAProxy Basic auth. Only for Docker Socket Proxy daemons.'); + $this->addOption('compute_device', null, InputOption::VALUE_REQUIRED, 'Computation device for GPU support (cpu|cuda|rocm)'); $this->addOption('set-default', null, InputOption::VALUE_NONE, 'Set DaemonConfig as default'); - $this->addOption('harp', null, InputOption::VALUE_NONE, 'Set daemon to use HaRP for all docker and exapp communication'); - $this->addOption('harp_frp_address', null, InputOption::VALUE_REQUIRED, '[host]:[port] of the HaRP FRP server, default host is same as HaRP host and port is 8782'); + $this->addOption('harp', null, InputOption::VALUE_NONE, 'Set the daemon to use HaRP for all Docker and ExApp communication'); + $this->addOption('harp_frp_address', null, InputOption::VALUE_REQUIRED, '[host]:[port] of the HaRP FRP server, the default host is same as the HaRP host, port is 8782'); $this->addOption('harp_shared_key', null, InputOption::VALUE_REQUIRED, 'HaRP shared key for secure communication between HaRP and AppAPI'); - $this->addOption('harp_docker_socket_port', null, InputOption::VALUE_REQUIRED, '\'remotePort\' of the FRP client of the remote docker socket proxy. There is one included in the harp container so this can be skipped for default setups.', '24000'); + $this->addOption('harp_docker_socket_port', null, InputOption::VALUE_REQUIRED, '\'remotePort\' of the FRP client of the remote Docker socket proxy. There is one included in the harp container so this can be skipped for default setups.', '24000'); $this->addOption('harp_exapp_direct', null, InputOption::VALUE_NONE, 'Flag for the advanced setups only. Disables the FRP tunnel between ExApps and HaRP.'); $this->addUsage('harp_proxy_docker "Harp Proxy (Docker)" "docker-install" "http" "appapi-harp:8780" "http://nextcloud.local" --net nextcloud --harp --harp_frp_address "appapi-harp:8782" --harp_shared_key "some_very_secure_password" --set-default --compute_device=cuda'); @@ -82,7 +82,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int } if ($this->daemonConfigService->getDaemonConfigByName($name) !== null) { - $output->writeln(sprintf('Skip registration, as daemon config `%s` already registered.', $name)); + $output->writeln(sprintf('Registration skipped, as the daemon config `%s` already exists.', $name)); return 0; } @@ -115,7 +115,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int ]); if ($daemonConfig === null) { - $output->writeln('Failed to register daemon.'); + $output->writeln('Failed to register the daemon config.'); return 1; } @@ -123,7 +123,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int $this->config->setAppValue(Application::APP_ID, 'default_daemon_config', $daemonConfig->getName()); } - $output->writeln('Daemon successfully registered.'); + $output->writeln('Daemon config successfully registered.'); return 0; } diff --git a/lib/Command/Daemon/RemoveRegistry.php b/lib/Command/Daemon/RemoveRegistry.php index 06d853104..ffa446740 100644 --- a/lib/Command/Daemon/RemoveRegistry.php +++ b/lib/Command/Daemon/RemoveRegistry.php @@ -27,7 +27,7 @@ public function __construct( protected function configure(): void { $this->setName('app_api:daemon:registry:remove'); - $this->setDescription('Remove Deploy daemon Docker registry mapping'); + $this->setDescription('Remove deploy daemon Docker registry mapping'); $this->addArgument('name', InputArgument::REQUIRED, 'Deploy daemon name'); $this->addOption('registry-from', null, InputOption::VALUE_REQUIRED, 'Deploy daemon registry from URL'); $this->addOption('registry-to', null, InputOption::VALUE_REQUIRED, 'Deploy daemon registry to URL'); diff --git a/lib/Service/ExAppsPageService.php b/lib/Service/ExAppsPageService.php index fd224d5be..5dec03f84 100644 --- a/lib/Service/ExAppsPageService.php +++ b/lib/Service/ExAppsPageService.php @@ -53,7 +53,7 @@ public function provideAppApiState(IInitialState $initialState): void { $this->dockerActions->initGuzzleClient($daemonConfig); $daemonConfigAccessible = $this->dockerActions->ping($this->dockerActions->buildDockerUrl($daemonConfig)); if (!$daemonConfigAccessible) { - $this->logger->warning(sprintf('Deploy daemon "%s" is not accessible by Nextcloud. Please verify its configuration', $daemonConfig->getName())); + $this->logger->warning(sprintf('Deploy daemon "%s" is not accessible by Nextcloud. Please check its configuration', $daemonConfig->getName())); } } } diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index a3258af83..8e19ae223 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -46,7 +46,7 @@ public function getForm(): TemplateResponse { $daemonConfigAccessible = $this->dockerActions->ping($this->dockerActions->buildDockerUrl($daemonConfig)); $adminInitialData['daemon_config_accessible'] = $daemonConfigAccessible; if (!$daemonConfigAccessible) { - $this->logger->error(sprintf('Deploy daemon "%s" is not accessible by Nextcloud. Please verify its configuration', $daemonConfig->getName())); + $this->logger->error(sprintf('Deploy daemon "%s" is not accessible by Nextcloud. Please check its configuration', $daemonConfig->getName())); } } } diff --git a/lib/SetupChecks/DaemonCheck.php b/lib/SetupChecks/DaemonCheck.php index 72434cf14..f2c588d32 100644 --- a/lib/SetupChecks/DaemonCheck.php +++ b/lib/SetupChecks/DaemonCheck.php @@ -62,7 +62,7 @@ public function run(): SetupResult { $this->dockerActions->initGuzzleClient($daemonConfig); $daemonConfigAccessible = $this->dockerActions->ping($this->dockerActions->buildDockerUrl($daemonConfig)); if (!$daemonConfigAccessible) { - $this->logger->error(sprintf('Deploy daemon "%s" is not accessible by Nextcloud. Please verify its configuration', $daemonConfig->getName())); + $this->logger->error(sprintf('Deploy daemon "%s" is not accessible by Nextcloud. Please check its configuration', $daemonConfig->getName())); return SetupResult::error( $this->l10n->t('AppAPI default deploy daemon "%s" is not accessible. Please check the daemon configuration.', ['daemon' => $daemonConfig->getName()]), "https://docs.nextcloud.com/server/$serverVer/admin_manual/exapps_management/AppAPIAndExternalApps.html#setup-deploy-daemon", @@ -71,7 +71,7 @@ public function run(): SetupResult { if (!boolval($daemonConfig->getDeployConfig()['harp'] ?? false)) { return SetupResult::warning( - $this->l10n->t('AppAPI default deploy daemon is not using HaRP. Please consider upgrading to it for better performance.'), + $this->l10n->t('The AppAPI default deploy daemon is not using HaRP. Please consider switching to HaRP for better performance.'), // todo: update link "https://github.com/nextcloud/HaRP/", ); diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue index 01fc98179..ab8a46eac 100644 --- a/src/components/AdminSettings.vue +++ b/src/components/AdminSettings.vue @@ -12,12 +12,12 @@

{{ t('app_api', 'The AppAPI Project is an exciting initiative that aims to revolutionize the way applications are developed for Nextcloud through the use of docker containers. Allowing for greater programming language choice and allowing computationally expensive tasks to be offloaded to a different server.') }}

-

{{ t('app_api', 'Default Deploy Daemon is not accessible. Please verify its configuration') }}

+

{{ t('app_api', 'Default deploy daemon is not accessible. Please check its configuration') }}

 @@ -33,10 +33,10 @@ - {{ t('app_api', 'This settings changes are reflected only for newly created containers') }} + {{ t('app_api', 'This settings changes are effective only for newly created containers') }}